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