Merge mskrb-integ onto trunk
authorSam Hartman <hartmans@mit.edu>
Sat, 3 Jan 2009 23:19:42 +0000 (23:19 +0000)
committerSam Hartman <hartmans@mit.edu>
Sat, 3 Jan 2009 23:19:42 +0000 (23:19 +0000)
commit0ba5ccd7bb3ea15e44a87f84ca6feed8890f657d
tree2049c9c2cb135fe36b14c0a171711259258d18ec
parentff0a6514c9f4230938c29922d69cbd4e83691adf
Merge mskrb-integ onto trunk

The mskrb-integ branch includes support for the following projects:
Projects/Aliases
* Projects/PAC and principal APIs
* Projects/AEAD encryption API
* Projects/GSSAPI DCE
* Projects/RFC 3244

In addition, it includes support for enctype negotiation, and a variety of GSS-API extensions.
In the KDC it includes support for protocol transition, constrained delegation
and a new authorization data interface.
The old authorization data interface is also supported.

This commit merges the mskrb-integ branch on to the trunk.
Additional review and testing is required.

Merge commit 'mskrb-integ' into trunk

ticket: new
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21690 dc483132-0cff-0310-8789-dd5450dbe970
271 files changed:
README
doc/copyright.texinfo
src/Makefile.in
src/appl/gssftp/ftp/Makefile.in
src/appl/gssftp/ftpd/Makefile.in
src/clients/kinit/kinit.c
src/clients/kvno/kvno.c
src/config-files/mech [new file with mode: 0644]
src/config/pre.in
src/configure.in
src/include/Makefile.in
src/include/k5-int.h
src/include/k5-plugin.h
src/include/k5-unicode.h [new file with mode: 0644]
src/include/k5-utf8.h [new file with mode: 0644]
src/include/kdb.h
src/include/kdb_ext.h [new file with mode: 0644]
src/include/krb5/authdata_plugin.h
src/include/krb5/krb5.hin
src/include/osconf.hin
src/kadmin/cli/kadmin.c
src/kadmin/passwd/Makefile.in
src/kadmin/server/Makefile.in
src/kadmin/server/misc.c
src/kadmin/server/misc.h
src/kadmin/server/network.c [new file with mode: 0644]
src/kadmin/server/ovsec_kadmd.c
src/kadmin/server/schpw.c
src/kadmin/testing/util/Makefile.in
src/kdc/Makefile.in
src/kdc/do_as_req.c
src/kdc/do_tgs_req.c
src/kdc/extern.c
src/kdc/extern.h
src/kdc/kdc_authdata.c
src/kdc/kdc_preauth.c
src/kdc/kdc_util.c
src/kdc/kdc_util.h
src/kdc/main.c
src/kdc/network.c
src/kdc/policy.c
src/lib/crypto/Makefile.in
src/lib/crypto/aead.c
src/lib/crypto/arcfour/Makefile.in
src/lib/crypto/arcfour/arcfour_aead.c
src/lib/crypto/arcfour/arcfour_s2k.c
src/lib/crypto/cksumtypes.c
src/lib/crypto/des/Makefile.in
src/lib/crypto/des/d3_aead.c
src/lib/crypto/des/des_int.h
src/lib/crypto/des/f_aead.c [new file with mode: 0644]
src/lib/crypto/dk/checksum.c
src/lib/crypto/dk/dk.h
src/lib/crypto/dk/dk_aead.c
src/lib/crypto/enc_provider/Makefile.in
src/lib/crypto/enc_provider/aes.c
src/lib/crypto/enc_provider/des.c
src/lib/crypto/enc_provider/enc_provider.h
src/lib/crypto/etypes.c
src/lib/crypto/hmac.c
src/lib/crypto/keyhash_provider/Makefile.in
src/lib/crypto/keyhash_provider/keyhash_provider.h
src/lib/crypto/keyhash_provider/md5_hmac.c [new file with mode: 0644]
src/lib/crypto/libk5crypto.exports
src/lib/crypto/make_checksum.c
src/lib/crypto/make_checksum_iov.c
src/lib/crypto/raw/Makefile.in
src/lib/crypto/raw/raw.h
src/lib/crypto/raw/raw_aead.c [new file with mode: 0644]
src/lib/crypto/verify_checksum.c
src/lib/crypto/verify_checksum_iov.c
src/lib/gssapi/Makefile.in
src/lib/gssapi/generic/Makefile.in
src/lib/gssapi/generic/disp_com_err_status.c
src/lib/gssapi/generic/gssapi.hin
src/lib/gssapi/generic/gssapiP_generic.h
src/lib/gssapi/generic/gssapi_ext.h [new file with mode: 0644]
src/lib/gssapi/generic/gssapi_generic.c
src/lib/gssapi/generic/gssapi_generic.h
src/lib/gssapi/generic/oid_ops.c [moved from src/lib/gssapi/mechglue/oid_ops.c with 87% similarity]
src/lib/gssapi/generic/util_buffer_set.c [new file with mode: 0644]
src/lib/gssapi/generic/util_token.c
src/lib/gssapi/generic/util_validate.c
src/lib/gssapi/gss_libinit.c [deleted file]
src/lib/gssapi/gss_libinit.h [deleted file]
src/lib/gssapi/krb5/Makefile.in
src/lib/gssapi/krb5/accept_sec_context.c
src/lib/gssapi/krb5/acquire_cred.c
src/lib/gssapi/krb5/canon_name.c
src/lib/gssapi/krb5/context_time.c
src/lib/gssapi/krb5/copy_ccache.c
src/lib/gssapi/krb5/delete_sec_context.c
src/lib/gssapi/krb5/disp_status.c
src/lib/gssapi/krb5/export_name.c
src/lib/gssapi/krb5/export_sec_context.c
src/lib/gssapi/krb5/get_tkt_flags.c
src/lib/gssapi/krb5/gssapiP_krb5.h
src/lib/gssapi/krb5/gssapi_krb5.c
src/lib/gssapi/krb5/gssapi_krb5.hin
src/lib/gssapi/krb5/import_sec_context.c
src/lib/gssapi/krb5/indicate_mechs.c
src/lib/gssapi/krb5/init_sec_context.c
src/lib/gssapi/krb5/inq_context.c
src/lib/gssapi/krb5/inq_cred.c
src/lib/gssapi/krb5/inq_names.c
src/lib/gssapi/krb5/k5seal.c
src/lib/gssapi/krb5/k5sealiov.c [new file with mode: 0644]
src/lib/gssapi/krb5/k5sealv3.c
src/lib/gssapi/krb5/k5sealv3iov.c [new file with mode: 0644]
src/lib/gssapi/krb5/k5unseal.c
src/lib/gssapi/krb5/k5unsealiov.c [new file with mode: 0644]
src/lib/gssapi/krb5/krb5_gss_glue.c
src/lib/gssapi/krb5/lucid_context.c
src/lib/gssapi/krb5/seal.c
src/lib/gssapi/krb5/ser_sctx.c
src/lib/gssapi/krb5/set_allowable_enctypes.c
src/lib/gssapi/krb5/set_ccache.c
src/lib/gssapi/krb5/sign.c
src/lib/gssapi/krb5/unseal.c
src/lib/gssapi/krb5/util_cksum.c
src/lib/gssapi/krb5/util_crypt.c
src/lib/gssapi/krb5/util_seqnum.c
src/lib/gssapi/krb5/verify.c
src/lib/gssapi/krb5/wrap_size_limit.c
src/lib/gssapi/libgssapi_krb5.exports
src/lib/gssapi/mechglue/Makefile.in
src/lib/gssapi/mechglue/g_accept_sec_context.c
src/lib/gssapi/mechglue/g_acquire_cred.c
src/lib/gssapi/mechglue/g_buffer_set.c [new file with mode: 0644]
src/lib/gssapi/mechglue/g_compare_name.c
src/lib/gssapi/mechglue/g_complete_auth_token.c [new file with mode: 0644]
src/lib/gssapi/mechglue/g_context_time.c
src/lib/gssapi/mechglue/g_delete_sec_context.c
src/lib/gssapi/mechglue/g_dsp_status.c
src/lib/gssapi/mechglue/g_exp_sec_context.c
src/lib/gssapi/mechglue/g_export_name.c
src/lib/gssapi/mechglue/g_export_name_object.c [new file with mode: 0644]
src/lib/gssapi/mechglue/g_glue.c
src/lib/gssapi/mechglue/g_imp_name.c
src/lib/gssapi/mechglue/g_imp_name_object.c [new file with mode: 0644]
src/lib/gssapi/mechglue/g_imp_sec_context.c
src/lib/gssapi/mechglue/g_init_sec_context.c
src/lib/gssapi/mechglue/g_initialize.c
src/lib/gssapi/mechglue/g_inq_context.c
src/lib/gssapi/mechglue/g_inq_context_oid.c [new file with mode: 0644]
src/lib/gssapi/mechglue/g_inq_cred.c
src/lib/gssapi/mechglue/g_inq_cred_oid.c [new file with mode: 0644]
src/lib/gssapi/mechglue/g_inq_names.c
src/lib/gssapi/mechglue/g_mech_invoke.c [new file with mode: 0644]
src/lib/gssapi/mechglue/g_oid_ops.c
src/lib/gssapi/mechglue/g_process_context.c
src/lib/gssapi/mechglue/g_rel_cred.c
src/lib/gssapi/mechglue/g_rel_name.c
src/lib/gssapi/mechglue/g_rel_oid_set.c
src/lib/gssapi/mechglue/g_seal.c
src/lib/gssapi/mechglue/g_set_context_option.c [new file with mode: 0644]
src/lib/gssapi/mechglue/g_set_cred_option.c [new file with mode: 0644]
src/lib/gssapi/mechglue/g_sign.c
src/lib/gssapi/mechglue/g_store_cred.c
src/lib/gssapi/mechglue/g_unseal.c
src/lib/gssapi/mechglue/g_unwrap_aead.c [new file with mode: 0644]
src/lib/gssapi/mechglue/g_unwrap_iov.c [new file with mode: 0644]
src/lib/gssapi/mechglue/g_userok.c [new file with mode: 0644]
src/lib/gssapi/mechglue/g_verify.c
src/lib/gssapi/mechglue/g_wrap_aead.c [new file with mode: 0644]
src/lib/gssapi/mechglue/g_wrap_iov.c [new file with mode: 0644]
src/lib/gssapi/mechglue/gssd_pname_to_uid.c [new file with mode: 0644]
src/lib/gssapi/mechglue/mech.conf [deleted file]
src/lib/gssapi/mechglue/mechglue.h
src/lib/gssapi/mechglue/mglueP.h
src/lib/gssapi/spnego/Makefile.in
src/lib/gssapi/spnego/gssapiP_spnego.h
src/lib/gssapi/spnego/mech_spnego.exports [new file with mode: 0644]
src/lib/gssapi/spnego/spnego_mech.c
src/lib/kadm5/Makefile.in
src/lib/kadm5/clnt/Makefile.in
src/lib/kadm5/srv/Makefile.in
src/lib/kadm5/srv/libkadm5srv.exports
src/lib/kadm5/srv/server_acl.c
src/lib/kadm5/srv/server_acl.h
src/lib/kadm5/srv/server_dict.c
src/lib/kadm5/srv/svr_principal.c
src/lib/kadm5/unit-test/Makefile.in
src/lib/kdb/Makefile.in
src/lib/kdb/decrypt_key.c
src/lib/kdb/encrypt_key.c
src/lib/kdb/kdb5.c
src/lib/kdb/kdb5.h
src/lib/kdb/libkdb5.exports
src/lib/krb5/Makefile.in
src/lib/krb5/asn.1/asn1_decode.c
src/lib/krb5/asn.1/asn1_decode.h
src/lib/krb5/asn.1/asn1_encode.c
src/lib/krb5/asn.1/asn1_encode.h
src/lib/krb5/asn.1/asn1_k_decode.c
src/lib/krb5/asn.1/asn1_k_decode.h
src/lib/krb5/asn.1/asn1_k_encode.c
src/lib/krb5/asn.1/krb5_decode.c
src/lib/krb5/asn.1/krbasn1.h
src/lib/krb5/error_tables/krb5_err.et
src/lib/krb5/krb/Makefile.in
src/lib/krb5/krb/addr_srch.c
src/lib/krb5/krb/auth_con.c
src/lib/krb5/krb/auth_con.h
src/lib/krb5/krb/bld_princ.c
src/lib/krb5/krb/copy_auth.c
src/lib/krb5/krb/gc_frm_kdc.c
src/lib/krb5/krb/gc_via_tkt.c
src/lib/krb5/krb/gen_subkey.c
src/lib/krb5/krb/get_creds.c
src/lib/krb5/krb/get_in_tkt.c
src/lib/krb5/krb/gic_opt.c
src/lib/krb5/krb/int-proto.h
src/lib/krb5/krb/kfree.c
src/lib/krb5/krb/mk_cred.c
src/lib/krb5/krb/mk_rep.c
src/lib/krb5/krb/mk_req_ext.c
src/lib/krb5/krb/pac.c [new file with mode: 0644]
src/lib/krb5/krb/parse.c
src/lib/krb5/krb/princ_comp.c
src/lib/krb5/krb/rd_priv.c
src/lib/krb5/krb/rd_rep.c
src/lib/krb5/krb/rd_req.c
src/lib/krb5/krb/rd_req_dec.c
src/lib/krb5/krb/serialize.c
src/lib/krb5/krb/unparse.c
src/lib/krb5/krb/valid_times.c
src/lib/krb5/libkrb5.exports
src/lib/krb5/os/accessor.c
src/lib/krb5/os/init_os_ctx.c
src/lib/krb5/os/sn2princ.c
src/lib/krb5/os/timeofday.c
src/lib/krb5/unicode/CompositionExclusions.txt [new file with mode: 0644]
src/lib/krb5/unicode/Makefile.in [new file with mode: 0644]
src/lib/krb5/unicode/UCD-Terms [new file with mode: 0644]
src/lib/krb5/unicode/UnicodeData.txt [new file with mode: 0644]
src/lib/krb5/unicode/ucdata/MUTTUCData.txt [new file with mode: 0644]
src/lib/krb5/unicode/ucdata/README [new file with mode: 0644]
src/lib/krb5/unicode/ucdata/api.txt [new file with mode: 0644]
src/lib/krb5/unicode/ucdata/bidiapi.txt [new file with mode: 0644]
src/lib/krb5/unicode/ucdata/format.txt [new file with mode: 0644]
src/lib/krb5/unicode/ucdata/ucdata.c [new file with mode: 0644]
src/lib/krb5/unicode/ucdata/ucdata.h [new file with mode: 0644]
src/lib/krb5/unicode/ucdata/ucdata.man [new file with mode: 0644]
src/lib/krb5/unicode/ucdata/ucgendat.c [new file with mode: 0644]
src/lib/krb5/unicode/ucdata/ucpgba.c [new file with mode: 0644]
src/lib/krb5/unicode/ucdata/ucpgba.h [new file with mode: 0644]
src/lib/krb5/unicode/ucdata/ucpgba.man [new file with mode: 0644]
src/lib/krb5/unicode/ucdata/uctable.h [new file with mode: 0644]
src/lib/krb5/unicode/ucstr.c [new file with mode: 0644]
src/lib/krb5/unicode/ure/README [new file with mode: 0644]
src/lib/krb5/unicode/ure/ure.c [new file with mode: 0644]
src/lib/krb5/unicode/ure/ure.h [new file with mode: 0644]
src/lib/krb5/unicode/ure/urestubs.c [new file with mode: 0644]
src/lib/krb5/unicode/utbm/README [new file with mode: 0644]
src/lib/krb5/unicode/utbm/utbm.c [new file with mode: 0644]
src/lib/krb5/unicode/utbm/utbm.h [new file with mode: 0644]
src/lib/krb5/unicode/utbm/utbmstub.c [new file with mode: 0644]
src/lib/rpc/Makefile.in
src/patchlevel.h
src/plugins/authdata/greet/greet_auth.c
src/plugins/kdb/db2/Makefile.in
src/plugins/kdb/db2/db2_exp.c
src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c
src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.h
src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
src/util/ss/Makefile.in
src/util/support/Makefile.in
src/util/support/libkrb5support-fixed.exports
src/util/support/utf8.c [new file with mode: 0644]
src/util/support/utf8_conv.c [new file with mode: 0644]