From tsitkova at MIT.EDU Mon Aug 3 10:19:17 2009 From: tsitkova at MIT.EDU (tsitkova@MIT.EDU) Date: Mon, 3 Aug 2009 10:19:17 -0400 Subject: svn rev #22477: trunk/src/ lib/crypto/ lib/crypto/builtin/ lib/crypto/builtin/aes/ ... Message-ID: <200908031419.n73EJHmw013112@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22477 Commit By: tsitkova Log Message: Crypto modularity proj: Separate files under crypto directory based on their functionality. Move Kerberos specific files into krb subdir and MIT specific - into builtin subdir. Place all tests into crypto_tests subfolder. bigredbutton: whitespace Changed Files: U trunk/src/Makefile.in U trunk/src/configure.in U trunk/src/lib/crypto/Makefile.in D trunk/src/lib/crypto/aead.c D trunk/src/lib/crypto/aead.h D trunk/src/lib/crypto/aes/ D trunk/src/lib/crypto/arcfour/ D trunk/src/lib/crypto/block_size.c A trunk/src/lib/crypto/builtin/ A trunk/src/lib/crypto/builtin/Makefile.in A trunk/src/lib/crypto/builtin/aes/ A trunk/src/lib/crypto/builtin/aes/Makefile.in A trunk/src/lib/crypto/builtin/aes/aes-gen.c A trunk/src/lib/crypto/builtin/aes/aes.h A trunk/src/lib/crypto/builtin/aes/aes.txt A trunk/src/lib/crypto/builtin/aes/aes_s2k.c A trunk/src/lib/crypto/builtin/aes/aes_s2k.h A trunk/src/lib/crypto/builtin/aes/aescpp.h A trunk/src/lib/crypto/builtin/aes/aescrypp.c A trunk/src/lib/crypto/builtin/aes/aescrypt.asm A trunk/src/lib/crypto/builtin/aes/aescrypt.c A trunk/src/lib/crypto/builtin/aes/aeskey.c A trunk/src/lib/crypto/builtin/aes/aeskeypp.c A trunk/src/lib/crypto/builtin/aes/aesopt.h A trunk/src/lib/crypto/builtin/aes/aessrc.url A trunk/src/lib/crypto/builtin/aes/aestab.c A trunk/src/lib/crypto/builtin/aes/deps A trunk/src/lib/crypto/builtin/aes/uitypes.h A trunk/src/lib/crypto/builtin/arcfour/ A trunk/src/lib/crypto/builtin/arcfour/Makefile.in A trunk/src/lib/crypto/builtin/arcfour/arcfour-int.h A trunk/src/lib/crypto/builtin/arcfour/arcfour.c A trunk/src/lib/crypto/builtin/arcfour/arcfour.h A trunk/src/lib/crypto/builtin/arcfour/arcfour_aead.c A trunk/src/lib/crypto/builtin/arcfour/arcfour_s2k.c A trunk/src/lib/crypto/builtin/arcfour/deps A trunk/src/lib/crypto/builtin/deps A trunk/src/lib/crypto/builtin/des/ A trunk/src/lib/crypto/builtin/des/ISSUES A trunk/src/lib/crypto/builtin/des/Makefile.in A trunk/src/lib/crypto/builtin/des/afsstring2key.c A trunk/src/lib/crypto/builtin/des/d3_aead.c A trunk/src/lib/crypto/builtin/des/d3_cbc.c A trunk/src/lib/crypto/builtin/des/d3_kysched.c A trunk/src/lib/crypto/builtin/des/deps A trunk/src/lib/crypto/builtin/des/des_int.h A trunk/src/lib/crypto/builtin/des/des_prf.c A trunk/src/lib/crypto/builtin/des/doc/ A trunk/src/lib/crypto/builtin/des/doc/libdes.doc A trunk/src/lib/crypto/builtin/des/f_aead.c A trunk/src/lib/crypto/builtin/des/f_cbc.c A trunk/src/lib/crypto/builtin/des/f_cksum.c A trunk/src/lib/crypto/builtin/des/f_parity.c A trunk/src/lib/crypto/builtin/des/f_sched.c A trunk/src/lib/crypto/builtin/des/f_tables.c A trunk/src/lib/crypto/builtin/des/f_tables.h A trunk/src/lib/crypto/builtin/des/key_sched.c A trunk/src/lib/crypto/builtin/des/string2key.c A trunk/src/lib/crypto/builtin/des/weak_key.c A trunk/src/lib/crypto/builtin/hmac.c A trunk/src/lib/crypto/builtin/md4/ A trunk/src/lib/crypto/builtin/md4/ISSUES A trunk/src/lib/crypto/builtin/md4/Makefile.in A trunk/src/lib/crypto/builtin/md4/deps A trunk/src/lib/crypto/builtin/md4/md4.c A trunk/src/lib/crypto/builtin/md4/rsa-md4.h A trunk/src/lib/crypto/builtin/md5/ A trunk/src/lib/crypto/builtin/md5/ISSUES A trunk/src/lib/crypto/builtin/md5/Makefile.in A trunk/src/lib/crypto/builtin/md5/deps A trunk/src/lib/crypto/builtin/md5/md5.c A trunk/src/lib/crypto/builtin/md5/rsa-md5.h A trunk/src/lib/crypto/builtin/pbkdf2.c A trunk/src/lib/crypto/builtin/sha1/ A trunk/src/lib/crypto/builtin/sha1/ISSUES A trunk/src/lib/crypto/builtin/sha1/Makefile.in A trunk/src/lib/crypto/builtin/sha1/deps A trunk/src/lib/crypto/builtin/sha1/shs.c A trunk/src/lib/crypto/builtin/sha1/shs.h D trunk/src/lib/crypto/cf2.c D trunk/src/lib/crypto/checksum_length.c D trunk/src/lib/crypto/cksumtype_to_string.c D trunk/src/lib/crypto/cksumtypes.c D trunk/src/lib/crypto/cksumtypes.h D trunk/src/lib/crypto/coll_proof_cksum.c D trunk/src/lib/crypto/combine_keys.c D trunk/src/lib/crypto/crc32/ D trunk/src/lib/crypto/crypto_length.c D trunk/src/lib/crypto/crypto_libinit.c A trunk/src/lib/crypto/crypto_tests/ A trunk/src/lib/crypto/crypto_tests/Makefile.in A trunk/src/lib/crypto/crypto_tests/aes-test.c A trunk/src/lib/crypto/crypto_tests/deps A trunk/src/lib/crypto/crypto_tests/destest.c A trunk/src/lib/crypto/crypto_tests/expect-vk.txt A trunk/src/lib/crypto/crypto_tests/expect-vt.txt A trunk/src/lib/crypto/crypto_tests/keytest.data A trunk/src/lib/crypto/crypto_tests/t_afss2k.c A trunk/src/lib/crypto/crypto_tests/t_cf2.c A trunk/src/lib/crypto/crypto_tests/t_cf2.comments A trunk/src/lib/crypto/crypto_tests/t_cf2.expected A trunk/src/lib/crypto/crypto_tests/t_cf2.in A trunk/src/lib/crypto/crypto_tests/t_cksum.c A trunk/src/lib/crypto/crypto_tests/t_crc.c A trunk/src/lib/crypto/crypto_tests/t_cts.c A trunk/src/lib/crypto/crypto_tests/t_encrypt.c A trunk/src/lib/crypto/crypto_tests/t_hmac.c A trunk/src/lib/crypto/crypto_tests/t_mdcksum.c A trunk/src/lib/crypto/crypto_tests/t_mddriver.c A trunk/src/lib/crypto/crypto_tests/t_nfold.c A trunk/src/lib/crypto/crypto_tests/t_pkcs5.c A trunk/src/lib/crypto/crypto_tests/t_prf.c A trunk/src/lib/crypto/crypto_tests/t_prf.comments A trunk/src/lib/crypto/crypto_tests/t_prf.expected A trunk/src/lib/crypto/crypto_tests/t_prf.in A trunk/src/lib/crypto/crypto_tests/t_prng.c A trunk/src/lib/crypto/crypto_tests/t_prng.comments A trunk/src/lib/crypto/crypto_tests/t_prng.expected A trunk/src/lib/crypto/crypto_tests/t_prng.reseedtest A trunk/src/lib/crypto/crypto_tests/t_prng.reseedtest-comments A trunk/src/lib/crypto/crypto_tests/t_prng.reseedtest-expected A trunk/src/lib/crypto/crypto_tests/t_prng.seed A trunk/src/lib/crypto/crypto_tests/t_shs.c A trunk/src/lib/crypto/crypto_tests/t_shs3.c A trunk/src/lib/crypto/crypto_tests/t_verify.c A trunk/src/lib/crypto/crypto_tests/test/ A trunk/src/lib/crypto/crypto_tests/test/Readme.txt A trunk/src/lib/crypto/crypto_tests/test/cbc_d_m.txt A trunk/src/lib/crypto/crypto_tests/test/cbc_e_m.txt A trunk/src/lib/crypto/crypto_tests/test/ecb_d_m.txt A trunk/src/lib/crypto/crypto_tests/test/ecb_e_m.txt A trunk/src/lib/crypto/crypto_tests/test/ecb_iv.readme A trunk/src/lib/crypto/crypto_tests/test/ecb_iv.txt A trunk/src/lib/crypto/crypto_tests/test/ecb_tbl.txt A trunk/src/lib/crypto/crypto_tests/test/ecb_vk.txt A trunk/src/lib/crypto/crypto_tests/test/ecb_vt.txt A trunk/src/lib/crypto/crypto_tests/test/katmct.pdf A trunk/src/lib/crypto/crypto_tests/vb.txt A trunk/src/lib/crypto/crypto_tests/vectors.c A trunk/src/lib/crypto/crypto_tests/ytest.c D trunk/src/lib/crypto/decrypt.c D trunk/src/lib/crypto/decrypt_iov.c D trunk/src/lib/crypto/default_state.c U trunk/src/lib/crypto/deps D trunk/src/lib/crypto/des/ D trunk/src/lib/crypto/dk/ D trunk/src/lib/crypto/enc_provider/ D trunk/src/lib/crypto/encrypt.c D trunk/src/lib/crypto/encrypt_iov.c D trunk/src/lib/crypto/encrypt_length.c D trunk/src/lib/crypto/enctype_compare.c D trunk/src/lib/crypto/enctype_to_string.c D trunk/src/lib/crypto/etypes.c D trunk/src/lib/crypto/etypes.h D trunk/src/lib/crypto/hash_provider/ D trunk/src/lib/crypto/hmac.c D trunk/src/lib/crypto/keyblocks.c D trunk/src/lib/crypto/keyed_checksum_types.c D trunk/src/lib/crypto/keyed_cksum.c D trunk/src/lib/crypto/keyhash_provider/ D trunk/src/lib/crypto/keylengths.c A trunk/src/lib/crypto/krb/ A trunk/src/lib/crypto/krb/Makefile.in A trunk/src/lib/crypto/krb/aead.c A trunk/src/lib/crypto/krb/aead.h A trunk/src/lib/crypto/krb/block_size.c A trunk/src/lib/crypto/krb/cf2.c A trunk/src/lib/crypto/krb/checksum_length.c A trunk/src/lib/crypto/krb/cksumtype_to_string.c A trunk/src/lib/crypto/krb/cksumtypes.c A trunk/src/lib/crypto/krb/cksumtypes.h A trunk/src/lib/crypto/krb/coll_proof_cksum.c A trunk/src/lib/crypto/krb/combine_keys.c A trunk/src/lib/crypto/krb/crc32/ A trunk/src/lib/crypto/krb/crc32/CRC.pm A trunk/src/lib/crypto/krb/crc32/Makefile.in A trunk/src/lib/crypto/krb/crc32/Poly.pm A trunk/src/lib/crypto/krb/crc32/crc-32.h A trunk/src/lib/crypto/krb/crc32/crc.pl A trunk/src/lib/crypto/krb/crc32/crc32.c A trunk/src/lib/crypto/krb/crc32/deps A trunk/src/lib/crypto/krb/crypto_length.c A trunk/src/lib/crypto/krb/crypto_libinit.c A trunk/src/lib/crypto/krb/decrypt.c A trunk/src/lib/crypto/krb/decrypt_iov.c A trunk/src/lib/crypto/krb/default_state.c A trunk/src/lib/crypto/krb/deps A trunk/src/lib/crypto/krb/dk/ A trunk/src/lib/crypto/krb/dk/Makefile.in A trunk/src/lib/crypto/krb/dk/checksum.c A trunk/src/lib/crypto/krb/dk/deps A trunk/src/lib/crypto/krb/dk/derive.c A trunk/src/lib/crypto/krb/dk/dk.h A trunk/src/lib/crypto/krb/dk/dk_aead.c A trunk/src/lib/crypto/krb/dk/dk_decrypt.c A trunk/src/lib/crypto/krb/dk/dk_encrypt.c A trunk/src/lib/crypto/krb/dk/dk_prf.c A trunk/src/lib/crypto/krb/dk/stringtokey.c A trunk/src/lib/crypto/krb/enc_provider/ A trunk/src/lib/crypto/krb/enc_provider/Makefile.in A trunk/src/lib/crypto/krb/enc_provider/aes.c A trunk/src/lib/crypto/krb/enc_provider/deps A trunk/src/lib/crypto/krb/enc_provider/des.c A trunk/src/lib/crypto/krb/enc_provider/des3.c A trunk/src/lib/crypto/krb/enc_provider/enc_provider.h A trunk/src/lib/crypto/krb/enc_provider/rc4.c A trunk/src/lib/crypto/krb/encrypt.c A trunk/src/lib/crypto/krb/encrypt_iov.c A trunk/src/lib/crypto/krb/encrypt_length.c A trunk/src/lib/crypto/krb/enctype_compare.c A trunk/src/lib/crypto/krb/enctype_to_string.c A trunk/src/lib/crypto/krb/etypes.c A trunk/src/lib/crypto/krb/etypes.h A trunk/src/lib/crypto/krb/hash_provider/ A trunk/src/lib/crypto/krb/hash_provider/Makefile.in A trunk/src/lib/crypto/krb/hash_provider/deps A trunk/src/lib/crypto/krb/hash_provider/hash_crc32.c A trunk/src/lib/crypto/krb/hash_provider/hash_md4.c A trunk/src/lib/crypto/krb/hash_provider/hash_md5.c A trunk/src/lib/crypto/krb/hash_provider/hash_provider.h A trunk/src/lib/crypto/krb/hash_provider/hash_sha1.c A trunk/src/lib/crypto/krb/keyblocks.c A trunk/src/lib/crypto/krb/keyed_checksum_types.c A trunk/src/lib/crypto/krb/keyed_cksum.c A trunk/src/lib/crypto/krb/keyhash_provider/ A trunk/src/lib/crypto/krb/keyhash_provider/Makefile.in A trunk/src/lib/crypto/krb/keyhash_provider/deps A trunk/src/lib/crypto/krb/keyhash_provider/descbc.c A trunk/src/lib/crypto/krb/keyhash_provider/hmac_md5.c A trunk/src/lib/crypto/krb/keyhash_provider/k5_md4des.c A trunk/src/lib/crypto/krb/keyhash_provider/k5_md5des.c A trunk/src/lib/crypto/krb/keyhash_provider/keyhash_provider.h A trunk/src/lib/crypto/krb/keyhash_provider/md5_hmac.c A trunk/src/lib/crypto/krb/keylengths.c A trunk/src/lib/crypto/krb/make_checksum.c A trunk/src/lib/crypto/krb/make_checksum_iov.c A trunk/src/lib/crypto/krb/make_random_key.c A trunk/src/lib/crypto/krb/mandatory_sumtype.c A trunk/src/lib/crypto/krb/nfold.c A trunk/src/lib/crypto/krb/old/ A trunk/src/lib/crypto/krb/old/Makefile.in A trunk/src/lib/crypto/krb/old/deps A trunk/src/lib/crypto/krb/old/des_stringtokey.c A trunk/src/lib/crypto/krb/old/old.h A trunk/src/lib/crypto/krb/old/old_decrypt.c A trunk/src/lib/crypto/krb/old/old_encrypt.c A trunk/src/lib/crypto/krb/old_api_glue.c A trunk/src/lib/crypto/krb/prf.c A trunk/src/lib/crypto/krb/prng.c A trunk/src/lib/crypto/krb/random_to_key.c A trunk/src/lib/crypto/krb/raw/ A trunk/src/lib/crypto/krb/raw/Makefile.in A trunk/src/lib/crypto/krb/raw/deps A trunk/src/lib/crypto/krb/raw/raw.h A trunk/src/lib/crypto/krb/raw/raw_aead.c A trunk/src/lib/crypto/krb/raw/raw_decrypt.c A trunk/src/lib/crypto/krb/raw/raw_encrypt.c A trunk/src/lib/crypto/krb/state.c A trunk/src/lib/crypto/krb/string_to_cksumtype.c A trunk/src/lib/crypto/krb/string_to_enctype.c A trunk/src/lib/crypto/krb/string_to_key.c A trunk/src/lib/crypto/krb/valid_cksumtype.c A trunk/src/lib/crypto/krb/valid_enctype.c A trunk/src/lib/crypto/krb/verify_checksum.c A trunk/src/lib/crypto/krb/verify_checksum_iov.c A trunk/src/lib/crypto/krb/yarrow/ A trunk/src/lib/crypto/krb/yarrow/ASSUMPTIONS A trunk/src/lib/crypto/krb/yarrow/LICENSE A trunk/src/lib/crypto/krb/yarrow/Makefile.in A trunk/src/lib/crypto/krb/yarrow/README A trunk/src/lib/crypto/krb/yarrow/TODO A trunk/src/lib/crypto/krb/yarrow/deps A trunk/src/lib/crypto/krb/yarrow/yarrow.c A trunk/src/lib/crypto/krb/yarrow/yarrow.h A trunk/src/lib/crypto/krb/yarrow/yarrow.man A trunk/src/lib/crypto/krb/yarrow/yarrow.pod A trunk/src/lib/crypto/krb/yarrow/ycipher.c A trunk/src/lib/crypto/krb/yarrow/ycipher.h A trunk/src/lib/crypto/krb/yarrow/yexcep.h A trunk/src/lib/crypto/krb/yarrow/yhash.h A trunk/src/lib/crypto/krb/yarrow/ylock.h A trunk/src/lib/crypto/krb/yarrow/ystate.h A trunk/src/lib/crypto/krb/yarrow/ytypes.h D trunk/src/lib/crypto/make_checksum.c D trunk/src/lib/crypto/make_checksum_iov.c D trunk/src/lib/crypto/make_random_key.c D trunk/src/lib/crypto/mandatory_sumtype.c D trunk/src/lib/crypto/md4/ D trunk/src/lib/crypto/md5/ D trunk/src/lib/crypto/nfold.c D trunk/src/lib/crypto/old/ D trunk/src/lib/crypto/old_api_glue.c D trunk/src/lib/crypto/pbkdf2.c D trunk/src/lib/crypto/prf.c D trunk/src/lib/crypto/prng.c D trunk/src/lib/crypto/random_to_key.c D trunk/src/lib/crypto/raw/ D trunk/src/lib/crypto/sha1/ D trunk/src/lib/crypto/state.c D trunk/src/lib/crypto/string_to_cksumtype.c D trunk/src/lib/crypto/string_to_enctype.c D trunk/src/lib/crypto/string_to_key.c D trunk/src/lib/crypto/t_cf2.c D trunk/src/lib/crypto/t_cf2.comments D trunk/src/lib/crypto/t_cf2.expected D trunk/src/lib/crypto/t_cf2.in D trunk/src/lib/crypto/t_cts.c D trunk/src/lib/crypto/t_encrypt.c D trunk/src/lib/crypto/t_hmac.c D trunk/src/lib/crypto/t_nfold.c D trunk/src/lib/crypto/t_pkcs5.c D trunk/src/lib/crypto/t_prf.c D trunk/src/lib/crypto/t_prf.comments D trunk/src/lib/crypto/t_prf.expected D trunk/src/lib/crypto/t_prf.in D trunk/src/lib/crypto/t_prng.c D trunk/src/lib/crypto/t_prng.comments D trunk/src/lib/crypto/t_prng.expected D trunk/src/lib/crypto/t_prng.reseedtest D trunk/src/lib/crypto/t_prng.reseedtest-comments D trunk/src/lib/crypto/t_prng.reseedtest-expected D trunk/src/lib/crypto/t_prng.seed D trunk/src/lib/crypto/valid_cksumtype.c D trunk/src/lib/crypto/valid_enctype.c D trunk/src/lib/crypto/vectors.c D trunk/src/lib/crypto/verify_checksum.c D trunk/src/lib/crypto/verify_checksum_iov.c D trunk/src/lib/crypto/yarrow/ U trunk/src/util/collected-client-lib/Makefile.in Modified: trunk/src/Makefile.in =================================================================== --- trunk/src/Makefile.in 2009-08-01 02:25:56 UTC (rev 22476) +++ trunk/src/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -194,14 +194,15 @@ clients\kcpytkt\Makefile clients\kdeltkt\Makefile \ include\Makefile \ lib\Makefile lib\crypto\Makefile \ - lib\crypto\crc32\Makefile lib\crypto\des\Makefile \ - lib\crypto\dk\Makefile lib\crypto\enc_provider\Makefile \ - lib\crypto\hash_provider\Makefile \ - lib\crypto\keyhash_provider\Makefile \ - lib\crypto\raw\Makefile lib\crypto\old\Makefile \ - lib\crypto\sha1\Makefile lib\crypto\arcfour\Makefile \ - lib\crypto\md4\Makefile lib\crypto\md5\Makefile \ - lib\crypto\yarrow\Makefile lib\crypto\aes\Makefile \ + lib\crypto\krb\crc32\Makefile lib\crypto\builtin\des\Makefile \ + lib\crypto\krb\dk\Makefile lib\crypto\krb\enc_provider\Makefile \ + lib\crypto\krb\hash_provider\Makefile \ + lib\crypto\krb\keyhash_provider\Makefile \ + lib\crypto\krb\raw\Makefile lib\crypto\old\Makefile \ + lib\crypto\builtin\sha1\Makefile lib\crypto\builtin\arcfour\Makefile \ + lib\crypto\builtin\md4\Makefile lib\crypto\builtin\md5\Makefile \ + lib\crypto\krb\yarrow\Makefile lib\crypto\builtin\aes\Makefile \ + lib\crypto\crypto_tests \ lib\gssapi\Makefile lib\gssapi\generic\Makefile \ lib\gssapi\krb5\Makefile lib\gssapi\mechglue\Makefile \ lib\gssapi\spnego\Makefile \ @@ -261,34 +262,38 @@ ##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\crypto\Makefile: lib\crypto\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ -##DOS##lib\crypto\crc32\Makefile: lib\crypto\crc32\Makefile.in $(MKFDEP) +##DOS##lib\crypto\krb\crc32\Makefile: lib\crypto\krb\crc32\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ -##DOS##lib\crypto\des\Makefile: lib\crypto\des\Makefile.in $(MKFDEP) +##DOS##lib\crypto\builtin\des\Makefile: lib\crypto\builtin\des\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ -##DOS##lib\crypto\dk\Makefile: lib\crypto\dk\Makefile.in $(MKFDEP) +##DOS##lib\crypto\krb\dk\Makefile: lib\crypto\krb\dk\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ -##DOS##lib\crypto\enc_provider\Makefile: lib\crypto\enc_provider\Makefile.in $(MKFDEP) +##DOS##lib\crypto\krb\enc_provider\Makefile: lib\crypto\krb\enc_provider\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ -##DOS##lib\crypto\hash_provider\Makefile: lib\crypto\hash_provider\Makefile.in $(MKFDEP) +##DOS##lib\crypto\krb\hash_provider\Makefile: lib\crypto\krb\hash_provider\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ -##DOS##lib\crypto\keyhash_provider\Makefile: lib\crypto\keyhash_provider\Makefile.in $(MKFDEP) +##DOS##lib\crypto\krb\keyhash_provider\Makefile: lib\crypto\krb\keyhash_provider\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ -##DOS##lib\crypto\sha1\Makefile: lib\crypto\sha1\Makefile.in $(MKFDEP) +##DOS##lib\crypto\builtin\sha1\Makefile: lib\crypto\builtin\sha1\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ -##DOS##lib\crypto\arcfour\Makefile: lib\crypto\arcfour\Makefile.in $(MKFDEP) +##DOS##lib\crypto\builtin\arcfour\Makefile: lib\crypto\builtin\arcfour\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ -##DOS##lib\crypto\md4\Makefile: lib\crypto\md4\Makefile.in $(MKFDEP) +##DOS##lib\crypto\builtin\md4\Makefile: lib\crypto\builtin\md4\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ -##DOS##lib\crypto\md5\Makefile: lib\crypto\md5\Makefile.in $(MKFDEP) +##DOS##lib\crypto\builtin\md5\Makefile: lib\crypto\md5\builtin\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ -##DOS##lib\crypto\yarrow\Makefile: lib\crypto\yarrow\Makefile.in $(MKFDEP) +##DOS##lib\crypto\krb\yarrow\Makefile: lib\crypto\krb\yarrow\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ -##DOS##lib\crypto\aes\Makefile: lib\crypto\aes\Makefile.in $(MKFDEP) +##DOS##lib\crypto\builtin\aes\Makefile: lib\crypto\builtin\aes\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ -##DOS##lib\crypto\old\Makefile: lib\crypto\old\Makefile.in $(MKFDEP) +##DOS##lib\crypto\krb\old\Makefile: lib\crypto\krb\old\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ -##DOS##lib\crypto\raw\Makefile: lib\crypto\raw\Makefile.in $(MKFDEP) +##DOS##lib\crypto\krb\raw\Makefile: lib\crypto\krb\raw\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ +##DOS##lib\crypto\krb\Makefile: lib\crypto\krb\Makefile.in $(MKFDEP) +##DOS## $(WCONFIG) config < $@.in > $@ +##DOS##lib\crypto\builtin\Makefile: lib\crypto\builtin\Makefile.in $(MKFDEP) +##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\gssapi\Makefile: lib\gssapi\Makefile.in $(MKFDEP) ##DOS## $(WCONFIG) config < $@.in > $@ ##DOS##lib\gssapi\generic\Makefile: lib\gssapi\generic\Makefile.in $(MKFDEP) @@ -389,11 +394,12 @@ clients/kpasswd/* clients/kcpytkt/* clients/kdeltkt/* \ config/* include/* include/kerberosIV/* \ include/krb5/* include/krb5/stock/* include/sys/* lib/* \ - lib/crypto/* lib/crypto/crc32/* lib/crypto/des/* lib/crypto/dk/* \ - lib/crypto/enc_provider/* lib/crypto/hash_provider/* \ - lib/crypto/keyhash_provider/* lib/crypto/old/* lib/crypto/raw/* \ - lib/crypto/sha1/* lib/crypto/arcfour/* lib/crypto/md4/* \ - lib/crypto/md5/* lib/crypto/yarrow/* \ + lib/crypto/* lib/crypto/krb/crc32/* lib/crypto/builtin/des/* lib/crypto/krb/dk/* \ + lib/crypto/krb/enc_provider/* lib/crypto/krb/hash_provider/* \ + lib/crypto/krb/keyhash_provider/* lib/crypto/krb/old/* lib/crypto/krb/raw/* \ + lib/crypto/builtin/sha1/* lib/crypto/builtin/arcfour/* lib/crypto/builtin/md4/* \ + lib/crypto/builtin/md5/* lib/crypto/krb/yarrow/* \ + lib/crypto/builtin/* lib/crypto/krb/* lib/crypto/crypto_tests \ lib/gssapi/* lib/gssapi/generic/* lib/gssapi/krb5/* \ lib/gssapi/mechglue/* lib/gssapi/spnego/* \ lib/krb5/* lib/krb5/asn.1/* lib/krb5/krb/* \ Modified: trunk/src/configure.in =================================================================== --- trunk/src/configure.in 2009-08-01 02:25:56 UTC (rev 22476) +++ trunk/src/configure.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -1059,11 +1059,13 @@ lib lib/kdb - lib/crypto lib/crypto/crc32 lib/crypto/des lib/crypto/dk - lib/crypto/enc_provider lib/crypto/hash_provider - lib/crypto/keyhash_provider lib/crypto/md4 lib/crypto/md5 - lib/crypto/old lib/crypto/raw lib/crypto/sha1 - lib/crypto/arcfour lib/crypto/yarrow lib/crypto/aes + lib/crypto lib/crypto/krb/ lib/crypto/krb/crc32 lib/crypto/builtin/des lib/crypto/krb/dk + lib/crypto/krb/enc_provider lib/crypto/krb/hash_provider + lib/crypto/krb/keyhash_provider + lib/crypto/builtin lib/crypto/builtin/md4 lib/crypto/builtin/md5 + lib/crypto/krb/old lib/crypto/krb/raw lib/crypto/builtin/sha1 + lib/crypto/builtin/arcfour lib/crypto/krb/yarrow lib/crypto/builtin/aes + lib/crypto/crypto_tests lib/krb5 lib/krb5/error_tables lib/krb5/asn.1 lib/krb5/ccache dnl lib/krb5/ccache/ccapi Modified: trunk/src/lib/crypto/Makefile.in =================================================================== --- trunk/src/lib/crypto/Makefile.in 2009-08-01 02:25:56 UTC (rev 22476) +++ trunk/src/lib/crypto/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -2,171 +2,17 @@ myfulldir=lib/crypto mydir=lib/crypto BUILDTOP=$(REL)..$(S).. -SUBDIRS=crc32 des dk enc_provider hash_provider keyhash_provider \ - md4 md5 old raw sha1 arcfour yarrow aes -LOCALINCLUDES = -I$(srcdir)/enc_provider \ - -I$(srcdir)/hash_provider -I$(srcdir)/keyhash_provider \ - -I$(srcdir)/aes \ - -I$(srcdir)/old -I$(srcdir)/raw -I$(srcdir)/dk -I$(srcdir)/arcfour \ - -I$(srcdir)/yarrow -I$(srcdir)/sha1 -I$(srcdir)/md5 +SUBDIRS=krb builtin crypto_tests + RUN_SETUP = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) DEFS= -EXTRADEPSRCS=\ - $(srcdir)/t_nfold.c \ - $(srcdir)/t_cf2.c \ - $(srcdir)/t_encrypt.c \ - $(srcdir)/t_prf.c \ - $(srcdir)/t_prng.c \ - $(srcdir)/t_hmac.c \ - $(srcdir)/t_pkcs5.c \ - $(srcdir)/t_cts.c \ - $(srcdir)/vectors.c - -##DOSBUILDTOP = ..\.. -##DOSLIBNAME=$(OUTPRE)crypto.lib -##DOSOBJFILE=$(OUTPRE)crypto.lst -##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)arcfour.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)kh_pro.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)aes.lst -##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)arcfour.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst $(OUTPRE)aes.lst - PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) -STLIBOBJS=\ - aead.o \ - block_size.o \ - cf2.o \ - checksum_length.o \ - cksumtype_to_string.o \ - cksumtypes.o \ - coll_proof_cksum.o \ - combine_keys.o \ - crypto_length.o \ - crypto_libinit.o \ - default_state.o \ - decrypt.o \ - decrypt_iov.o \ - encrypt.o \ - encrypt_iov.o \ - encrypt_length.o \ - enctype_compare.o \ - enctype_to_string.o \ - etypes.o \ - hmac.o \ - keyblocks.o \ - keyed_cksum.o \ - keyed_checksum_types.o \ - keylengths.o \ - make_checksum.o \ - make_checksum_iov.o \ - make_random_key.o \ - mandatory_sumtype.o \ - nfold.o \ - old_api_glue.o \ - pbkdf2.o \ - prf.o \ - prng.o \ - random_to_key.o \ - state.o \ - string_to_cksumtype.o \ - string_to_enctype.o \ - string_to_key.o \ - valid_cksumtype.o \ - valid_enctype.o \ - verify_checksum.o \ - verify_checksum_iov.o -OBJS=\ - $(OUTPRE)aead.$(OBJEXT) \ - $(OUTPRE)block_size.$(OBJEXT) \ - $(OUTPRE)cf2$(OBJEXT) \ - $(OUTPRE)checksum_length.$(OBJEXT) \ - $(OUTPRE)cksumtype_to_string.$(OBJEXT) \ - $(OUTPRE)cksumtypes.$(OBJEXT) \ - $(OUTPRE)coll_proof_cksum.$(OBJEXT) \ - $(OUTPRE)combine_keys.$(OBJEXT) \ - $(OUTPRE)crypto_length.$(OBJEXT) \ - $(OUTPRE)crypto_libinit.$(OBJEXT) \ - $(OUTPRE)default_state.$(OBJEXT) \ - $(OUTPRE)decrypt.$(OBJEXT) \ - $(OUTPRE)decrypt_iov.$(OBJEXT) \ - $(OUTPRE)encrypt.$(OBJEXT) \ - $(OUTPRE)encrypt_iov.$(OBJEXT) \ - $(OUTPRE)encrypt_length.$(OBJEXT) \ - $(OUTPRE)enctype_compare.$(OBJEXT) \ - $(OUTPRE)enctype_to_string.$(OBJEXT) \ - $(OUTPRE)etypes.$(OBJEXT) \ - $(OUTPRE)hmac.$(OBJEXT) \ - $(OUTPRE)keyblocks.$(OBJEXT) \ - $(OUTPRE)keyed_cksum.$(OBJEXT) \ - $(OUTPRE)keyed_checksum_types.$(OBJEXT) \ - $(OUTPRE)keylengths.$(OBJEXT) \ - $(OUTPRE)make_checksum.$(OBJEXT) \ - $(OUTPRE)make_checksum_iov.$(OBJEXT) \ - $(OUTPRE)make_random_key.$(OBJEXT) \ - $(OUTPRE)mandatory_sumtype.$(OBJEXT) \ - $(OUTPRE)nfold.$(OBJEXT) \ - $(OUTPRE)old_api_glue.$(OBJEXT) \ - $(OUTPRE)pbkdf2.$(OBJEXT) \ - $(OUTPRE)prf.$(OBJEXT) \ - $(OUTPRE)prng.$(OBJEXT) \ - $(OUTPRE)random_to_key.$(OBJEXT) \ - $(OUTPRE)state.$(OBJEXT) \ - $(OUTPRE)string_to_cksumtype.$(OBJEXT) \ - $(OUTPRE)string_to_enctype.$(OBJEXT) \ - $(OUTPRE)string_to_key.$(OBJEXT) \ - $(OUTPRE)valid_cksumtype.$(OBJEXT) \ - $(OUTPRE)valid_enctype.$(OBJEXT) \ - $(OUTPRE)verify_checksum.$(OBJEXT) \ - $(OUTPRE)verify_checksum_iov.$(OBJEXT) - -SRCS=\ - $(srcdir)/aead.c \ - $(srcdir)/block_size.c \ - $(srcdir)/checksum_length.c \ - $(srcdir)/cksumtype_to_string.c \ - $(srcdir)/cksumtypes.c \ - $(srcdir)/coll_proof_cksum.c \ - $(srcdir)/combine_keys.c \ - $(srcdir)/crypto_length.c \ - $(srcdir)/crypto_libinit.c \ - $(srcdir)/default_state.c \ - $(srcdir)/decrypt.c \ - $(srcdir)/decrypt_iov.c \ - $(srcdir)/encrypt.c \ - $(srcdir)/encrypt_iov.c \ - $(srcdir)/encrypt_length.c \ - $(srcdir)/enctype_compare.c \ - $(srcdir)/enctype_to_string.c \ - $(srcdir)/etypes.c \ - $(srcdir)/hmac.c \ - $(srcdir)/keyblocks.c \ - $(srcdir)/keyed_cksum.c \ - $(srcdir)/keyed_checksum_types.c\ - $(srcdir)/keylengths.c \ - $(srcdir)/make_checksum.c \ - $(srcdir)/make_checksum_iov.c \ - $(srcdir)/make_random_key.c \ - $(srcdir)/mandatory_sumtype.c \ - $(srcdir)/nfold.c \ - $(srcdir)/old_api_glue.c \ - $(srcdir)/pbkdf2.c \ - $(srcdir)/prf.c \ - $(srcdir)/cf2.c \ - $(srcdir)/prng.c \ - $(srcdir)/random_to_key.c \ - $(srcdir)/state.c \ - $(srcdir)/string_to_cksumtype.c \ - $(srcdir)/string_to_enctype.c \ - $(srcdir)/string_to_key.c \ - $(srcdir)/valid_cksumtype.c \ - $(srcdir)/valid_enctype.c \ - $(srcdir)/verify_checksum.c \ - $(srcdir)/verify_checksum_iov.c - - LIBBASE=k5crypto LIBMAJOR=3 LIBMINOR=1 @@ -174,18 +20,20 @@ LIBFINIFUNC=cryptoint_cleanup_library RELDIR=crypto -STOBJLISTS=crc32/OBJS.ST des/OBJS.ST dk/OBJS.ST enc_provider/OBJS.ST \ - hash_provider/OBJS.ST keyhash_provider/OBJS.ST md4/OBJS.ST \ - md5/OBJS.ST old/OBJS.ST raw/OBJS.ST sha1/OBJS.ST arcfour/OBJS.ST \ - aes/OBJS.ST \ - yarrow/OBJS.ST \ - OBJS.ST -SUBDIROBJLISTS=crc32/OBJS.ST des/OBJS.ST dk/OBJS.ST enc_provider/OBJS.ST \ - hash_provider/OBJS.ST keyhash_provider/OBJS.ST md4/OBJS.ST \ - md5/OBJS.ST old/OBJS.ST raw/OBJS.ST sha1/OBJS.ST arcfour/OBJS.ST \ - aes/OBJS.ST \ - yarrow/OBJS.ST +STOBJLISTS=krb/crc32/OBJS.ST krb/dk/OBJS.ST krb/enc_provider/OBJS.ST \ + krb/hash_provider/OBJS.ST krb/keyhash_provider/OBJS.ST \ + krb/old/OBJS.ST krb/raw/OBJS.ST krb/yarrow/OBJS.ST \ + @CRYPTO_IMPL@/md4/OBJS.ST @CRYPTO_IMPL@/md5/OBJS.ST @CRYPTO_IMPL@/sha1/OBJS.ST \ + @CRYPTO_IMPL@/arcfour/OBJS.ST @CRYPTO_IMPL@/aes/OBJS.ST @CRYPTO_IMPL@/des/OBJS.ST \ + krb/OBJS.ST @CRYPTO_IMPL@/OBJS.ST +SUBDIROBJLISTS=krb/crc32/OBJS.ST krb/dk/OBJS.ST krb/enc_provider/OBJS.ST \ + krb/hash_provider/OBJS.ST krb/keyhash_provider/OBJS.ST \ + krb/old/OBJS.ST krb/raw/OBJS.ST krb/yarrow/OBJS.ST \ + @CRYPTO_IMPL@/md4/OBJS.ST @CRYPTO_IMPL@/md5/OBJS.ST @CRYPTO_IMPL@/sha1/OBJS.ST \ + @CRYPTO_IMPL@/arcfour/OBJS.ST @CRYPTO_IMPL@/aes/OBJS.ST @CRYPTO_IMPL@/des/OBJS.ST \ + krb/OBJS.ST @CRYPTO_IMPL@/OBJS.ST + # No dependencies. Record places to find this shared object if the target # link editor and loader support it. DEPLIBS= @@ -201,196 +49,39 @@ all-unix:: all-liblinks install-unix:: install-libs + +# all-unix:: +# install-unix:: + libcrypto.lib: libdir crypto.lib clean-unix:: clean-liblinks clean-libs clean-libobjs -check-unix:: t_nfold t_encrypt t_prf t_prng t_hmac t_pkcs5 t_cf2 - $(RUN_SETUP) $(VALGRIND) ./t_nfold - $(RUN_SETUP) $(VALGRIND) ./t_encrypt - $(RUN_SETUP) $(VALGRIND) ./t_prng <$(srcdir)/t_prng.seed >t_prng.output && \ - diff t_prng.output $(srcdir)/t_prng.expected - $(RUN_SETUP) $(VALGRIND) ./t_hmac - $(RUN_SETUP) $(VALGRIND) ./t_prf <$(srcdir)/t_prf.in >t_prf.output - diff t_prf.output $(srcdir)/t_prf.expected - $(RUN_SETUP) $(VALGRIND) ./t_cf2 <$(srcdir)/t_cf2.in >t_cf2.output - diff t_cf2.output $(srcdir)/t_cf2.expected - - -# $(RUN_SETUP) $(VALGRIND) ./t_pkcs5 - -t_nfold$(EXEEXT): t_nfold.$(OBJEXT) nfold.$(OBJEXT) $(SUPPORT_DEPLIB) - $(CC_LINK) -o $@ t_nfold.$(OBJEXT) nfold.$(OBJEXT) $(SUPPORT_LIB) - -t_encrypt$(EXEEXT): t_encrypt.$(OBJEXT) nfold.$(OBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) - $(CC_LINK) -o $@ t_encrypt.$(OBJEXT) -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) - -t_prf$(EXEEXT): t_prf.$(OBJEXT) $(SUPPORT_DEPLIB) - $(CC_LINK) -o $@ t_prf.$(OBJEXT) -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) - -t_cf2$(EXEEXT): t_cf2.$(OBJEXT) $(SUPPORT_DEPLIB) - $(CC_LINK) -o $@ t_cf2.$(OBJEXT) -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) - - -t_prng$(EXEEXT): t_prng.$(OBJEXT) $(SUPPORT_DEPLIB) - $(CC_LINK) -o $@ t_prng.$(OBJEXT) -lk5crypto -lcom_err $(SUPPORT_LIB) - -t_hmac$(EXEEXT): t_hmac.$(OBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) - $(CC_LINK) -o $@ t_hmac.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) - -t_pkcs5$(EXEEXT): t_pkcs5.$(OBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) - $(CC_LINK) -o $@ t_pkcs5.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) - -vectors$(EXEEXT): vectors.$(OBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) - $(CC_LINK) -o $@ vectors.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) - -t_cts$(EXEEXT): t_cts.$(OBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) - $(CC_LINK) -o $@ t_cts.$(OBJEXT) \ - $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) - - -clean:: - $(RM) t_nfold.o t_nfold t_encrypt t_encrypt.o t_prng.o t_prng \ - t_hmac.o t_hmac t_pkcs5.o t_pkcs5 pbkdf2.o t_prf t_prf.o t_cf2 t_cf2.o - -$(RM) t_prng.output - all-windows:: - cd crc32 - @echo Making in crypto\crc32 + cd krb + @echo Making in crypto\krb $(MAKE) -$(MFLAGS) - cd ..\des - @echo Making in crypto\des + cd ..\@CRYPTO_IMPL@ + @echo Making in crypto\@CRYPTO_IMPL@ $(MAKE) -$(MFLAGS) - cd ..\dk - @echo Making in crypto\dk + cd ..\crypto_tests + @echo Making in crypto\crypto_tests $(MAKE) -$(MFLAGS) - cd ..\enc_provider - @echo Making in crypto\enc_provider - $(MAKE) -$(MFLAGS) - cd ..\hash_provider - @echo Making in crypto\hash_provider - $(MAKE) -$(MFLAGS) - cd ..\keyhash_provider - @echo Making in crypto\keyhash_provider - $(MAKE) -$(MFLAGS) - cd ..\md4 - @echo Making in crypto\md4 - $(MAKE) -$(MFLAGS) - cd ..\md5 - @echo Making in crypto\md5 - $(MAKE) -$(MFLAGS) - cd ..\old - @echo Making in crypto\old - $(MAKE) -$(MFLAGS) - cd ..\raw - @echo Making in crypto\raw - $(MAKE) -$(MFLAGS) - cd ..\sha1 - @echo Making in crypto\sha1 - $(MAKE) -$(MFLAGS) - cd ..\arcfour - @echo Making in crypto\arcfour - $(MAKE) -$(MFLAGS) - cd ..\yarrow - @echo Making in crypto\yarrow - $(MAKE) -$(MFLAGS) - cd ..\aes - @echo Making in crypto\aes - $(MAKE) -$(MFLAGS) cd .. clean-windows:: - cd crc32 - @echo Making in clean crypto\crc32 + cd krb + @echo Making in clean crypto\krb $(MAKE) -$(MFLAGS) clean - cd ..\des - @echo Making clean in crypto\des + cd ..\@CRYPTO_IMPL@ + @echo Making clean in crypto\@CRYPTO_IMPL@ $(MAKE) -$(MFLAGS) clean - cd ..\dk - @echo Making clean in crypto\dk + cd ..\crypto_tests + @echo Making clean in crypto\crypto_tests $(MAKE) -$(MFLAGS) clean - cd ..\enc_provider - @echo Making clean in crypto\enc_provider - $(MAKE) -$(MFLAGS) clean - cd ..\hash_provider - @echo Making clean in crypto\hash_provider - $(MAKE) -$(MFLAGS) clean - cd ..\keyhash_provider - @echo Making clean in crypto\keyhash_provider - $(MAKE) -$(MFLAGS) clean - cd ..\md4 - @echo Making clean in crypto\md4 - $(MAKE) -$(MFLAGS) clean - cd ..\md5 - @echo Making clean in crypto\md5 - $(MAKE) -$(MFLAGS) clean - cd ..\old - @echo Making clean in crypto\old - $(MAKE) -$(MFLAGS) clean - cd ..\raw - @echo Making clean in crypto\raw - $(MAKE) -$(MFLAGS) clean - cd ..\sha1 - @echo Making clean in crypto\sha1 - $(MAKE) -$(MFLAGS) clean - cd ..\arcfour - @echo Making clean in crypto\arcfour - $(MAKE) -$(MFLAGS) clean - cd ..\yarrow - @echo Making clean in crypto\yarrow - $(MAKE) -$(MFLAGS) clean - cd ..\aes - @echo Making clean in crypto\aes - $(MAKE) -$(MFLAGS) clean cd .. -check-windows:: - cd crc32 - @echo Making in check crypto\crc32 - $(MAKE) -$(MFLAGS) check - cd ..\des - @echo Making check in crypto\des - $(MAKE) -$(MFLAGS) check - cd ..\dk - @echo Making check in crypto\dk - $(MAKE) -$(MFLAGS) check - cd ..\enc_provider - @echo Making check in crypto\enc_provider - $(MAKE) -$(MFLAGS) check - cd ..\hash_provider - @echo Making check in crypto\hash_provider - $(MAKE) -$(MFLAGS) check - cd ..\keyhash_provider - @echo Making check in crypto\keyhash_provider - $(MAKE) -$(MFLAGS) check - cd ..\md4 - @echo Making check in crypto\md4 - $(MAKE) -$(MFLAGS) check - cd ..\md5 - @echo Making check in crypto\md5 - $(MAKE) -$(MFLAGS) check - cd ..\old - @echo Making check in crypto\old - $(MAKE) -$(MFLAGS) check - cd ..\raw - @echo Making check in crypto\raw - $(MAKE) -$(MFLAGS) check - cd ..\sha1 - @echo Making check in crypto\sha1 - $(MAKE) -$(MFLAGS) check - cd ..\arcfour - @echo Making check in crypto\arcfour - $(MAKE) -$(MFLAGS) check - cd ..\yarrow - @echo Making check in crypto\yarrow - $(MAKE) -$(MFLAGS) check - cd ..\aes - @echo Making check in crypto\aes - $(MAKE) -$(MFLAGS) check - cd .. - - @lib_frag@ @libobj_frag@ Deleted: trunk/src/lib/crypto/aead.c Deleted: trunk/src/lib/crypto/aead.h Deleted: trunk/src/lib/crypto/block_size.c Copied: trunk/src/lib/crypto/builtin/Makefile.in (from rev 22475, trunk/src/lib/crypto/des/Makefile.in) =================================================================== --- trunk/src/lib/crypto/des/Makefile.in 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/builtin/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,123 @@ +thisconfigdir=../../.. +myfulldir=lib/crypto/builtin +mydir=lib/crypto/builtin +BUILDTOP=$(REL)..$(S)..$(S).. +SUBDIRS=../@CRYPTO_IMPL@/des ../@CRYPTO_IMPL@/arcfour ../@CRYPTO_IMPL@/aes \ + ../@CRYPTO_IMPL@/md4 ../@CRYPTO_IMPL@/md5 ../@CRYPTO_IMPL@/sha1 +LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir)/../krb/hash_provider \ + -I$(srcdir)/../@CRYPTO_IMPL@/des \ + -I$(srcdir)/../@CRYPTO_IMPL@/aes \ + -I$(srcdir)/../@CRYPTO_IMPL@/arcfour \ + -I$(srcdir)/../@CRYPTO_IMPL@/sha1 \ + -I$(srcdir)/../@CRYPTO_IMPL@/md4 \ + -I$(srcdir)/../@CRYPTO_IMPL@/md5 +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) +DEFS= + + +##DOSBUILDTOP = ..\..\.. +##DOSLIBNAME=$(OUTPRE)crypto.lib +##DOSOBJFILE=$(OUTPRE)crypto.lst +##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)arcfour.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)kh_pro.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)aes.lst +##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)arcfour.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst $(OUTPRE)aes.lst + +STLIBOBJS=\ + hmac.o \ + pbkdf2.o + +OBJS=\ + $(OUTPRE)../@CRYPTO_IMPL@/hmac.$(OBJEXT) \ + $(OUTPRE)../@CRYPTO_IMPL@/pbkdf2.$(OBJEXT) + +SRCS=\ + $(srcdir)/../@CRYPTO_IMPL@/hmac.c \ + $(srcdir)/../@CRYPTO_IMPL@/pbkdf2.c + +STOBJLISTS= ../@CRYPTO_IMPL@/des/OBJS.ST ../@CRYPTO_IMPL@/md4/OBJS.ST \ + ../@CRYPTO_IMPL@/md5/OBJS.ST ../@CRYPTO_IMPL@/sha1/OBJS.ST \ + ../@CRYPTO_IMPL@/arcfour/OBJS.ST \ + ../@CRYPTO_IMPL@/aes/OBJS.ST \ + ../@CRYPTO_IMPL@/OBJS.ST + +SUBDIROBJLISTS= ../@CRYPTO_IMPL@/des/OBJS.ST ../@CRYPTO_IMPL@/md4/OBJS.ST \ + ../@CRYPTO_IMPL@/md5/OBJS.ST ../@CRYPTO_IMPL@/sha1/OBJS.ST \ + ../@CRYPTO_IMPL@/arcfour/OBJS.ST \ + ../@CRYPTO_IMPL@/aes/OBJS.ST ../@CRYPTO_IMPL@/OBJS.ST + +##DOS##LIBOBJS = $(OBJS) + +all-unix:: all-libobjs +includes:: depend + +depend:: $(SRCS) + +clean-unix:: clean-libobjs + +all-windows:: + cd ..\des + @echo Making in crypto\des + $(MAKE) -$(MFLAGS) + cd ..\md4 + @echo Making in crypto\md4 + $(MAKE) -$(MFLAGS) + cd ..\md5 + @echo Making in crypto\md5 + $(MAKE) -$(MFLAGS) + cd ..\sha1 + @echo Making in crypto\sha1 + $(MAKE) -$(MFLAGS) + cd ..\arcfour + @echo Making in crypto\arcfour + $(MAKE) -$(MFLAGS) + cd ..\aes + @echo Making in crypto\aes + $(MAKE) -$(MFLAGS) + cd .. + +clean-windows:: + cd ..\des + @echo Making clean in crypto\des + $(MAKE) -$(MFLAGS) clean + cd ..\md4 + @echo Making clean in crypto\md4 + $(MAKE) -$(MFLAGS) clean + cd ..\md5 + @echo Making clean in crypto\md5 + $(MAKE) -$(MFLAGS) clean + cd ..\sha1 + @echo Making clean in crypto\sha1 + $(MAKE) -$(MFLAGS) clean + cd ..\arcfour + @echo Making clean in crypto\arcfour + $(MAKE) -$(MFLAGS) clean + cd ..\aes + @echo Making clean in crypto\aes + $(MAKE) -$(MFLAGS) clean + cd .. + +check-windows:: + cd ..\des + @echo Making check in crypto\des + $(MAKE) -$(MFLAGS) check + cd ..\md4 + @echo Making check in crypto\md4 + $(MAKE) -$(MFLAGS) check + cd ..\md5 + @echo Making check in crypto\md5 + $(MAKE) -$(MFLAGS) check + cd ..\sha1 + @echo Making check in crypto\sha1 + $(MAKE) -$(MFLAGS) check + cd ..\arcfour + @echo Making check in crypto\arcfour + $(MAKE) -$(MFLAGS) check + cd ..\aes + @echo Making check in crypto\aes + $(MAKE) -$(MFLAGS) check + cd .. + + + at lib_frag@ + at libobj_frag@ + Added: trunk/src/lib/crypto/builtin/arcfour/arcfour.c =================================================================== --- trunk/src/lib/crypto/builtin/arcfour/arcfour.c 2009-08-01 02:25:56 UTC (rev 22476) +++ trunk/src/lib/crypto/builtin/arcfour/arcfour.c 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,335 @@ +/* + +ARCFOUR cipher (based on a cipher posted on the Usenet in Spring-95). +This cipher is widely believed and has been tested to be equivalent +with the RC4 cipher from RSA Data Security, Inc. (RC4 is a trademark +of RSA Data Security) + +*/ +#include "k5-int.h" +#include "arcfour-int.h" +#include "hash_provider/hash_provider.h" + +const char *const krb5int_arcfour_l40 = "fortybits"; + +void +krb5_arcfour_encrypt_length(const struct krb5_enc_provider *enc, + const struct krb5_hash_provider *hash, + size_t inputlen, size_t *length) +{ + size_t blocksize, hashsize; + + blocksize = enc->block_size; + hashsize = hash->hashsize; + + /* checksum + (confounder + inputlen, in even blocksize) */ + *length = hashsize + krb5_roundup(8 + inputlen, blocksize); +} + + krb5_keyusage + krb5int_arcfour_translate_usage(krb5_keyusage usage) +{ + switch (usage) { + case 1: /* AS-REQ PA-ENC-TIMESTAMP padata timestamp, */ + return 1; + case 2: /* ticket from kdc */ + return 2; + case 3: /* as-rep encrypted part */ + return 8; + case 4: /* tgs-req authz data */ + return 4; + case 5: /* tgs-req authz data in subkey */ + return 5; + case 6: /* tgs-req authenticator cksum */ + return 6; +case 7: /* tgs-req authenticator */ + return 7; + case 8: + return 8; + case 9: /* tgs-rep encrypted with subkey */ + return 9; + case 10: /* ap-rep authentication cksum */ + return 10; /* xxx Microsoft never uses this*/ + case 11: /* app-req authenticator */ + return 11; + case 12: /* app-rep encrypted part */ + return 12; + case 23: /* sign wrap token*/ + return 13; + default: + return usage; +} +} + +krb5_error_code +krb5_arcfour_encrypt(const struct krb5_enc_provider *enc, + const struct krb5_hash_provider *hash, + const krb5_keyblock *key, krb5_keyusage usage, + const krb5_data *ivec, const krb5_data *input, + krb5_data *output) +{ + krb5_keyblock k1, k2, k3; + krb5_data d1, d2, d3, salt, plaintext, checksum, ciphertext, confounder; + krb5_keyusage ms_usage; + size_t keylength, keybytes, blocksize, hashsize; + krb5_error_code ret; + + blocksize = enc->block_size; + keybytes = enc->keybytes; + keylength = enc->keylength; + hashsize = hash->hashsize; + + d1.length=keybytes; + d1.data=malloc(d1.length); + if (d1.data == NULL) + return (ENOMEM); + k1 = *key; + k1.length=d1.length; + k1.contents= (void *) d1.data; + + d2.length=keybytes; + d2.data=malloc(d2.length); + if (d2.data == NULL) { + free(d1.data); + return (ENOMEM); + } + k2 = *key; + k2.length=d2.length; + k2.contents=(void *) d2.data; + + d3.length=keybytes; + d3.data=malloc(d3.length); + if (d3.data == NULL) { + free(d1.data); + free(d2.data); + return (ENOMEM); + } + k3 = *key; + k3.length=d3.length; + k3.contents= (void *) d3.data; + + salt.length=14; + salt.data=malloc(salt.length); + if (salt.data == NULL) { + free(d1.data); + free(d2.data); + free(d3.data); + return (ENOMEM); + } + + /* is "input" already blocksize aligned? if it is, then we need this + step, otherwise we do not */ + plaintext.length=krb5_roundup(input->length+CONFOUNDERLENGTH,blocksize); + plaintext.data=malloc(plaintext.length); + if (plaintext.data == NULL) { + free(d1.data); + free(d2.data); + free(d3.data); + free(salt.data); + return(ENOMEM); + } + + /* setup convienient pointers into the allocated data */ + checksum.length=hashsize; + checksum.data=output->data; + ciphertext.length=krb5_roundup(input->length+CONFOUNDERLENGTH,blocksize); + ciphertext.data=output->data+hashsize; + confounder.length=CONFOUNDERLENGTH; + confounder.data=plaintext.data; + output->length = plaintext.length+hashsize; + + /* begin the encryption, computer K1 */ + ms_usage=krb5int_arcfour_translate_usage(usage); + if (key->enctype == ENCTYPE_ARCFOUR_HMAC_EXP) { + strncpy(salt.data, krb5int_arcfour_l40, salt.length); + store_32_le(ms_usage, salt.data+10); + } else { + salt.length=4; + store_32_le(ms_usage, salt.data); + } + krb5_hmac(hash, key, 1, &salt, &d1); + + memcpy(k2.contents, k1.contents, k2.length); + + if (key->enctype==ENCTYPE_ARCFOUR_HMAC_EXP) + memset(k1.contents+7, 0xab, 9); + + ret=krb5_c_random_make_octets(/* XXX */ 0, &confounder); + memcpy(plaintext.data+confounder.length, input->data, input->length); + if (ret) + goto cleanup; + + krb5_hmac(hash, &k2, 1, &plaintext, &checksum); + + krb5_hmac(hash, &k1, 1, &checksum, &d3); + + ret=(*(enc->encrypt))(&k3, ivec, &plaintext, &ciphertext); + + cleanup: + memset(d1.data, 0, d1.length); + memset(d2.data, 0, d2.length); + memset(d3.data, 0, d3.length); + memset(salt.data, 0, salt.length); + memset(plaintext.data, 0, plaintext.length); + + free(d1.data); + free(d2.data); + free(d3.data); + free(salt.data); + free(plaintext.data); + return (ret); +} + +/* This is the arcfour-hmac decryption routine */ +krb5_error_code +krb5_arcfour_decrypt(const struct krb5_enc_provider *enc, + const struct krb5_hash_provider *hash, + const krb5_keyblock *key, krb5_keyusage usage, + const krb5_data *ivec, const krb5_data *input, + krb5_data *output) +{ + krb5_keyblock k1,k2,k3; + krb5_data d1,d2,d3,salt,ciphertext,plaintext,checksum; + krb5_keyusage ms_usage; + size_t keybytes, keylength, hashsize, blocksize; + krb5_error_code ret; + + blocksize = enc->block_size; + keybytes = enc->keybytes; + keylength = enc->keylength; + hashsize = hash->hashsize; + + d1.length=keybytes; + d1.data=malloc(d1.length); + if (d1.data == NULL) + return (ENOMEM); + k1 = *key; + k1.length=d1.length; + k1.contents= (void *) d1.data; + + d2.length=keybytes; + d2.data=malloc(d2.length); + if (d2.data == NULL) { + free(d1.data); + return (ENOMEM); + } + k2 = *key; + k2.length=d2.length; + k2.contents= (void *) d2.data; + + d3.length=keybytes; + d3.data=malloc(d3.length); + if (d3.data == NULL) { + free(d1.data); + free(d2.data); + return (ENOMEM); + } + k3 = *key; + k3.length=d3.length; + k3.contents= (void *) d3.data; + + salt.length=14; + salt.data=malloc(salt.length); + if(salt.data==NULL) { + free(d1.data); + free(d2.data); + free(d3.data); + return (ENOMEM); + } + + ciphertext.length=input->length-hashsize; + ciphertext.data=input->data+hashsize; + plaintext.length=ciphertext.length; + plaintext.data=malloc(plaintext.length); + if (plaintext.data == NULL) { + free(d1.data); + free(d2.data); + free(d3.data); + free(salt.data); + return (ENOMEM); + } + + checksum.length=hashsize; + checksum.data=input->data; + + ms_usage=krb5int_arcfour_translate_usage(usage); + + /* We may have to try two ms_usage values; see below. */ + do { + /* compute the salt */ + if (key->enctype == ENCTYPE_ARCFOUR_HMAC_EXP) { + strncpy(salt.data, krb5int_arcfour_l40, salt.length); + store_32_le(ms_usage, salt.data + 10); + } else { + salt.length = 4; + store_32_le(ms_usage, salt.data); + } + ret = krb5_hmac(hash, key, 1, &salt, &d1); + if (ret) + goto cleanup; + + memcpy(k2.contents, k1.contents, k2.length); + + if (key->enctype == ENCTYPE_ARCFOUR_HMAC_EXP) + memset(k1.contents + 7, 0xab, 9); + + ret = krb5_hmac(hash, &k1, 1, &checksum, &d3); + if (ret) + goto cleanup; + + ret = (*(enc->decrypt))(&k3, ivec, &ciphertext, &plaintext); + if (ret) + goto cleanup; + + ret = krb5_hmac(hash, &k2, 1, &plaintext, &d1); + if (ret) + goto cleanup; + + if (memcmp(checksum.data, d1.data, hashsize) != 0) { + if (ms_usage == 9) { + /* + * RFC 4757 specifies usage 8 for TGS-REP encrypted + * parts encrypted in a subkey, but the value used by MS + * is actually 9. We now use 9 to start with, but fall + * back to 8 on failure in case we are communicating + * with a KDC using the value from the RFC. + */ + ms_usage = 8; + continue; + } + ret = KRB5KRB_AP_ERR_BAD_INTEGRITY; + goto cleanup; + } + + break; + } while (1); + + memcpy(output->data, plaintext.data+CONFOUNDERLENGTH, + (plaintext.length-CONFOUNDERLENGTH)); + output->length=plaintext.length-CONFOUNDERLENGTH; + + cleanup: + memset(d1.data, 0, d1.length); + memset(d2.data, 0, d2.length); + memset(d3.data, 0, d2.length); + memset(salt.data, 0, salt.length); + memset(plaintext.data, 0, plaintext.length); + + free(d1.data); + free(d2.data); + free(d3.data); + free(salt.data); + free(plaintext.data); + return (ret); +} + + krb5_error_code krb5int_arcfour_prf( + const struct krb5_enc_provider *enc, + const struct krb5_hash_provider *hash, + const krb5_keyblock *key, + const krb5_data *in, krb5_data *out) + { + assert(out->length == 20); + return krb5_hmac(&krb5int_hash_sha1, key, 1, in, out); + } + Copied: trunk/src/lib/crypto/builtin/arcfour/arcfour.h (from rev 22475, trunk/src/lib/crypto/arcfour/arcfour.h) Added: trunk/src/lib/crypto/builtin/deps =================================================================== --- trunk/src/lib/crypto/builtin/deps 2009-08-01 02:25:56 UTC (rev 22476) +++ trunk/src/lib/crypto/builtin/deps 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,25 @@ +# +# Generated makefile dependencies follow. +# +hmac.so hmac.po $(OUTPRE)hmac.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../builtin/hmac.c \ + $(srcdir)/../krb/aead.h $(srcdir)/../krb/cksumtypes.h +pbkdf2.so pbkdf2.po $(OUTPRE)pbkdf2.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../builtin/pbkdf2.c \ + $(srcdir)/../krb/hash_provider/hash_provider.h Copied: trunk/src/lib/crypto/builtin/des/ISSUES (from rev 22475, trunk/src/lib/crypto/des/ISSUES) Added: trunk/src/lib/crypto/builtin/des/Makefile.in =================================================================== --- trunk/src/lib/crypto/builtin/des/Makefile.in 2009-08-01 02:25:56 UTC (rev 22476) +++ trunk/src/lib/crypto/builtin/des/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,76 @@ +thisconfigdir=../../../.. +myfulldir=lib/crypto/builtin/des +mydir=lib/crypto/builtin/des +BUILDTOP=$(REL)..$(S)..$(S)..$(S).. +LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb +DEFS= + +##DOS##BUILDTOP = ..\..\..\.. +##DOS##PREFIXDIR=des +##DOS##OBJFILE=..\$(OUTPRE)des.lst + +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + +STLIBOBJS=\ + afsstring2key.o \ + d3_cbc.o \ + d3_aead.o \ + d3_kysched.o \ + des_prf.o \ + f_aead.o \ + f_cbc.o \ + f_cksum.o \ + f_parity.o \ + f_sched.o \ + f_tables.o \ + key_sched.o \ + string2key.o \ + weak_key.o + +OBJS= $(OUTPRE)afsstring2key.$(OBJEXT) \ + $(OUTPRE)d3_cbc.$(OBJEXT) \ + $(OUTPRE)d3_aead.$(OBJEXT) \ + $(OUTPRE)d3_kysched.$(OBJEXT) \ + $(OUTPRE)des_prf.$(OBJEXT) \ + $(OUTPRE)f_aead.$(OBJEXT) \ + $(OUTPRE)f_cbc.$(OBJEXT) \ + $(OUTPRE)f_cksum.$(OBJEXT) \ + $(OUTPRE)f_parity.$(OBJEXT) \ + $(OUTPRE)f_sched.$(OBJEXT) \ + $(OUTPRE)f_tables.$(OBJEXT) \ + $(OUTPRE)key_sched.$(OBJEXT) \ + $(OUTPRE)string2key.$(OBJEXT) \ + $(OUTPRE)weak_key.$(OBJEXT) + +SRCS= $(srcdir)/afsstring2key.c \ + $(srcdir)/d3_cbc.c \ + $(srcdir)/d3_aead.c \ + $(srcdir)/d3_kysched.c \ + $(srcdir)/des_prf.c \ + $(srcdir)/f_aead.c \ + $(srcdir)/f_cbc.c \ + $(srcdir)/f_cksum.c \ + $(srcdir)/f_parity.c \ + $(srcdir)/f_sched.c \ + $(srcdir)/f_tables.c \ + $(srcdir)/key_sched.c \ + $(srcdir)/weak_key.c \ + $(srcdir)/string2key.c + +##DOS##LIBOBJS = $(OBJS) + +all-unix:: all-libobjs + +includes:: depend + +depend:: $(SRCS) + +check-windows:: + +clean:: + +clean-unix:: clean-libobjs + + at libobj_frag@ + Copied: trunk/src/lib/crypto/builtin/des/afsstring2key.c (from rev 22475, trunk/src/lib/crypto/des/afsstring2key.c) Deleted: trunk/src/lib/crypto/cf2.c Deleted: trunk/src/lib/crypto/checksum_length.c Deleted: trunk/src/lib/crypto/cksumtype_to_string.c Deleted: trunk/src/lib/crypto/cksumtypes.c Deleted: trunk/src/lib/crypto/cksumtypes.h Deleted: trunk/src/lib/crypto/coll_proof_cksum.c Deleted: trunk/src/lib/crypto/combine_keys.c Deleted: trunk/src/lib/crypto/crypto_length.c Deleted: trunk/src/lib/crypto/crypto_libinit.c Added: trunk/src/lib/crypto/crypto_tests/Makefile.in =================================================================== --- trunk/src/lib/crypto/crypto_tests/Makefile.in 2009-08-01 02:25:56 UTC (rev 22476) +++ trunk/src/lib/crypto/crypto_tests/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,177 @@ +thisconfigdir=../../.. +myfulldir=lib/crypto/crypto_tests +mydir=lib/crypto/crypto_tests +BUILDTOP=$(REL)..$(S)..$(S).. +LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir)/../krb/enc_provider \ + -I$(srcdir)/../krb/hash_provider -I$(srcdir)/../krb/keyhash_provider \ + -I$(srcdir)/../krb/dk -I$(srcdir)/../@CRYPTO_IMPL@/ \ + -I$(srcdir)/../krb/yarrow \ + -I$(srcdir)/../krb/crc32 -I$(srcdir)/../krb/old -I$(srcdir)/../krb/raw \ + -I$(srcdir)/../@CRYPTO_IMPL@/aes -I$(srcdir)/../@CRYPTO_IMPL@/des \ + -I$(srcdir)/../@CRYPTO_IMPL@/arcfour -I$(srcdir)/../@CRYPTO_IMPL@/sha1 \ + -I$(srcdir)/../@CRYPTO_IMPL@/md5 -I$(srcdir)/../@CRYPTO_IMPL@/md4 +RUN_SETUP = @KRB5_RUN_ENV@ +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) +DEFS= + +EXTRADEPSRCS=\ + $(srcdir)/t_nfold.c \ + $(srcdir)/t_cf2.c \ + $(srcdir)/t_encrypt.c \ + $(srcdir)/t_prf.c \ + $(srcdir)/t_prng.c \ + $(srcdir)/t_hmac.c \ + $(srcdir)/t_pkcs5.c \ + $(srcdir)/t_cts.c \ + $(srcdir)/vectors.c \ + $(srcdir)/aes-test.c \ + $(srcdir)/t_afss2k.c \ + $(srcdir)/t_cksum.c \ + $(srcdir)/t_crc.c \ + $(srcdir)/t_mddriver.c \ + $(srcdir)/t_shs3.c \ + $(srcdir)/t_shs.c \ + $(srcdir)/t_verify.c \ + $(srcdir)/ytest.c + +##DOSBUILDTOP = ..\..\.. +##DOSLIBNAME=$(OUTPRE)crypto.lib +##DOSOBJFILE=$(OUTPRE)crypto.lst +##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)arcfour.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)kh_pro.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)aes.lst +##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)arcfour.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst $(OUTPRE)aes.lst + +##DOS##LIBOBJS = $(OBJS) + +check-unix:: t_nfold t_encrypt t_prf t_prng t_hmac t_cf2 \ + t_cksum4 t_cksum5 \ + aes-test verify destest t_afss2k \ + t_mddriver4 t_mddriver \ + t_shs t_shs3 t_crc + $(RUN_SETUP) $(VALGRIND) ./t_nfold + $(RUN_SETUP) $(VALGRIND) ./t_encrypt + $(RUN_SETUP) $(VALGRIND) ./t_prng <$(srcdir)/t_prng.seed >t_prng.output && \ + diff t_prng.output $(srcdir)/t_prng.expected + $(RUN_SETUP) $(VALGRIND) ./t_hmac + $(RUN_SETUP) $(VALGRIND) ./t_prf <$(srcdir)/t_prf.in >t_prf.output + diff t_prf.output $(srcdir)/t_prf.expected + $(RUN_SETUP) $(VALGRIND) ./t_cf2 <$(srcdir)/t_cf2.in >t_cf2.output + diff t_cf2.output ./t_cf2.expected + $(RUN_SETUP) $(VALGRIND) ./t_cksum4 "this is a test" + $(RUN_SETUP) $(VALGRIND) ./t_cksum5 "this is a test" + $(RUN_SETUP) $(VALGRIND) ./t_crc + $(RUN_SETUP) $(VALGRIND) ./aes-test -k > vk.txt + cmp vk.txt $(srcdir)/expect-vk.txt + $(RUN_SETUP) $(VALGRIND) ./aes-test > vt.txt + cmp vt.txt $(srcdir)/expect-vt.txt + $(RUN_SETUP) $(VALGRIND) ./verify -z + $(RUN_SETUP) $(VALGRIND) ./verify -m + $(RUN_SETUP) $(VALGRIND) ./verify + $(RUN_SETUP) $(VALGRIND) ./destest < $(srcdir)/keytest.data + $(RUN_SETUP) $(VALGRIND) ./t_afss2k + $(RUN_SETUP) $(VALGRIND) $(C)t_mddriver4 -x + $(RUN_SETUP) $(VALGRIND) $(C)t_mddriver -x + $(RUN_SETUP) $(VALGRIND) $(C)t_shs -x + $(RUN_SETUP) $(VALGRIND) $(C)t_shs3 + + + + +# $(RUN_SETUP) $(VALGRIND) ./t_pkcs5 + +t_nfold$(EXEEXT): t_nfold.$(OBJEXT) $(srcdir)/../krb/nfold$(DYNOBJEXT) $(SUPPORT_DEPLIB) + $(CC_LINK) -o $@ t_nfold.$(OBJEXT) $(srcdir)/../krb/nfold$(DYNOBJEXT) $(SUPPORT_LIB) + +t_encrypt$(EXEEXT): t_encrypt.$(OBJEXT) $(srcdir)/../krb/nfold$(DYNOBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) + $(CC_LINK) -o $@ t_encrypt.$(OBJEXT) -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) + +t_prf$(EXEEXT): t_prf.$(OBJEXT) $(SUPPORT_DEPLIB) + $(CC_LINK) -o $@ t_prf.$(OBJEXT) -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) + +t_cf2$(EXEEXT): t_cf2.$(OBJEXT) $(SUPPORT_DEPLIB) + $(CC_LINK) -o $@ t_cf2.$(OBJEXT) -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) + + +t_prng$(EXEEXT): t_prng.$(OBJEXT) $(SUPPORT_DEPLIB) + $(CC_LINK) -o $@ t_prng.$(OBJEXT) -lk5crypto -lcom_err $(SUPPORT_LIB) + +t_hmac$(EXEEXT): t_hmac.$(OBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) + $(CC_LINK) -o $@ t_hmac.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) + +#t_pkcs5$(EXEEXT): t_pkcs5.$(OBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) +# $(CC_LINK) -o $@ t_pkcs5.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) + +vectors$(EXEEXT): vectors.$(OBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) + $(CC_LINK) -o $@ vectors.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) + +# t_cts$(EXEEXT): t_cts.$(OBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) +# $(CC_LINK) -o $@ t_cts.$(OBJEXT) \ +# $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) + +t_cksum4.o: $(srcdir)/t_cksum.c + $(CC) -DMD=4 $(ALL_CFLAGS) -o t_cksum4.o -c $(srcdir)/t_cksum.c + +t_cksum5.o: $(srcdir)/t_cksum.c + $(CC) -DMD=5 $(ALL_CFLAGS) -o t_cksum5.o -c $(srcdir)/t_cksum.c + +t_cksum4: t_cksum4.o $(CRYTPO_DEPLIB) + $(CC_LINK) -o t_cksum4 t_cksum4.o $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) $(LIBS) + +t_cksum5: t_cksum5.o $(CRYPTO_DEPLIB) + $(CC_LINK) -o t_cksum5 t_cksum5.o $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) $(LIBS) + +t_crc: t_crc.o $(K5CRYPTO_LIB) $(SUPPORT_DEPLIB) + $(CC_LINK) -o $@ t_crc.o $(K5CRYPTO_LIB) $(SUPPORT_LIB) + +aes-test: aes-test.$(OBJEXT) $(CRYPTO_DEPLIB) + $(CC_LINK) -o aes-test aes-test.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) + +verify$(EXEEXT): t_verify.$(OBJEXT) $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB) + $(CC_LINK) -o $@ t_verify.$(OBJEXT) -lcom_err $(SUPPORT_LIB) -lk5crypto + +destest$(EXEEXT): destest.$(OBJEXT) $(SUPPORT_DEPLIB) + $(CC_LINK) -o $@ destest.$(OBJEXT) $(TOBJS) $(SUPPORT_LIB) -lk5crypto + +t_afss2k: t_afss2k.$(OBJEXT) $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB) $(CRYPTO_DEPLIB) + $(CC_LINK) -o $@ t_afss2k.$(OBJEXT) -lcom_err $(SUPPORT_LIB) -lk5crypto + +t_mddriver4.o: $(srcdir)/t_mddriver.c + $(CC) -DMD=4 $(ALL_CFLAGS) -o t_mddriver4.o -c $(srcdir)/t_mddriver.c + +t_mddriver4: t_mddriver4.o $(SUPPORT_DEPLIB) $(CRYPTO_DEPLIB) + $(CC_LINK) -DMD4 -o t_mddriver4 t_mddriver4.o -lk5crypto $(SUPPORT_LIB) + +t_mddriver: t_mddriver.o $(SUPPORT_DEPLIB) $(CRYPTO_DEPLIB) + $(CC_LINK) -o t_mddriver t_mddriver.o -lk5crypto $(SUPPORT_LIB) + +t_shs: t_shs.o $(SUPPORT_DEPLIB) $(CRYPTO_DEPLIB) + $(CC_LINK) -o t_shs t_shs.o $(SUPPORT_LIB) $(CRYPTO_DEPLIB) + +t_shs3: t_shs3.o $(SUPPORT_DEPLIB) $(CRYPTO_DEPLIB) + $(CC_LINK) -o t_shs3 t_shs3.o $(SUPPORT_LIB) $(CRYPTO_DEPLIB) + +ytest: ytest.o shs.o $(SUPPORT_DEPLIB) $(CRYPTO_DEPLIB) + $(CC_LINK) -o ytest ytest.o $(SUPPORT_LIB) $(CRYPTO_DEPLIB) + + + +clean:: + $(RM) t_nfold.o t_nfold t_encrypt t_encrypt.o t_prng.o t_prng \ + t_hmac.o t_hmac t_pkcs5.o t_pkcs5 pbkdf2.o t_prf t_prf.o t_cf2 t_cf2.o \ + aes-test.o aes-test vt.txt vk.txt kresults.out \ + destest.o destest \ + t_afss2k.o t_afss2k t_cksum.o t_cksum \ + t_crc.o t_crc t_cts.o t_cts \ + t_mddriver4.o t_mddriver4 t_mddriver.o t_mddriver \ + t_cksum4 t_cksum4.o t_cksum5 t_cksum5.o \ + t_shs3 t_shs3.o t_shs t_shs.o verify t_verify.o \ + t_mddriver$(EXEEXT) $(OUTPRE)t_mddriver.$(OBJEXT) \ + t_shs$(EXEEXT) t_shs.$(OBJEXT) t_shs3$(EXEEXT) t_shs3.$(OBJEXT) + + -$(RM) t_prng.output + -$(RM) t_prf.output + -$(RM) t_cf2.output + + at lib_frag@ + at libobj_frag@ + Copied: trunk/src/lib/crypto/crypto_tests/aes-test.c (from rev 22475, trunk/src/lib/crypto/aes/aes-test.c) Added: trunk/src/lib/crypto/crypto_tests/deps =================================================================== --- trunk/src/lib/crypto/crypto_tests/deps 2009-08-01 02:25:56 UTC (rev 22476) +++ trunk/src/lib/crypto/crypto_tests/deps 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1 @@ +# No dependencies here. Copied: trunk/src/lib/crypto/crypto_tests/destest.c (from rev 22475, trunk/src/lib/crypto/des/destest.c) Added: trunk/src/lib/crypto/crypto_tests/t_cksum.c =================================================================== --- trunk/src/lib/crypto/crypto_tests/t_cksum.c 2009-08-01 02:25:56 UTC (rev 22476) +++ trunk/src/lib/crypto/crypto_tests/t_cksum.c 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,139 @@ +/* + * lib/crypto/md5/t_cksum.c + * + * Copyright 1995 by the Massachusetts Institute of Technology. + * All Rights Reserved. + * + * Export of this software from the United States of America may + * require a specific license from the United States Government. + * It is the responsibility of any person or organization contemplating + * export to obtain such a license before exporting. + * + * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and + * distribute this software and its documentation for any purpose and + * without fee is hereby granted, provided that the above copyright + * notice appear in all copies and that both that copyright notice and + * this permission notice appear in supporting documentation, and that + * the name of M.I.T. not be used in advertising or publicity pertaining + * to distribution of the software without specific, written prior + * permission. Furthermore if you modify this software you must label + * your software as modified software and not distribute it in such a + * fashion that it might be confused with the original M.I.T. software. + * M.I.T. makes no representations about the suitability of + * this software for any purpose. It is provided "as is" without express + * or implied warranty. + * + */ + +/* + * t_cksum.c - Test checksum and checksum compatability for rsa-md[4,5]-des + */ + +#include "k5-int.h" + +#define MD5_K5BETA_COMPAT +#define MD4_K5BETA_COMPAT + +#if MD == 4 +extern struct krb5_keyhash_provider krb5int_keyhash_md4des; +#define khp krb5int_keyhash_md4des +#endif + +#if MD == 5 +extern struct krb5_keyhash_provider krb5int_keyhash_md5des; +#define khp krb5int_keyhash_md5des +#endif + +static void +print_checksum(text, number, message, checksum) + char *text; + int number; + char *message; + krb5_data *checksum; +{ + int i; + + printf("%s MD%d checksum(\"%s\") = ", text, number, message); + for (i=0; ilength; i++) + printf("%02x", (unsigned char) checksum->data[i]); + printf("\n"); +} + +/* + * Test the checksum verification of Old Style (tm) and correct RSA-MD[4,5]-DES + * checksums. + */ + +krb5_octet testkey[8] = { 0x45, 0x01, 0x49, 0x61, 0x58, 0x19, 0x1a, 0x3d }; + +int +main(argc, argv) + int argc; + char **argv; +{ + int msgindex; + krb5_boolean valid; + size_t length; + krb5_keyblock keyblock; + krb5_error_code kret=0; + krb5_data plaintext, newstyle_checksum; + + /* this is a terrible seed, but that's ok for the test. */ + + plaintext.length = 8; + plaintext.data = (char *) testkey; + + krb5_c_random_seed(/* XXX */ 0, &plaintext); + + keyblock.enctype = ENCTYPE_DES_CBC_CRC; + keyblock.length = sizeof(testkey); + keyblock.contents = testkey; + + length = khp.hashsize; + + newstyle_checksum.length = length; + + if (!(newstyle_checksum.data = (char *) + malloc((unsigned) newstyle_checksum.length))) { + printf("cannot get memory for new style checksum\n"); + return(ENOMEM); + } + for (msgindex = 1; msgindex < argc; msgindex++) { + plaintext.length = strlen(argv[msgindex]); + plaintext.data = argv[msgindex]; + + if ((kret = (*(khp.hash))(&keyblock, 0, 0, &plaintext, &newstyle_checksum))) { + printf("krb5_calculate_checksum choked with %d\n", kret); + break; + } + print_checksum("correct", MD, argv[msgindex], &newstyle_checksum); + + if ((kret = (*(khp.verify))(&keyblock, 0, 0, &plaintext, &newstyle_checksum, + &valid))) { + printf("verify on new checksum choked with %d\n", kret); + break; + } + if (!valid) { + printf("verify on new checksum failed\n"); + break; + } + printf("Verify succeeded for \"%s\"\n", argv[msgindex]); + + newstyle_checksum.data[0]++; + if ((kret = (*(khp.verify))(&keyblock, 0, 0, &plaintext, &newstyle_checksum, + &valid))) { + printf("verify on new checksum choked with %d\n", kret); + break; + } + if (valid) { + printf("verify on new checksum succeeded, but shouldn't have\n"); + break; + } + printf("Verify of bad checksum OK for \"%s\"\n", argv[msgindex]); + kret = 0; + } + free(newstyle_checksum.data); + if (!kret) + printf("%d tests passed successfully for MD%d checksum\n", argc-1, MD); + return(kret); +} Copied: trunk/src/lib/crypto/crypto_tests/t_crc.c (from rev 22475, trunk/src/lib/crypto/crc32/t_crc.c) Deleted: trunk/src/lib/crypto/decrypt.c Deleted: trunk/src/lib/crypto/decrypt_iov.c Deleted: trunk/src/lib/crypto/default_state.c Modified: trunk/src/lib/crypto/deps =================================================================== --- trunk/src/lib/crypto/deps 2009-08-01 02:25:56 UTC (rev 22476) +++ trunk/src/lib/crypto/deps 2009-08-03 14:19:16 UTC (rev 22477) @@ -1,525 +1 @@ -# -# Generated makefile dependencies follow. -# -aead.so aead.po $(OUTPRE)aead.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/dk/dk.h aead.c aead.h cksumtypes.h etypes.h -block_size.so block_size.po $(OUTPRE)block_size.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h block_size.c etypes.h -checksum_length.so checksum_length.po $(OUTPRE)checksum_length.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h checksum_length.c \ - cksumtypes.h -cksumtype_to_string.so cksumtype_to_string.po $(OUTPRE)cksumtype_to_string.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h cksumtype_to_string.c \ - cksumtypes.h -cksumtypes.so cksumtypes.po $(OUTPRE)cksumtypes.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/hash_provider/hash_provider.h \ - $(srcdir)/keyhash_provider/keyhash_provider.h cksumtypes.c \ - cksumtypes.h -coll_proof_cksum.so coll_proof_cksum.po $(OUTPRE)coll_proof_cksum.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h cksumtypes.h coll_proof_cksum.c -combine_keys.so combine_keys.po $(OUTPRE)combine_keys.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/dk/dk.h \ - combine_keys.c etypes.h -crypto_length.so crypto_length.po $(OUTPRE)crypto_length.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h aead.h cksumtypes.h \ - crypto_length.c etypes.h -crypto_libinit.so crypto_libinit.po $(OUTPRE)crypto_libinit.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h crypto_libinit.c -default_state.so default_state.po $(OUTPRE)default_state.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h default_state.c -decrypt.so decrypt.po $(OUTPRE)decrypt.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - aead.h cksumtypes.h decrypt.c etypes.h -decrypt_iov.so decrypt_iov.po $(OUTPRE)decrypt_iov.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h aead.h cksumtypes.h \ - decrypt_iov.c etypes.h -encrypt.so encrypt.po $(OUTPRE)encrypt.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - aead.h cksumtypes.h encrypt.c etypes.h -encrypt_iov.so encrypt_iov.po $(OUTPRE)encrypt_iov.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h encrypt_iov.c etypes.h -encrypt_length.so encrypt_length.po $(OUTPRE)encrypt_length.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h aead.h cksumtypes.h \ - encrypt_length.c etypes.h -enctype_compare.so enctype_compare.po $(OUTPRE)enctype_compare.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h enctype_compare.c \ - etypes.h -enctype_to_string.so enctype_to_string.po $(OUTPRE)enctype_to_string.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h enctype_to_string.c \ - etypes.h -etypes.so etypes.po $(OUTPRE)etypes.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/aes/aes_s2k.h $(srcdir)/arcfour/arcfour.h \ - $(srcdir)/des/des_int.h $(srcdir)/dk/dk.h $(srcdir)/enc_provider/enc_provider.h \ - $(srcdir)/hash_provider/hash_provider.h $(srcdir)/old/old.h \ - $(srcdir)/raw/raw.h etypes.c etypes.h -hmac.so hmac.po $(OUTPRE)hmac.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - aead.h cksumtypes.h hmac.c -keyblocks.so keyblocks.po $(OUTPRE)keyblocks.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h keyblocks.c -keyed_cksum.so keyed_cksum.po $(OUTPRE)keyed_cksum.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h cksumtypes.h keyed_cksum.c -keyed_checksum_types.so keyed_checksum_types.po $(OUTPRE)keyed_checksum_types.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h cksumtypes.h etypes.h \ - keyed_checksum_types.c -keylengths.so keylengths.po $(OUTPRE)keylengths.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h etypes.h keylengths.c -make_checksum.so make_checksum.po $(OUTPRE)make_checksum.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/dk/dk.h \ - cksumtypes.h etypes.h make_checksum.c -make_checksum_iov.so make_checksum_iov.po $(OUTPRE)make_checksum_iov.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h aead.h cksumtypes.h \ - make_checksum_iov.c -make_random_key.so make_random_key.po $(OUTPRE)make_random_key.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h etypes.h make_random_key.c -mandatory_sumtype.so mandatory_sumtype.po $(OUTPRE)mandatory_sumtype.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h etypes.h mandatory_sumtype.c -nfold.so nfold.po $(OUTPRE)nfold.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - nfold.c -old_api_glue.so old_api_glue.po $(OUTPRE)old_api_glue.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h old_api_glue.c -pbkdf2.so pbkdf2.po $(OUTPRE)pbkdf2.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/hash_provider/hash_provider.h pbkdf2.c -prf.so prf.po $(OUTPRE)prf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - etypes.h prf.c -cf2.so cf2.po $(OUTPRE)cf2.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - cf2.c etypes.h -prng.so prng.po $(OUTPRE)prng.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/enc_provider/enc_provider.h $(srcdir)/sha1/shs.h \ - $(srcdir)/yarrow/yarrow.h $(srcdir)/yarrow/ycipher.h \ - $(srcdir)/yarrow/yhash.h $(srcdir)/yarrow/ytypes.h \ - prng.c -random_to_key.so random_to_key.po $(OUTPRE)random_to_key.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h etypes.h random_to_key.c -state.so state.po $(OUTPRE)state.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - etypes.h state.c -string_to_cksumtype.so string_to_cksumtype.po $(OUTPRE)string_to_cksumtype.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h cksumtypes.h string_to_cksumtype.c -string_to_enctype.so string_to_enctype.po $(OUTPRE)string_to_enctype.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h etypes.h string_to_enctype.c -string_to_key.so string_to_key.po $(OUTPRE)string_to_key.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h etypes.h string_to_key.c -valid_cksumtype.so valid_cksumtype.po $(OUTPRE)valid_cksumtype.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h cksumtypes.h valid_cksumtype.c -valid_enctype.so valid_enctype.po $(OUTPRE)valid_enctype.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h etypes.h valid_enctype.c -verify_checksum.so verify_checksum.po $(OUTPRE)verify_checksum.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h cksumtypes.h verify_checksum.c -verify_checksum_iov.so verify_checksum_iov.po $(OUTPRE)verify_checksum_iov.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h aead.h cksumtypes.h \ - verify_checksum_iov.c -t_nfold.so t_nfold.po $(OUTPRE)t_nfold.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - t_nfold.c -t_cf2.so t_cf2.po $(OUTPRE)t_cf2.$(OBJEXT): $(BUILDTOP)/include/krb5/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5.h t_cf2.c -t_encrypt.so t_encrypt.po $(OUTPRE)t_encrypt.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h etypes.h t_encrypt.c -t_prf.so t_prf.po $(OUTPRE)t_prf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - t_prf.c -t_prng.so t_prng.po $(OUTPRE)t_prng.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - t_prng.c -t_hmac.so t_hmac.po $(OUTPRE)t_hmac.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/hash_provider/hash_provider.h t_hmac.c -t_pkcs5.so t_pkcs5.po $(OUTPRE)t_pkcs5.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - t_pkcs5.c -t_cts.so t_cts.po $(OUTPRE)t_cts.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/hash_provider/hash_provider.h t_cts.c -vectors.so vectors.po $(OUTPRE)vectors.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/hash_provider/hash_provider.h vectors.c +# No dependencies here. Deleted: trunk/src/lib/crypto/encrypt.c Deleted: trunk/src/lib/crypto/encrypt_iov.c Deleted: trunk/src/lib/crypto/encrypt_length.c Deleted: trunk/src/lib/crypto/enctype_compare.c Deleted: trunk/src/lib/crypto/enctype_to_string.c Deleted: trunk/src/lib/crypto/etypes.c Deleted: trunk/src/lib/crypto/etypes.h Deleted: trunk/src/lib/crypto/hmac.c Deleted: trunk/src/lib/crypto/keyblocks.c Deleted: trunk/src/lib/crypto/keyed_checksum_types.c Deleted: trunk/src/lib/crypto/keyed_cksum.c Deleted: trunk/src/lib/crypto/keylengths.c Added: trunk/src/lib/crypto/krb/Makefile.in =================================================================== --- trunk/src/lib/crypto/krb/Makefile.in 2009-08-01 02:25:56 UTC (rev 22476) +++ trunk/src/lib/crypto/krb/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,253 @@ +thisconfigdir=../../.. +myfulldir=lib/crypto/krb +mydir=lib/crypto/krb +BUILDTOP=$(REL)..$(S)..$(S).. +SUBDIRS= crc32 dk enc_provider hash_provider keyhash_provider \ + old raw yarrow +LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/enc_provider -I$(srcdir)/dk \ + -I$(srcdir)/hash_provider -I$(srcdir)/keyhash_provider \ + -I$(srcdir)/old -I$(srcdir)/raw -I$(srcdir)/yarrow \ + -I$(srcdir)/../@CRYPTO_IMPL@/ -I$(srcdir)/../@CRYPTO_IMPL@/des \ + -I$(srcdir)/../@CRYPTO_IMPL@/aes -I$(srcdir)/../@CRYPTO_IMPL@/arcfour \ + -I$(srcdir)/../@CRYPTO_IMPL@/sha1 +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) +DEFS= + +##DOSBUILDTOP = ..\..\.. +##DOSLIBNAME=$(OUTPRE)crypto.lib +##DOSOBJFILE=$(OUTPRE)crypto.lst +##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)arcfour.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)kh_pro.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)aes.lst +##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)arcfour.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst $(OUTPRE)aes.lst + +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + +STLIBOBJS=\ + aead.o \ + block_size.o \ + cf2.o \ + checksum_length.o \ + cksumtype_to_string.o \ + cksumtypes.o \ + coll_proof_cksum.o \ + combine_keys.o \ + crypto_length.o \ + crypto_libinit.o \ + default_state.o \ + decrypt.o \ + decrypt_iov.o \ + encrypt.o \ + encrypt_iov.o \ + encrypt_length.o \ + enctype_compare.o \ + enctype_to_string.o \ + etypes.o \ + keyblocks.o \ + keyed_cksum.o \ + keyed_checksum_types.o \ + keylengths.o \ + make_checksum.o \ + make_checksum_iov.o \ + make_random_key.o \ + mandatory_sumtype.o \ + nfold.o \ + old_api_glue.o \ + prf.o \ + prng.o \ + random_to_key.o \ + state.o \ + string_to_cksumtype.o \ + string_to_enctype.o \ + string_to_key.o \ + valid_cksumtype.o \ + valid_enctype.o \ + verify_checksum.o \ + verify_checksum_iov.o + +OBJS=\ + $(OUTPRE)aead.$(OBJEXT) \ + $(OUTPRE)block_size.$(OBJEXT) \ + $(OUTPRE)cf2$(OBJEXT) \ + $(OUTPRE)checksum_length.$(OBJEXT) \ + $(OUTPRE)cksumtype_to_string.$(OBJEXT) \ + $(OUTPRE)cksumtypes.$(OBJEXT) \ + $(OUTPRE)coll_proof_cksum.$(OBJEXT) \ + $(OUTPRE)combine_keys.$(OBJEXT) \ + $(OUTPRE)crypto_length.$(OBJEXT) \ + $(OUTPRE)crypto_libinit.$(OBJEXT) \ + $(OUTPRE)default_state.$(OBJEXT) \ + $(OUTPRE)decrypt.$(OBJEXT) \ + $(OUTPRE)decrypt_iov.$(OBJEXT) \ + $(OUTPRE)encrypt.$(OBJEXT) \ + $(OUTPRE)encrypt_iov.$(OBJEXT) \ + $(OUTPRE)encrypt_length.$(OBJEXT) \ + $(OUTPRE)enctype_compare.$(OBJEXT) \ + $(OUTPRE)enctype_to_string.$(OBJEXT) \ + $(OUTPRE)etypes.$(OBJEXT) \ + $(OUTPRE)keyblocks.$(OBJEXT) \ + $(OUTPRE)keyed_cksum.$(OBJEXT) \ + $(OUTPRE)keyed_checksum_types.$(OBJEXT) \ + $(OUTPRE)keylengths.$(OBJEXT) \ + $(OUTPRE)make_checksum.$(OBJEXT) \ + $(OUTPRE)make_checksum_iov.$(OBJEXT) \ + $(OUTPRE)make_random_key.$(OBJEXT) \ + $(OUTPRE)mandatory_sumtype.$(OBJEXT) \ + $(OUTPRE)nfold.$(OBJEXT) \ + $(OUTPRE)old_api_glue.$(OBJEXT) \ + $(OUTPRE)prf.$(OBJEXT) \ + $(OUTPRE)prng.$(OBJEXT) \ + $(OUTPRE)random_to_key.$(OBJEXT) \ + $(OUTPRE)state.$(OBJEXT) \ + $(OUTPRE)string_to_cksumtype.$(OBJEXT) \ + $(OUTPRE)string_to_enctype.$(OBJEXT) \ + $(OUTPRE)string_to_key.$(OBJEXT) \ + $(OUTPRE)valid_cksumtype.$(OBJEXT) \ + $(OUTPRE)valid_enctype.$(OBJEXT) \ + $(OUTPRE)verify_checksum.$(OBJEXT) \ + $(OUTPRE)verify_checksum_iov.$(OBJEXT) + +SRCS=\ + $(srcdir)/aead.c \ + $(srcdir)/block_size.c \ + $(srcdir)/checksum_length.c \ + $(srcdir)/cksumtype_to_string.c \ + $(srcdir)/cksumtypes.c \ + $(srcdir)/coll_proof_cksum.c \ + $(srcdir)/combine_keys.c \ + $(srcdir)/crypto_length.c \ + $(srcdir)/crypto_libinit.c \ + $(srcdir)/default_state.c \ + $(srcdir)/decrypt.c \ + $(srcdir)/decrypt_iov.c \ + $(srcdir)/encrypt.c \ + $(srcdir)/encrypt_iov.c \ + $(srcdir)/encrypt_length.c \ + $(srcdir)/enctype_compare.c \ + $(srcdir)/enctype_to_string.c \ + $(srcdir)/etypes.c \ + $(srcdir)/keyblocks.c \ + $(srcdir)/keyed_cksum.c \ + $(srcdir)/keyed_checksum_types.c\ + $(srcdir)/keylengths.c \ + $(srcdir)/make_checksum.c \ + $(srcdir)/make_checksum_iov.c \ + $(srcdir)/make_random_key.c \ + $(srcdir)/mandatory_sumtype.c \ + $(srcdir)/nfold.c \ + $(srcdir)/old_api_glue.c \ + $(srcdir)/prf.c \ + $(srcdir)/cf2.c \ + $(srcdir)/prng.c \ + $(srcdir)/random_to_key.c \ + $(srcdir)/state.c \ + $(srcdir)/string_to_cksumtype.c \ + $(srcdir)/string_to_enctype.c \ + $(srcdir)/string_to_key.c \ + $(srcdir)/valid_cksumtype.c \ + $(srcdir)/valid_enctype.c \ + $(srcdir)/verify_checksum.c \ + $(srcdir)/verify_checksum_iov.c + +STOBJLISTS=crc32/OBJS.ST dk/OBJS.ST enc_provider/OBJS.ST \ + hash_provider/OBJS.ST keyhash_provider/OBJS.ST \ + old/OBJS.ST raw/OBJS.ST yarrow/OBJS.ST OBJS.ST + +SUBDIROBJLISTS=crc32/OBJS.ST dk/OBJS.ST enc_provider/OBJS.ST \ + hash_provider/OBJS.ST keyhash_provider/OBJS.ST \ + old/OBJS.ST raw/OBJS.ST yarrow/OBJS.ST OBJS.ST + +##DOS##LIBOBJS = $(OBJS) + +all-unix:: all-libobjs +includes:: depend + +depend:: $(SRCS) + +clean-unix:: clean-libobjs + +all-windows:: + cd crc32 + @echo Making in crypto\crc32 + $(MAKE) -$(MFLAGS) + cd ..\dk + @echo Making in crypto\dk + $(MAKE) -$(MFLAGS) + cd ..\enc_provider + @echo Making in crypto\enc_provider + $(MAKE) -$(MFLAGS) + cd ..\hash_provider + @echo Making in crypto\hash_provider + $(MAKE) -$(MFLAGS) + cd ..\keyhash_provider + @echo Making in crypto\keyhash_provider + $(MAKE) -$(MFLAGS) + cd ..\old + @echo Making in crypto\old + $(MAKE) -$(MFLAGS) + cd ..\raw + @echo Making in crypto\raw + $(MAKE) -$(MFLAGS) + cd ..\yarrow + @echo Making in crypto\yarrow + $(MAKE) -$(MFLAGS) + cd .. + +clean-windows:: + cd crc32 + @echo Making in clean crypto\crc32 + $(MAKE) -$(MFLAGS) clean + cd ..\dk + @echo Making clean in crypto\dk + $(MAKE) -$(MFLAGS) clean + cd ..\enc_provider + @echo Making clean in crypto\enc_provider + $(MAKE) -$(MFLAGS) clean + cd ..\hash_provider + @echo Making clean in crypto\hash_provider + $(MAKE) -$(MFLAGS) clean + cd ..\keyhash_provider + @echo Making clean in crypto\keyhash_provider + $(MAKE) -$(MFLAGS) clean + cd ..\old + @echo Making clean in crypto\old + $(MAKE) -$(MFLAGS) clean + cd ..\raw + @echo Making clean in crypto\raw + $(MAKE) -$(MFLAGS) clean + cd ..\yarrow + @echo Making clean in crypto\yarrow + $(MAKE) -$(MFLAGS) clean + cd .. + +check-windows:: + cd crc32 + @echo Making in check crypto\crc32 + $(MAKE) -$(MFLAGS) check + cd ..\dk + @echo Making check in crypto\dk + $(MAKE) -$(MFLAGS) check + cd ..\enc_provider + @echo Making check in crypto\enc_provider + $(MAKE) -$(MFLAGS) check + cd ..\hash_provider + @echo Making check in crypto\hash_provider + $(MAKE) -$(MFLAGS) check + cd ..\keyhash_provider + @echo Making check in crypto\keyhash_provider + $(MAKE) -$(MFLAGS) check + cd ..\md4 + @echo Making check in crypto\old + $(MAKE) -$(MFLAGS) check + cd ..\raw + @echo Making check in crypto\raw + $(MAKE) -$(MFLAGS) check + cd ..\yarrow + @echo Making check in crypto\yarrow + $(MAKE) -$(MFLAGS) check + cd .. + + + at lib_frag@ + at libobj_frag@ + Copied: trunk/src/lib/crypto/krb/aead.c (from rev 22475, trunk/src/lib/crypto/aead.c) Added: trunk/src/lib/crypto/krb/deps =================================================================== --- trunk/src/lib/crypto/krb/deps 2009-08-01 02:25:56 UTC (rev 22476) +++ trunk/src/lib/crypto/krb/deps 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,445 @@ +# +# Generated makefile dependencies follow. +# +aead.so aead.po $(OUTPRE)aead.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/dk/dk.h \ + aead.c aead.h cksumtypes.h etypes.h +block_size.so block_size.po $(OUTPRE)block_size.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + block_size.c etypes.h +checksum_length.so checksum_length.po $(OUTPRE)checksum_length.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + checksum_length.c cksumtypes.h +cksumtype_to_string.so cksumtype_to_string.po $(OUTPRE)cksumtype_to_string.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + cksumtype_to_string.c cksumtypes.h +cksumtypes.so cksumtypes.po $(OUTPRE)cksumtypes.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/hash_provider/hash_provider.h $(srcdir)/keyhash_provider/keyhash_provider.h \ + cksumtypes.c cksumtypes.h +coll_proof_cksum.so coll_proof_cksum.po $(OUTPRE)coll_proof_cksum.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + cksumtypes.h coll_proof_cksum.c +combine_keys.so combine_keys.po $(OUTPRE)combine_keys.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/dk/dk.h combine_keys.c etypes.h +crypto_length.so crypto_length.po $(OUTPRE)crypto_length.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + aead.h cksumtypes.h crypto_length.c etypes.h +crypto_libinit.so crypto_libinit.po $(OUTPRE)crypto_libinit.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + crypto_libinit.c +default_state.so default_state.po $(OUTPRE)default_state.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + default_state.c +decrypt.so decrypt.po $(OUTPRE)decrypt.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h aead.h cksumtypes.h \ + decrypt.c etypes.h +decrypt_iov.so decrypt_iov.po $(OUTPRE)decrypt_iov.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + aead.h cksumtypes.h decrypt_iov.c etypes.h +encrypt.so encrypt.po $(OUTPRE)encrypt.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h aead.h cksumtypes.h \ + encrypt.c etypes.h +encrypt_iov.so encrypt_iov.po $(OUTPRE)encrypt_iov.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + encrypt_iov.c etypes.h +encrypt_length.so encrypt_length.po $(OUTPRE)encrypt_length.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + aead.h cksumtypes.h encrypt_length.c etypes.h +enctype_compare.so enctype_compare.po $(OUTPRE)enctype_compare.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + enctype_compare.c etypes.h +enctype_to_string.so enctype_to_string.po $(OUTPRE)enctype_to_string.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + enctype_to_string.c etypes.h +etypes.so etypes.po $(OUTPRE)etypes.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../builtin/aes/aes_s2k.h \ + $(srcdir)/../builtin/arcfour/arcfour.h $(srcdir)/../builtin/des/des_int.h \ + $(srcdir)/dk/dk.h $(srcdir)/enc_provider/enc_provider.h \ + $(srcdir)/hash_provider/hash_provider.h $(srcdir)/old/old.h \ + $(srcdir)/raw/raw.h etypes.c etypes.h +keyblocks.so keyblocks.po $(OUTPRE)keyblocks.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + keyblocks.c +keyed_cksum.so keyed_cksum.po $(OUTPRE)keyed_cksum.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + cksumtypes.h keyed_cksum.c +keyed_checksum_types.so keyed_checksum_types.po $(OUTPRE)keyed_checksum_types.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + cksumtypes.h etypes.h keyed_checksum_types.c +keylengths.so keylengths.po $(OUTPRE)keylengths.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + etypes.h keylengths.c +make_checksum.so make_checksum.po $(OUTPRE)make_checksum.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/dk/dk.h cksumtypes.h etypes.h make_checksum.c +make_checksum_iov.so make_checksum_iov.po $(OUTPRE)make_checksum_iov.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + aead.h cksumtypes.h make_checksum_iov.c +make_random_key.so make_random_key.po $(OUTPRE)make_random_key.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + etypes.h make_random_key.c +mandatory_sumtype.so mandatory_sumtype.po $(OUTPRE)mandatory_sumtype.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + etypes.h mandatory_sumtype.c +nfold.so nfold.po $(OUTPRE)nfold.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h nfold.c +old_api_glue.so old_api_glue.po $(OUTPRE)old_api_glue.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + old_api_glue.c +prf.so prf.po $(OUTPRE)prf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h etypes.h prf.c +cf2.so cf2.po $(OUTPRE)cf2.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h cf2.c etypes.h +prng.so prng.po $(OUTPRE)prng.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../builtin/sha1/shs.h \ + $(srcdir)/enc_provider/enc_provider.h $(srcdir)/yarrow/yarrow.h \ + $(srcdir)/yarrow/ycipher.h $(srcdir)/yarrow/yhash.h \ + $(srcdir)/yarrow/ytypes.h prng.c +random_to_key.so random_to_key.po $(OUTPRE)random_to_key.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + etypes.h random_to_key.c +state.so state.po $(OUTPRE)state.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h etypes.h state.c +string_to_cksumtype.so string_to_cksumtype.po $(OUTPRE)string_to_cksumtype.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + cksumtypes.h string_to_cksumtype.c +string_to_enctype.so string_to_enctype.po $(OUTPRE)string_to_enctype.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + etypes.h string_to_enctype.c +string_to_key.so string_to_key.po $(OUTPRE)string_to_key.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + etypes.h string_to_key.c +valid_cksumtype.so valid_cksumtype.po $(OUTPRE)valid_cksumtype.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + cksumtypes.h valid_cksumtype.c +valid_enctype.so valid_enctype.po $(OUTPRE)valid_enctype.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + etypes.h valid_enctype.c +verify_checksum.so verify_checksum.po $(OUTPRE)verify_checksum.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + cksumtypes.h verify_checksum.c +verify_checksum_iov.so verify_checksum_iov.po $(OUTPRE)verify_checksum_iov.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + aead.h cksumtypes.h verify_checksum_iov.c Copied: trunk/src/lib/crypto/krb/dk/Makefile.in (from rev 22475, trunk/src/lib/crypto/dk/Makefile.in) =================================================================== --- trunk/src/lib/crypto/dk/Makefile.in 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/krb/dk/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,53 @@ +thisconfigdir=../../../.. +myfulldir=lib/crypto/krb/dk +mydir=lib/crypto/dk +BUILDTOP=$(REL)..$(S)..$(S)..$(S).. +LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../@CRYPTO_IMPL@ +DEFS= + +##DOS##BUILDTOP = ..\..\..\.. +##DOS##PREFIXDIR=dk +##DOS##OBJFILE=..\$(OUTPRE)dk.lst + +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + +STLIBOBJS=\ + checksum.o \ + dk_aead.o \ + dk_decrypt.o \ + dk_encrypt.o \ + derive.o \ + dk_prf.o \ + stringtokey.o + +OBJS=\ + $(OUTPRE)checksum.$(OBJEXT) \ + $(OUTPRE)dk_aead.$(OBJEXT) \ + $(OUTPRE)dk_decrypt.$(OBJEXT) \ + $(OUTPRE)dk_encrypt.$(OBJEXT) \ + $(OUTPRE)derive.$(OBJEXT) \ + $(OUTPRE)dk_prf.$(OBJEXT) \ + $(OUTPRE)stringtokey.$(OBJEXT) + +SRCS=\ + $(srcdir)/checksum.c \ + $(srcdir)/dk_aead.c \ + $(srcdir)/dk_decrypt.c \ + $(srcdir)/dk_encrypt.c \ + $(srcdir)/dk_prf.c \ + $(srcdir)/derive.c \ + $(srcdir)/stringtokey.c + +##DOS##LIBOBJS = $(OBJS) + +all-unix:: all-libobjs + +includes:: depend + +depend:: $(SRCS) + +clean-unix:: clean-libobjs + + at libobj_frag@ + Deleted: trunk/src/lib/crypto/make_checksum.c Deleted: trunk/src/lib/crypto/make_checksum_iov.c Deleted: trunk/src/lib/crypto/make_random_key.c Deleted: trunk/src/lib/crypto/mandatory_sumtype.c Deleted: trunk/src/lib/crypto/nfold.c Deleted: trunk/src/lib/crypto/old_api_glue.c Deleted: trunk/src/lib/crypto/pbkdf2.c Deleted: trunk/src/lib/crypto/prf.c Deleted: trunk/src/lib/crypto/prng.c Deleted: trunk/src/lib/crypto/random_to_key.c Deleted: trunk/src/lib/crypto/state.c Deleted: trunk/src/lib/crypto/string_to_cksumtype.c Deleted: trunk/src/lib/crypto/string_to_enctype.c Deleted: trunk/src/lib/crypto/string_to_key.c Deleted: trunk/src/lib/crypto/t_cf2.c Deleted: trunk/src/lib/crypto/t_cf2.comments Deleted: trunk/src/lib/crypto/t_cf2.expected Deleted: trunk/src/lib/crypto/t_cf2.in Deleted: trunk/src/lib/crypto/t_cts.c Deleted: trunk/src/lib/crypto/t_encrypt.c Deleted: trunk/src/lib/crypto/t_hmac.c Deleted: trunk/src/lib/crypto/t_nfold.c Deleted: trunk/src/lib/crypto/t_pkcs5.c Deleted: trunk/src/lib/crypto/t_prf.c Deleted: trunk/src/lib/crypto/t_prf.comments Deleted: trunk/src/lib/crypto/t_prf.expected Deleted: trunk/src/lib/crypto/t_prf.in Deleted: trunk/src/lib/crypto/t_prng.c Deleted: trunk/src/lib/crypto/t_prng.comments Deleted: trunk/src/lib/crypto/t_prng.expected Deleted: trunk/src/lib/crypto/t_prng.reseedtest Deleted: trunk/src/lib/crypto/t_prng.reseedtest-comments Deleted: trunk/src/lib/crypto/t_prng.reseedtest-expected Deleted: trunk/src/lib/crypto/t_prng.seed Deleted: trunk/src/lib/crypto/valid_cksumtype.c Deleted: trunk/src/lib/crypto/valid_enctype.c Deleted: trunk/src/lib/crypto/vectors.c Deleted: trunk/src/lib/crypto/verify_checksum.c Deleted: trunk/src/lib/crypto/verify_checksum_iov.c Modified: trunk/src/util/collected-client-lib/Makefile.in =================================================================== --- trunk/src/util/collected-client-lib/Makefile.in 2009-08-01 02:25:56 UTC (rev 22476) +++ trunk/src/util/collected-client-lib/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -40,20 +40,22 @@ ../../lib/krb5/os/OBJS.ST \ ../../lib/krb5/unicode/OBJS.ST \ ../profile/OBJS.ST \ - ../../lib/crypto/crc32/OBJS.ST \ - ../../lib/crypto/des/OBJS.ST \ - ../../lib/crypto/dk/OBJS.ST \ - ../../lib/crypto/enc_provider/OBJS.ST \ - ../../lib/crypto/hash_provider/OBJS.ST \ - ../../lib/crypto/keyhash_provider/OBJS.ST \ - ../../lib/crypto/md4/OBJS.ST \ - ../../lib/crypto/md5/OBJS.ST \ - ../../lib/crypto/old/OBJS.ST \ - ../../lib/crypto/raw/OBJS.ST \ - ../../lib/crypto/sha1/OBJS.ST \ - ../../lib/crypto/arcfour/OBJS.ST \ - ../../lib/crypto/aes/OBJS.ST \ - ../../lib/crypto/yarrow/OBJS.ST \ + ../../lib/crypto/krb/crc32/OBJS.ST \ + ../../lib/crypto/builtin/des/OBJS.ST \ + ../../lib/crypto/krb/dk/OBJS.ST \ + ../../lib/crypto/krb/enc_provider/OBJS.ST \ + ../../lib/crypto/krb/hash_provider/OBJS.ST \ + ../../lib/crypto/krb/keyhash_provider/OBJS.ST \ + ../../lib/crypto/builtin/md4/OBJS.ST \ + ../../lib/crypto/builtin/md5/OBJS.ST \ + ../../lib/crypto/krb/old/OBJS.ST \ + ../../lib/crypto/krb/raw/OBJS.ST \ + ../../lib/crypto/builtin/sha1/OBJS.ST \ + ../../lib/crypto/builtin/arcfour/OBJS.ST \ + ../../lib/crypto/builtin/aes/OBJS.ST \ + ../../lib/crypto/krb/yarrow/OBJS.ST \ + ../../lib/crypto/krb/OBJS.ST \ + ../../lib/crypto/builtin/OBJS.ST \ ../../lib/crypto/OBJS.ST \ ../et/OBJS.ST \ ../support/OBJS.ST Property changes on: trunk/src/lib/crypto/builtin/Makefile.in ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.60 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/aes/Makefile.in (from rev 22475, trunk/src/lib/crypto/aes/Makefile.in) =================================================================== --- trunk/src/lib/crypto/aes/Makefile.in 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/builtin/aes/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,61 @@ +thisconfigdir=../../../.. +myfulldir=lib/crypto/builtin/aes +mydir=lib/crypto/builtin/aes +BUILDTOP=$(REL)..$(S)..$(S)..$(S).. +LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk +DEFS= + +##DOS##BUILDTOP = ..\..\..\.. +##DOS##PREFIXDIR=aes +##DOS##OBJFILE=..\$(OUTPRE)aes.lst + +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + +STLIBOBJS=\ + aescrypt.o \ + aestab.o \ + aeskey.o \ + aes_s2k.o + +OBJS=\ + $(OUTPRE)aescrypt.$(OBJEXT) \ + $(OUTPRE)aestab.$(OBJEXT) \ + $(OUTPRE)aeskey.$(OBJEXT) \ + $(OUTPRE)aes_s2k.$(OBJEXT) + +SRCS=\ + $(srcdir)/aescrypt.c \ + $(srcdir)/aestab.c \ + $(srcdir)/aeskey.c \ + $(srcdir)/aes_s2k.c + +GEN_OBJS=\ + $(OUTPRE)aescrypt.$(OBJEXT) \ + $(OUTPRE)aestab.$(OBJEXT) \ + $(OUTPRE)aeskey.$(OBJEXT) + +##DOS##LIBOBJS = $(OBJS) + +all-unix:: all-libobjs # aes-gen + +includes:: depend + +depend:: $(SRCS) + +aes-gen: aes-gen.o $(GEN_OBJS) + $(CC_LINK) -o aes-gen aes-gen.o $(GEN_OBJS) + +run-aes-gen: aes-gen + ./aes-gen > kresults.out + +check:: run-aes-gen + + +clean-unix:: clean-libobjs + +clean:: + -$(RM) aes-gen aes-gen.o kresults.out + + at libobj_frag@ + Property changes on: trunk/src/lib/crypto/builtin/aes/Makefile.in ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.15 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/aes/aes-gen.c (from rev 22475, trunk/src/lib/crypto/aes/aes-gen.c) Property changes on: trunk/src/lib/crypto/builtin/aes/aes-gen.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/aes/aes.h (from rev 22475, trunk/src/lib/crypto/aes/aes.h) Property changes on: trunk/src/lib/crypto/builtin/aes/aes.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/aes/aes.txt (from rev 22475, trunk/src/lib/crypto/aes/aes.txt) Property changes on: trunk/src/lib/crypto/builtin/aes/aes.txt ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/plain Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/aes/aes_s2k.c (from rev 22475, trunk/src/lib/crypto/aes/aes_s2k.c) Property changes on: trunk/src/lib/crypto/builtin/aes/aes_s2k.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.4 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/aes/aes_s2k.h (from rev 22475, trunk/src/lib/crypto/aes/aes_s2k.h) Property changes on: trunk/src/lib/crypto/builtin/aes/aes_s2k.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/aes/aescpp.h (from rev 22475, trunk/src/lib/crypto/aes/aescpp.h) Property changes on: trunk/src/lib/crypto/builtin/aes/aescpp.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/aes/aescrypp.c (from rev 22475, trunk/src/lib/crypto/aes/aescrypp.c) Property changes on: trunk/src/lib/crypto/builtin/aes/aescrypp.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/aes/aescrypt.asm (from rev 22475, trunk/src/lib/crypto/aes/aescrypt.asm) Property changes on: trunk/src/lib/crypto/builtin/aes/aescrypt.asm ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/aes/aescrypt.c (from rev 22475, trunk/src/lib/crypto/aes/aescrypt.c) Property changes on: trunk/src/lib/crypto/builtin/aes/aescrypt.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/aes/aeskey.c (from rev 22475, trunk/src/lib/crypto/aes/aeskey.c) Property changes on: trunk/src/lib/crypto/builtin/aes/aeskey.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/aes/aeskeypp.c (from rev 22475, trunk/src/lib/crypto/aes/aeskeypp.c) Property changes on: trunk/src/lib/crypto/builtin/aes/aeskeypp.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/aes/aesopt.h (from rev 22475, trunk/src/lib/crypto/aes/aesopt.h) Property changes on: trunk/src/lib/crypto/builtin/aes/aesopt.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.5 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/aes/aessrc.url (from rev 22475, trunk/src/lib/crypto/aes/aessrc.url) Property changes on: trunk/src/lib/crypto/builtin/aes/aessrc.url ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/aes/aestab.c (from rev 22475, trunk/src/lib/crypto/aes/aestab.c) Property changes on: trunk/src/lib/crypto/builtin/aes/aestab.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/aes/deps (from rev 22475, trunk/src/lib/crypto/aes/deps) =================================================================== --- trunk/src/lib/crypto/aes/deps 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/builtin/aes/deps 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,21 @@ +# +# Generated makefile dependencies follow. +# +aescrypt.so aescrypt.po $(OUTPRE)aescrypt.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h aes.h aescrypt.c aesopt.h \ + uitypes.h +aestab.so aestab.po $(OUTPRE)aestab.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + aes.h aesopt.h aestab.c uitypes.h +aeskey.so aeskey.po $(OUTPRE)aeskey.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + aes.h aeskey.c aesopt.h uitypes.h +aes_s2k.so aes_s2k.po $(OUTPRE)aes_s2k.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../krb/dk/dk.h \ + aes_s2k.c aes_s2k.h Property changes on: trunk/src/lib/crypto/builtin/aes/deps ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/builtin/aes/uitypes.h (from rev 22475, trunk/src/lib/crypto/aes/uitypes.h) Property changes on: trunk/src/lib/crypto/builtin/aes/uitypes.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.2 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/arcfour/Makefile.in (from rev 22475, trunk/src/lib/crypto/arcfour/Makefile.in) =================================================================== --- trunk/src/lib/crypto/arcfour/Makefile.in 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/builtin/arcfour/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,41 @@ +thisconfigdir=../../../.. +myfulldir=lib/crypto/builtin/arcfour +mydir=lib/crypto/builtin/arcfour +BUILDTOP=$(REL)..$(S)..$(S)..$(S).. +LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../md4 -I$(srcdir)/../../krb +DEFS= + +##DOS##BUILDTOP = ..\..\..\.. +##DOS##PREFIXDIR=arcfour +##DOS##OBJFILE=..\$(OUTPRE)arcfour.lst + +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + +STLIBOBJS=\ + arcfour.o \ + arcfour_aead.o \ + arcfour_s2k.o + +OBJS=\ + $(OUTPRE)arcfour.$(OBJEXT) \ + $(OUTPRE)arcfour_aead.$(OBJEXT) \ + $(OUTPRE)arcfour_s2k.$(OBJEXT) + +SRCS=\ + $(srcdir)/arcfour.c \ + $(srcdir)/arcfour_aead.c\ + $(srcdir)/arcfour_s2k.c + +##DOS##LIBOBJS = $(OBJS) + +all-unix:: all-libobjs + +includes:: depend + +depend:: $(SRCS) + +clean-unix:: clean-libobjs + + at libobj_frag@ + Property changes on: trunk/src/lib/crypto/builtin/arcfour/Makefile.in ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.14 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/arcfour/arcfour-int.h (from rev 22475, trunk/src/lib/crypto/arcfour/arcfour-int.h) Property changes on: trunk/src/lib/crypto/builtin/arcfour/arcfour-int.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.3 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Property changes on: trunk/src/lib/crypto/builtin/arcfour/arcfour.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.4 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/arcfour/arcfour_aead.c (from rev 22475, trunk/src/lib/crypto/arcfour/arcfour_aead.c) Property changes on: trunk/src/lib/crypto/builtin/arcfour/arcfour_aead.c ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/builtin/arcfour/arcfour_s2k.c (from rev 22475, trunk/src/lib/crypto/arcfour/arcfour_s2k.c) Property changes on: trunk/src/lib/crypto/builtin/arcfour/arcfour_s2k.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/arcfour/deps (from rev 22475, trunk/src/lib/crypto/arcfour/deps) =================================================================== --- trunk/src/lib/crypto/arcfour/deps 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/builtin/arcfour/deps 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,38 @@ +# +# Generated makefile dependencies follow. +# +arcfour.so arcfour.po $(OUTPRE)arcfour.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../krb/hash_provider/hash_provider.h \ + arcfour-int.h arcfour.c arcfour.h +arcfour_aead.so arcfour_aead.po $(OUTPRE)arcfour_aead.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../../krb/aead.h $(srcdir)/../../krb/cksumtypes.h \ + arcfour-int.h arcfour.h arcfour_aead.c +arcfour_s2k.so arcfour_s2k.po $(OUTPRE)arcfour_s2k.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/k5-utf8.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../md4/rsa-md4.h \ + arcfour-int.h arcfour.h arcfour_s2k.c Property changes on: trunk/src/lib/crypto/builtin/arcfour/deps ___________________________________________________________________ Name: svn:mergeinfo + Property changes on: trunk/src/lib/crypto/builtin/des/ISSUES ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.2 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Property changes on: trunk/src/lib/crypto/builtin/des/afsstring2key.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.17 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/des/d3_aead.c (from rev 22475, trunk/src/lib/crypto/des/d3_aead.c) =================================================================== --- trunk/src/lib/crypto/des/d3_aead.c 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/builtin/des/d3_aead.c 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,207 @@ +/* + * Copyright (C) 2008 by the Massachusetts Institute of Technology. + * Copyright 1995 by Richard P. Basch. All Rights Reserved. + * Copyright 1995 by Lehman Brothers, Inc. All Rights Reserved. + * + * Export of this software from the United States of America may + * require a specific license from the United States Government. + * It is the responsibility of any person or organization contemplating + * export to obtain such a license before exporting. + * + * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and + * distribute this software and its documentation for any purpose and + * without fee is hereby granted, provided that the above copyright + * notice appear in all copies and that both that copyright notice and + * this permission notice appear in supporting documentation, and that + * the name of Richard P. Basch, Lehman Brothers and M.I.T. not be used + * in advertising or publicity pertaining to distribution of the software + * without specific, written prior permission. Richard P. Basch, + * Lehman Brothers and M.I.T. make no representations about the suitability + * of this software for any purpose. It is provided "as is" without + * express or implied warranty. + */ + +#include "des_int.h" +#include "f_tables.h" +#include "aead.h" + +void +krb5int_des3_cbc_encrypt_iov(krb5_crypto_iov *data, + unsigned long num_data, + const mit_des_key_schedule ks1, + const mit_des_key_schedule ks2, + const mit_des_key_schedule ks3, + mit_des_cblock ivec) +{ + unsigned DES_INT32 left, right; + const unsigned DES_INT32 *kp1, *kp2, *kp3; + const unsigned char *ip; + unsigned char *op; + struct iov_block_state input_pos, output_pos; + unsigned char iblock[MIT_DES_BLOCK_LENGTH]; + unsigned char oblock[MIT_DES_BLOCK_LENGTH]; + + IOV_BLOCK_STATE_INIT(&input_pos); + IOV_BLOCK_STATE_INIT(&output_pos); + + /* + * Get key pointer here. This won't need to be reinitialized + */ + kp1 = (const unsigned DES_INT32 *)ks1; + kp2 = (const unsigned DES_INT32 *)ks2; + kp3 = (const unsigned DES_INT32 *)ks3; + + /* + * Initialize left and right with the contents of the initial + * vector. + */ + if (ivec != NULL) + ip = ivec; + else + ip = mit_des_zeroblock; + GET_HALF_BLOCK(left, ip); + GET_HALF_BLOCK(right, ip); + + /* + * Suitably initialized, now work the length down 8 bytes + * at a time. + */ + for (;;) { + unsigned DES_INT32 temp; + + ip = iblock; + op = oblock; + + if (!krb5int_c_iov_get_block(iblock, MIT_DES_BLOCK_LENGTH, data, num_data, &input_pos)) + break; + + if (input_pos.iov_pos == num_data) + break; + + GET_HALF_BLOCK(temp, ip); + left ^= temp; + GET_HALF_BLOCK(temp, ip); + right ^= temp; + + /* + * Encrypt what we have + */ + DES_DO_ENCRYPT(left, right, kp1); + DES_DO_DECRYPT(left, right, kp2); + DES_DO_ENCRYPT(left, right, kp3); + + /* + * Copy the results out + */ + PUT_HALF_BLOCK(left, op); + PUT_HALF_BLOCK(right, op); + + krb5int_c_iov_put_block(data, num_data, oblock, MIT_DES_BLOCK_LENGTH, &output_pos); + } + + if (ivec != NULL) + memcpy(ivec, oblock, MIT_DES_BLOCK_LENGTH); +} + +void +krb5int_des3_cbc_decrypt_iov(krb5_crypto_iov *data, + unsigned long num_data, + const mit_des_key_schedule ks1, + const mit_des_key_schedule ks2, + const mit_des_key_schedule ks3, + mit_des_cblock ivec) +{ + unsigned DES_INT32 left, right; + const unsigned DES_INT32 *kp1, *kp2, *kp3; + const unsigned char *ip; + unsigned DES_INT32 ocipherl, ocipherr; + unsigned DES_INT32 cipherl, cipherr; + unsigned char *op; + struct iov_block_state input_pos, output_pos; + unsigned char iblock[MIT_DES_BLOCK_LENGTH]; + unsigned char oblock[MIT_DES_BLOCK_LENGTH]; + + IOV_BLOCK_STATE_INIT(&input_pos); + IOV_BLOCK_STATE_INIT(&output_pos); + + /* + * Get key pointer here. This won't need to be reinitialized + */ + kp1 = (const unsigned DES_INT32 *)ks1; + kp2 = (const unsigned DES_INT32 *)ks2; + kp3 = (const unsigned DES_INT32 *)ks3; + + /* + * Decrypting is harder than encrypting because of + * the necessity of remembering a lot more things. + * Should think about this a little more... + */ + + if (num_data == 0) + return; + + /* + * Prime the old cipher with ivec. + */ + if (ivec != NULL) + ip = ivec; + else + ip = mit_des_zeroblock; + GET_HALF_BLOCK(ocipherl, ip); + GET_HALF_BLOCK(ocipherr, ip); + + /* + * Now do this in earnest until we run out of length. + */ + for (;;) { + /* + * Read a block from the input into left and + * right. Save this cipher block for later. + */ + + if (!krb5int_c_iov_get_block(iblock, MIT_DES_BLOCK_LENGTH, data, num_data, &input_pos)) + break; + + if (input_pos.iov_pos == num_data) + break; + + ip = iblock; + op = oblock; + + GET_HALF_BLOCK(left, ip); + GET_HALF_BLOCK(right, ip); + cipherl = left; + cipherr = right; + + /* + * Decrypt this. + */ + DES_DO_DECRYPT(left, right, kp3); + DES_DO_ENCRYPT(left, right, kp2); + DES_DO_DECRYPT(left, right, kp1); + + /* + * Xor with the old cipher to get plain + * text. Output 8 or less bytes of this. + */ + left ^= ocipherl; + right ^= ocipherr; + + PUT_HALF_BLOCK(left, op); + PUT_HALF_BLOCK(right, op); + + /* + * Save current cipher block here + */ + ocipherl = cipherl; + ocipherr = cipherr; + + krb5int_c_iov_put_block(data, num_data, oblock, MIT_DES_BLOCK_LENGTH, &output_pos); + } + + if (ivec != NULL) { + op = ivec; + PUT_HALF_BLOCK(ocipherl,op); + PUT_HALF_BLOCK(ocipherr, op); + } +} Property changes on: trunk/src/lib/crypto/builtin/des/d3_aead.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.11 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/des/d3_cbc.c (from rev 22475, trunk/src/lib/crypto/des/d3_cbc.c) Property changes on: trunk/src/lib/crypto/builtin/des/d3_cbc.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.11 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/des/d3_kysched.c (from rev 22475, trunk/src/lib/crypto/des/d3_kysched.c) Property changes on: trunk/src/lib/crypto/builtin/des/d3_kysched.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.4 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/des/deps (from rev 22475, trunk/src/lib/crypto/des/deps) =================================================================== --- trunk/src/lib/crypto/des/deps 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/builtin/des/deps 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,158 @@ +# +# Generated makefile dependencies follow. +# +afsstring2key.so afsstring2key.po $(OUTPRE)afsstring2key.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + afsstring2key.c des_int.h +d3_cbc.so d3_cbc.po $(OUTPRE)d3_cbc.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h d3_cbc.c des_int.h \ + f_tables.h +d3_aead.so d3_aead.po $(OUTPRE)d3_aead.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../krb/aead.h \ + $(srcdir)/../../krb/cksumtypes.h d3_aead.c des_int.h \ + f_tables.h +d3_kysched.so d3_kysched.po $(OUTPRE)d3_kysched.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + d3_kysched.c des_int.h +des_prf.so des_prf.po $(OUTPRE)des_prf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../krb/hash_provider/hash_provider.h \ + des_prf.c +f_aead.so f_aead.po $(OUTPRE)f_aead.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../krb/aead.h \ + $(srcdir)/../../krb/cksumtypes.h des_int.h f_aead.c \ + f_tables.h +f_cbc.so f_cbc.po $(OUTPRE)f_cbc.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h des_int.h f_cbc.c \ + f_tables.h +f_cksum.so f_cksum.po $(OUTPRE)f_cksum.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h des_int.h f_cksum.c \ + f_tables.h +f_parity.so f_parity.po $(OUTPRE)f_parity.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + des_int.h f_parity.c +f_sched.so f_sched.po $(OUTPRE)f_sched.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h des_int.h f_sched.c +f_tables.so f_tables.po $(OUTPRE)f_tables.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + des_int.h f_tables.c f_tables.h +key_sched.so key_sched.po $(OUTPRE)key_sched.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + des_int.h key_sched.c +weak_key.so weak_key.po $(OUTPRE)weak_key.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + des_int.h weak_key.c +string2key.so string2key.po $(OUTPRE)string2key.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + des_int.h string2key.c Property changes on: trunk/src/lib/crypto/builtin/des/deps ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/builtin/des/des_int.h (from rev 22475, trunk/src/lib/crypto/des/des_int.h) Property changes on: trunk/src/lib/crypto/builtin/des/des_int.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.56 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/des/des_prf.c (from rev 22475, trunk/src/lib/crypto/des/des_prf.c) =================================================================== --- trunk/src/lib/crypto/des/des_prf.c 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/builtin/des/des_prf.c 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,54 @@ +/* + * lib/crypto/des/des_prf.c + * + * Copyright (C) 2004, 2009 by the Massachusetts Institute of Technology. + * All rights reserved. + * + * Export of this software from the United States of America may + * require a specific license from the United States Government. + * It is the responsibility of any person or organization contemplating + * export to obtain such a license before exporting. + * + * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and + * distribute this software and its documentation for any purpose and + * without fee is hereby granted, provided that the above copyright + * notice appear in all copies and that both that copyright notice and + * this permission notice appear in supporting documentation, and that + * the name of M.I.T. not be used in advertising or publicity pertaining + * to distribution of the software without specific, written prior + * permission. Furthermore if you modify this software you must label + * your software as modified software and not distribute it in such a + * fashion that it might be confused with the original M.I.T. software. + * M.I.T. makes no representations about the suitability of + * this software for any purpose. It is provided "as is" without express + * or implied warranty. + * + * + * + * This file contains an implementation of the RFC 3961 PRF for + * des-cbc-crc, des-cbc-md4, and des-cbc-md5 enctypes. + */ + +#include "k5-int.h" +#include "hash_provider/hash_provider.h" /* XXX is this ok? */ + +krb5_error_code +krb5int_des_prf (const struct krb5_enc_provider *enc, + const struct krb5_hash_provider *hash, + const krb5_keyblock *key, + const krb5_data *in, krb5_data *out) +{ + krb5_data tmp; + krb5_error_code ret = 0; + + hash = &krb5int_hash_md5; /* MD5 is always used. */ + tmp.length = hash->hashsize; + tmp.data = malloc(hash->hashsize); + if (tmp.data == NULL) + return ENOMEM; + ret = hash->hash(1, in, &tmp); + if (ret == 0) + ret = enc->encrypt(key, NULL, &tmp, out); + free(tmp.data); + return ret; +} Property changes on: trunk/src/lib/crypto/builtin/des/des_prf.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/des/doc/libdes.doc (from rev 22475, trunk/src/lib/crypto/des/doc/libdes.doc) Property changes on: trunk/src/lib/crypto/builtin/des/doc/libdes.doc ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + application/msword Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/des/f_aead.c (from rev 22475, trunk/src/lib/crypto/des/f_aead.c) =================================================================== --- trunk/src/lib/crypto/des/f_aead.c 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/builtin/des/f_aead.c 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,192 @@ +/* + * Copyright (C) 2008 by the Massachusetts Institute of Technology. + * Copyright 1995 by Richard P. Basch. All Rights Reserved. + * Copyright 1995 by Lehman Brothers, Inc. All Rights Reserved. + * + * Export of this software from the United States of America may + * require a specific license from the United States Government. + * It is the responsibility of any person or organization contemplating + * export to obtain such a license before exporting. + * + * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and + * distribute this software and its documentation for any purpose and + * without fee is hereby granted, provided that the above copyright + * notice appear in all copies and that both that copyright notice and + * this permission notice appear in supporting documentation, and that + * the name of Richard P. Basch, Lehman Brothers and M.I.T. not be used + * in advertising or publicity pertaining to distribution of the software + * without specific, written prior permission. Richard P. Basch, + * Lehman Brothers and M.I.T. make no representations about the suitability + * of this software for any purpose. It is provided "as is" without + * express or implied warranty. + */ + +#include "des_int.h" +#include "f_tables.h" +#include "aead.h" + +void +krb5int_des_cbc_encrypt_iov(krb5_crypto_iov *data, + unsigned long num_data, + const mit_des_key_schedule schedule, + mit_des_cblock ivec) +{ + unsigned DES_INT32 left, right; + const unsigned DES_INT32 *kp; + const unsigned char *ip; + unsigned char *op; + struct iov_block_state input_pos, output_pos; + unsigned char iblock[MIT_DES_BLOCK_LENGTH]; + unsigned char oblock[MIT_DES_BLOCK_LENGTH]; + + IOV_BLOCK_STATE_INIT(&input_pos); + IOV_BLOCK_STATE_INIT(&output_pos); + + /* + * Get key pointer here. This won't need to be reinitialized + */ + kp = (const unsigned DES_INT32 *)schedule; + + /* + * Initialize left and right with the contents of the initial + * vector. + */ + if (ivec != NULL) + ip = ivec; + else + ip = mit_des_zeroblock; + GET_HALF_BLOCK(left, ip); + GET_HALF_BLOCK(right, ip); + + /* + * Suitably initialized, now work the length down 8 bytes + * at a time. + */ + for (;;) { + unsigned DES_INT32 temp; + + ip = iblock; + op = oblock; + + if (!krb5int_c_iov_get_block(iblock, MIT_DES_BLOCK_LENGTH, data, num_data, &input_pos)) + break; + + if (input_pos.iov_pos == num_data) + break; + + GET_HALF_BLOCK(temp, ip); + left ^= temp; + GET_HALF_BLOCK(temp, ip); + right ^= temp; + + /* + * Encrypt what we have + */ + DES_DO_ENCRYPT(left, right, kp); + + /* + * Copy the results out + */ + PUT_HALF_BLOCK(left, op); + PUT_HALF_BLOCK(right, op); + + krb5int_c_iov_put_block(data, num_data, oblock, MIT_DES_BLOCK_LENGTH, &output_pos); + } + + if (ivec != NULL) + memcpy(ivec, oblock, MIT_DES_BLOCK_LENGTH); +} + +void +krb5int_des_cbc_decrypt_iov(krb5_crypto_iov *data, + unsigned long num_data, + const mit_des_key_schedule schedule, + mit_des_cblock ivec) +{ + unsigned DES_INT32 left, right; + const unsigned DES_INT32 *kp; + const unsigned char *ip; + unsigned DES_INT32 ocipherl, ocipherr; + unsigned DES_INT32 cipherl, cipherr; + unsigned char *op; + struct iov_block_state input_pos, output_pos; + unsigned char iblock[MIT_DES_BLOCK_LENGTH]; + unsigned char oblock[MIT_DES_BLOCK_LENGTH]; + + IOV_BLOCK_STATE_INIT(&input_pos); + IOV_BLOCK_STATE_INIT(&output_pos); + + /* + * Get key pointer here. This won't need to be reinitialized + */ + kp = (const unsigned DES_INT32 *)schedule; + + /* + * Decrypting is harder than encrypting because of + * the necessity of remembering a lot more things. + * Should think about this a little more... + */ + + if (num_data == 0) + return; + + /* + * Prime the old cipher with ivec. + */ + if (ivec != NULL) + ip = ivec; + else + ip = mit_des_zeroblock; + GET_HALF_BLOCK(ocipherl, ip); + GET_HALF_BLOCK(ocipherr, ip); + + /* + * Now do this in earnest until we run out of length. + */ + for (;;) { + /* + * Read a block from the input into left and + * right. Save this cipher block for later. + */ + + if (!krb5int_c_iov_get_block(iblock, MIT_DES_BLOCK_LENGTH, data, num_data, &input_pos)) + break; + + if (input_pos.iov_pos == num_data) + break; + + ip = iblock; + op = oblock; + + GET_HALF_BLOCK(left, ip); + GET_HALF_BLOCK(right, ip); + cipherl = left; + cipherr = right; + + /* + * Decrypt this. + */ + DES_DO_DECRYPT(left, right, kp); + + /* + * Xor with the old cipher to get plain + * text. Output 8 or less bytes of this. + */ + left ^= ocipherl; + right ^= ocipherr; + + PUT_HALF_BLOCK(left, op); + PUT_HALF_BLOCK(right, op); + + /* + * Save current cipher block here + */ + ocipherl = cipherl; + ocipherr = cipherr; + + krb5int_c_iov_put_block(data, num_data, oblock, MIT_DES_BLOCK_LENGTH, &output_pos); + } + + if (ivec != NULL) + memcpy(ivec, oblock, MIT_DES_BLOCK_LENGTH); +} Property changes on: trunk/src/lib/crypto/builtin/des/f_aead.c ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/builtin/des/f_cbc.c (from rev 22475, trunk/src/lib/crypto/des/f_cbc.c) Property changes on: trunk/src/lib/crypto/builtin/des/f_cbc.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.21 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/des/f_cksum.c (from rev 22475, trunk/src/lib/crypto/des/f_cksum.c) Property changes on: trunk/src/lib/crypto/builtin/des/f_cksum.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.16 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/des/f_parity.c (from rev 22475, trunk/src/lib/crypto/des/f_parity.c) Property changes on: trunk/src/lib/crypto/builtin/des/f_parity.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.8 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/des/f_sched.c (from rev 22475, trunk/src/lib/crypto/des/f_sched.c) Property changes on: trunk/src/lib/crypto/builtin/des/f_sched.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.10 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/des/f_tables.c (from rev 22475, trunk/src/lib/crypto/des/f_tables.c) Property changes on: trunk/src/lib/crypto/builtin/des/f_tables.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.3 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/des/f_tables.h (from rev 22475, trunk/src/lib/crypto/des/f_tables.h) Property changes on: trunk/src/lib/crypto/builtin/des/f_tables.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.10 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/des/key_sched.c (from rev 22475, trunk/src/lib/crypto/des/key_sched.c) Property changes on: trunk/src/lib/crypto/builtin/des/key_sched.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.19 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/des/string2key.c (from rev 22475, trunk/src/lib/crypto/des/string2key.c) Property changes on: trunk/src/lib/crypto/builtin/des/string2key.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.43 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/des/weak_key.c (from rev 22475, trunk/src/lib/crypto/des/weak_key.c) Property changes on: trunk/src/lib/crypto/builtin/des/weak_key.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.15 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/hmac.c (from rev 22475, trunk/src/lib/crypto/hmac.c) Property changes on: trunk/src/lib/crypto/builtin/hmac.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.6 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/md4/ISSUES (from rev 22475, trunk/src/lib/crypto/md4/ISSUES) Property changes on: trunk/src/lib/crypto/builtin/md4/ISSUES ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.1 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/md4/Makefile.in (from rev 22475, trunk/src/lib/crypto/md4/Makefile.in) =================================================================== --- trunk/src/lib/crypto/md4/Makefile.in 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/builtin/md4/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,39 @@ +thisconfigdir=../../../.. +myfulldir=lib/crypto/builtin/md4 +mydir=lib/crypto/builtin/md4 +BUILDTOP=$(REL)..$(S)..$(S)..$(S).. +LOCALINCLUDES = -I$(srcdir) +DEFS= + +##DOS##BUILDTOP = ..\..\..\.. +##DOS##PREFIXDIR=md4 +##DOS##OBJFILE=..\$(OUTPRE)md4.lst + +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + +STLIBOBJS= md4.o + +OBJS= $(OUTPRE)md4.$(OBJEXT) + +SRCS= $(srcdir)/md4.c + +##DOS##LIBOBJS = $(OBJS) + +all-unix:: all-libobjs + +includes:: depend + +depend:: $(SRCS) + + +check-unix:: + +check-windows:: + +clean:: + +clean-unix:: clean-libobjs + + at libobj_frag@ + Property changes on: trunk/src/lib/crypto/builtin/md4/Makefile.in ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.46 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/md4/deps (from rev 22475, trunk/src/lib/crypto/md4/deps) =================================================================== --- trunk/src/lib/crypto/md4/deps 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/builtin/md4/deps 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,13 @@ +# +# Generated makefile dependencies follow. +# +md4.so md4.po $(OUTPRE)md4.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h md4.c rsa-md4.h Property changes on: trunk/src/lib/crypto/builtin/md4/deps ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/builtin/md4/md4.c (from rev 22475, trunk/src/lib/crypto/md4/md4.c) Property changes on: trunk/src/lib/crypto/builtin/md4/md4.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.23 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/md4/rsa-md4.h (from rev 22475, trunk/src/lib/crypto/md4/rsa-md4.h) Property changes on: trunk/src/lib/crypto/builtin/md4/rsa-md4.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.15 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/md5/ISSUES (from rev 22475, trunk/src/lib/crypto/md5/ISSUES) Property changes on: trunk/src/lib/crypto/builtin/md5/ISSUES ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.1 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/md5/Makefile.in (from rev 22475, trunk/src/lib/crypto/md5/Makefile.in) =================================================================== --- trunk/src/lib/crypto/md5/Makefile.in 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/builtin/md5/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,37 @@ +thisconfigdir=../../../.. +myfulldir=lib/crypto/builtin/md5 +mydir=lib/crypto/builtin/md5 +BUILDTOP=$(REL)..$(S)..$(S)..$(S).. +DEFS= + +##DOS##BUILDTOP = ..\..\..\.. +##DOS##PREFIXDIR=md5 +##DOS##OBJFILE=..\$(OUTPRE)md5.lst + +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + +STLIBOBJS= md5.o + +OBJS= $(OUTPRE)md5.$(OBJEXT) + +SRCS= $(srcdir)/md5.c + +##DOS##LIBOBJS = $(OBJS) + +all-unix:: all-libobjs + +includes:: depend + +depend:: $(SRCS) + +check-unix:: + +check-windows:: + +clean:: + +clean-unix:: clean-libobjs + + at libobj_frag@ + Property changes on: trunk/src/lib/crypto/builtin/md5/Makefile.in ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.45 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/md5/deps (from rev 22475, trunk/src/lib/crypto/md5/deps) =================================================================== --- trunk/src/lib/crypto/md5/deps 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/builtin/md5/deps 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,13 @@ +# +# Generated makefile dependencies follow. +# +md5.so md5.po $(OUTPRE)md5.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h md5.c rsa-md5.h Property changes on: trunk/src/lib/crypto/builtin/md5/deps ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/builtin/md5/md5.c (from rev 22475, trunk/src/lib/crypto/md5/md5.c) Property changes on: trunk/src/lib/crypto/builtin/md5/md5.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.16 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/md5/rsa-md5.h (from rev 22475, trunk/src/lib/crypto/md5/rsa-md5.h) Property changes on: trunk/src/lib/crypto/builtin/md5/rsa-md5.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.8 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/pbkdf2.c (from rev 22475, trunk/src/lib/crypto/pbkdf2.c) Property changes on: trunk/src/lib/crypto/builtin/pbkdf2.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.8 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/sha1/ISSUES (from rev 22475, trunk/src/lib/crypto/sha1/ISSUES) Property changes on: trunk/src/lib/crypto/builtin/sha1/ISSUES ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/sha1/Makefile.in (from rev 22475, trunk/src/lib/crypto/sha1/Makefile.in) =================================================================== --- trunk/src/lib/crypto/sha1/Makefile.in 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/builtin/sha1/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,37 @@ +thisconfigdir=../../../.. +myfulldir=lib/crypto/builtin/sha1 +mydir=lib/crypto/builtin/sha1 +BUILDTOP=$(REL)..$(S)..$(S)..$(S).. +DEFS= + +##DOS##BUILDTOP = ..\..\..\.. +##DOS##PREFIXDIR=sha1 +##DOS##OBJFILE=..\$(OUTPRE)sha1.lst + +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + +STLIBOBJS= shs.o + +OBJS= $(OUTPRE)shs.$(OBJEXT) + +SRCS= $(srcdir)/shs.c + +##DOS##LIBOBJS = $(OBJS) + +all-unix:: all-libobjs + +includes:: depend + +depend:: $(SRCS) + +check-unix:: + +check-windows:: + +clean:: + +clean-unix:: clean-libobjs + + at libobj_frag@ + Property changes on: trunk/src/lib/crypto/builtin/sha1/Makefile.in ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.21 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/sha1/deps (from rev 22475, trunk/src/lib/crypto/sha1/deps) =================================================================== --- trunk/src/lib/crypto/sha1/deps 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/builtin/sha1/deps 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,13 @@ +# +# Generated makefile dependencies follow. +# +shs.so shs.po $(OUTPRE)shs.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h shs.c shs.h Property changes on: trunk/src/lib/crypto/builtin/sha1/deps ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/builtin/sha1/shs.c (from rev 22475, trunk/src/lib/crypto/sha1/shs.c) Property changes on: trunk/src/lib/crypto/builtin/sha1/shs.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.8 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/builtin/sha1/shs.h (from rev 22475, trunk/src/lib/crypto/sha1/shs.h) Property changes on: trunk/src/lib/crypto/builtin/sha1/shs.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.7 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Property changes on: trunk/src/lib/crypto/crypto_tests/aes-test.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Property changes on: trunk/src/lib/crypto/crypto_tests/destest.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.24 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/expect-vk.txt (from rev 22475, trunk/src/lib/crypto/aes/expect-vk.txt) Property changes on: trunk/src/lib/crypto/crypto_tests/expect-vk.txt ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/plain Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/expect-vt.txt (from rev 22475, trunk/src/lib/crypto/aes/expect-vt.txt) Property changes on: trunk/src/lib/crypto/crypto_tests/expect-vt.txt ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/plain Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/keytest.data (from rev 22475, trunk/src/lib/crypto/des/keytest.data) Property changes on: trunk/src/lib/crypto/crypto_tests/keytest.data ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_afss2k.c (from rev 22475, trunk/src/lib/crypto/des/t_afss2k.c) Property changes on: trunk/src/lib/crypto/crypto_tests/t_afss2k.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.5 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_cf2.c (from rev 22475, trunk/src/lib/crypto/t_cf2.c) Property changes on: trunk/src/lib/crypto/crypto_tests/t_cf2.c ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/crypto_tests/t_cf2.comments (from rev 22475, trunk/src/lib/crypto/t_cf2.comments) Property changes on: trunk/src/lib/crypto/crypto_tests/t_cf2.comments ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/crypto_tests/t_cf2.expected (from rev 22475, trunk/src/lib/crypto/t_cf2.expected) Property changes on: trunk/src/lib/crypto/crypto_tests/t_cf2.expected ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/crypto_tests/t_cf2.in (from rev 22475, trunk/src/lib/crypto/t_cf2.in) Property changes on: trunk/src/lib/crypto/crypto_tests/t_cf2.in ___________________________________________________________________ Name: svn:mergeinfo + Property changes on: trunk/src/lib/crypto/crypto_tests/t_crc.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.4 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_cts.c (from rev 22475, trunk/src/lib/crypto/t_cts.c) Property changes on: trunk/src/lib/crypto/crypto_tests/t_cts.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.2 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_encrypt.c (from rev 22475, trunk/src/lib/crypto/t_encrypt.c) Property changes on: trunk/src/lib/crypto/crypto_tests/t_encrypt.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.9 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_hmac.c (from rev 22475, trunk/src/lib/crypto/t_hmac.c) Property changes on: trunk/src/lib/crypto/crypto_tests/t_hmac.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.4 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_mdcksum.c (from rev 22475, trunk/src/lib/crypto/md5/t_cksum.c) Property changes on: trunk/src/lib/crypto/crypto_tests/t_mdcksum.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.13 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_mddriver.c (from rev 22475, trunk/src/lib/crypto/md5/t_mddriver.c) Property changes on: trunk/src/lib/crypto/crypto_tests/t_mddriver.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.7 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_nfold.c (from rev 22475, trunk/src/lib/crypto/t_nfold.c) Property changes on: trunk/src/lib/crypto/crypto_tests/t_nfold.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.7 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_pkcs5.c (from rev 22475, trunk/src/lib/crypto/t_pkcs5.c) Property changes on: trunk/src/lib/crypto/crypto_tests/t_pkcs5.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.2 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_prf.c (from rev 22475, trunk/src/lib/crypto/t_prf.c) Property changes on: trunk/src/lib/crypto/crypto_tests/t_prf.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.1 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_prf.comments (from rev 22475, trunk/src/lib/crypto/t_prf.comments) Property changes on: trunk/src/lib/crypto/crypto_tests/t_prf.comments ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/crypto_tests/t_prf.expected (from rev 22475, trunk/src/lib/crypto/t_prf.expected) Property changes on: trunk/src/lib/crypto/crypto_tests/t_prf.expected ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/crypto_tests/t_prf.in (from rev 22475, trunk/src/lib/crypto/t_prf.in) Property changes on: trunk/src/lib/crypto/crypto_tests/t_prf.in ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/crypto_tests/t_prng.c (from rev 22475, trunk/src/lib/crypto/t_prng.c) Property changes on: trunk/src/lib/crypto/crypto_tests/t_prng.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.3 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_prng.comments (from rev 22475, trunk/src/lib/crypto/t_prng.comments) Property changes on: trunk/src/lib/crypto/crypto_tests/t_prng.comments ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.1 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_prng.expected (from rev 22475, trunk/src/lib/crypto/t_prng.expected) Property changes on: trunk/src/lib/crypto/crypto_tests/t_prng.expected ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.3 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_prng.reseedtest (from rev 22475, trunk/src/lib/crypto/t_prng.reseedtest) Property changes on: trunk/src/lib/crypto/crypto_tests/t_prng.reseedtest ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.1 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_prng.reseedtest-comments (from rev 22475, trunk/src/lib/crypto/t_prng.reseedtest-comments) Property changes on: trunk/src/lib/crypto/crypto_tests/t_prng.reseedtest-comments ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.1 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_prng.reseedtest-expected (from rev 22475, trunk/src/lib/crypto/t_prng.reseedtest-expected) Property changes on: trunk/src/lib/crypto/crypto_tests/t_prng.reseedtest-expected ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.4 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_prng.seed (from rev 22475, trunk/src/lib/crypto/t_prng.seed) Property changes on: trunk/src/lib/crypto/crypto_tests/t_prng.seed ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.2 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_shs.c (from rev 22475, trunk/src/lib/crypto/sha1/t_shs.c) Property changes on: trunk/src/lib/crypto/crypto_tests/t_shs.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.4 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_shs3.c (from rev 22475, trunk/src/lib/crypto/sha1/t_shs3.c) Property changes on: trunk/src/lib/crypto/crypto_tests/t_shs3.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.2 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/t_verify.c (from rev 22475, trunk/src/lib/crypto/des/t_verify.c) Property changes on: trunk/src/lib/crypto/crypto_tests/t_verify.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.10 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/test/Readme.txt (from rev 22475, trunk/src/lib/crypto/aes/test/Readme.txt) Property changes on: trunk/src/lib/crypto/crypto_tests/test/Readme.txt ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/plain Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/test/cbc_d_m.txt (from rev 22475, trunk/src/lib/crypto/aes/test/cbc_d_m.txt) Property changes on: trunk/src/lib/crypto/crypto_tests/test/cbc_d_m.txt ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/plain Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/test/cbc_e_m.txt (from rev 22475, trunk/src/lib/crypto/aes/test/cbc_e_m.txt) Property changes on: trunk/src/lib/crypto/crypto_tests/test/cbc_e_m.txt ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/plain Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/test/ecb_d_m.txt (from rev 22475, trunk/src/lib/crypto/aes/test/ecb_d_m.txt) Property changes on: trunk/src/lib/crypto/crypto_tests/test/ecb_d_m.txt ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/plain Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/test/ecb_e_m.txt (from rev 22475, trunk/src/lib/crypto/aes/test/ecb_e_m.txt) Property changes on: trunk/src/lib/crypto/crypto_tests/test/ecb_e_m.txt ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/plain Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/test/ecb_iv.readme (from rev 22475, trunk/src/lib/crypto/aes/test/ecb_iv.readme) Property changes on: trunk/src/lib/crypto/crypto_tests/test/ecb_iv.readme ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/test/ecb_iv.txt (from rev 22475, trunk/src/lib/crypto/aes/test/ecb_iv.txt) Property changes on: trunk/src/lib/crypto/crypto_tests/test/ecb_iv.txt ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/plain Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/test/ecb_tbl.txt (from rev 22475, trunk/src/lib/crypto/aes/test/ecb_tbl.txt) Property changes on: trunk/src/lib/crypto/crypto_tests/test/ecb_tbl.txt ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/plain Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/test/ecb_vk.txt (from rev 22475, trunk/src/lib/crypto/aes/test/ecb_vk.txt) Property changes on: trunk/src/lib/crypto/crypto_tests/test/ecb_vk.txt ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/plain Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/test/ecb_vt.txt (from rev 22475, trunk/src/lib/crypto/aes/test/ecb_vt.txt) Property changes on: trunk/src/lib/crypto/crypto_tests/test/ecb_vt.txt ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/plain Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/test/katmct.pdf (from rev 22475, trunk/src/lib/crypto/aes/test/katmct.pdf) Property changes on: trunk/src/lib/crypto/crypto_tests/test/katmct.pdf ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + application/pdf Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/crypto_tests/vb.txt (from rev 22475, trunk/src/lib/crypto/aes/vb.txt) Property changes on: trunk/src/lib/crypto/crypto_tests/vb.txt ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/plain Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/vectors.c (from rev 22475, trunk/src/lib/crypto/vectors.c) Property changes on: trunk/src/lib/crypto/crypto_tests/vectors.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.5 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/crypto_tests/ytest.c (from rev 22475, trunk/src/lib/crypto/yarrow/ytest.c) Property changes on: trunk/src/lib/crypto/crypto_tests/ytest.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.2 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Property changes on: trunk/src/lib/crypto/krb/aead.c ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/krb/aead.h (from rev 22475, trunk/src/lib/crypto/aead.h) Property changes on: trunk/src/lib/crypto/krb/aead.h ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/krb/block_size.c (from rev 22475, trunk/src/lib/crypto/block_size.c) Property changes on: trunk/src/lib/crypto/krb/block_size.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.4 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/cf2.c (from rev 22475, trunk/src/lib/crypto/cf2.c) Property changes on: trunk/src/lib/crypto/krb/cf2.c ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/krb/checksum_length.c (from rev 22475, trunk/src/lib/crypto/checksum_length.c) Property changes on: trunk/src/lib/crypto/krb/checksum_length.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.6 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/cksumtype_to_string.c (from rev 22475, trunk/src/lib/crypto/cksumtype_to_string.c) Property changes on: trunk/src/lib/crypto/krb/cksumtype_to_string.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.4 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/cksumtypes.c (from rev 22475, trunk/src/lib/crypto/cksumtypes.c) Property changes on: trunk/src/lib/crypto/krb/cksumtypes.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.7 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/cksumtypes.h (from rev 22475, trunk/src/lib/crypto/cksumtypes.h) Property changes on: trunk/src/lib/crypto/krb/cksumtypes.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.2 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/coll_proof_cksum.c (from rev 22475, trunk/src/lib/crypto/coll_proof_cksum.c) Property changes on: trunk/src/lib/crypto/krb/coll_proof_cksum.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.5 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/combine_keys.c (from rev 22475, trunk/src/lib/crypto/combine_keys.c) Property changes on: trunk/src/lib/crypto/krb/combine_keys.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.5 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/crc32/CRC.pm (from rev 22475, trunk/src/lib/crypto/crc32/CRC.pm) Property changes on: trunk/src/lib/crypto/krb/crc32/CRC.pm ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.1 Name: svn:mime-type + text/x-perl Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/crc32/Makefile.in (from rev 22475, trunk/src/lib/crypto/crc32/Makefile.in) =================================================================== --- trunk/src/lib/crypto/crc32/Makefile.in 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/krb/crc32/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,34 @@ +thisconfigdir=../../../.. +myfulldir=lib/crypto/krb/crc32 +mydir=lib/crypto/krb/crc32 +BUILDTOP=$(REL)..$(S)..$(S)..$(S).. +DEFS= + +##DOS##BUILDTOP = ..\..\..\.. +##DOS##PREFIXDIR=crc32 +##DOS##OBJFILE=..\$(OUTPRE)crc32.lst + +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + + +STLIBOBJS= crc32.o + +OBJS= $(OUTPRE)crc32.$(OBJEXT) + +SRCS= $(srcdir)/crc32.c + +##DOS##LIBOBJS = $(OBJS) + +all-unix:: all-libobjs + +includes:: depend + +depend:: $(SRCS) + +clean-unix:: clean-libobjs + +check-unix:: + + at libobj_frag@ + Property changes on: trunk/src/lib/crypto/krb/crc32/Makefile.in ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.43 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/crc32/Poly.pm (from rev 22475, trunk/src/lib/crypto/crc32/Poly.pm) Property changes on: trunk/src/lib/crypto/krb/crc32/Poly.pm ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.1 Name: svn:mime-type + text/x-perl Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/crc32/crc-32.h (from rev 22475, trunk/src/lib/crypto/crc32/crc-32.h) Property changes on: trunk/src/lib/crypto/krb/crc32/crc-32.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.7 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/crc32/crc.pl (from rev 22475, trunk/src/lib/crypto/crc32/crc.pl) Property changes on: trunk/src/lib/crypto/krb/crc32/crc.pl ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.1 Name: svn:mime-type + text/x-perl Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/crc32/crc32.c (from rev 22475, trunk/src/lib/crypto/crc32/crc32.c) Property changes on: trunk/src/lib/crypto/krb/crc32/crc32.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.5 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/crc32/deps (from rev 22475, trunk/src/lib/crypto/crc32/deps) =================================================================== --- trunk/src/lib/crypto/crc32/deps 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/krb/crc32/deps 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,13 @@ +# +# Generated makefile dependencies follow. +# +crc32.so crc32.po $(OUTPRE)crc32.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h crc-32.h crc32.c Property changes on: trunk/src/lib/crypto/krb/crc32/deps ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/krb/crypto_length.c (from rev 22475, trunk/src/lib/crypto/crypto_length.c) Property changes on: trunk/src/lib/crypto/krb/crypto_length.c ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/krb/crypto_libinit.c (from rev 22475, trunk/src/lib/crypto/crypto_libinit.c) Property changes on: trunk/src/lib/crypto/krb/crypto_libinit.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.6 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/decrypt.c (from rev 22475, trunk/src/lib/crypto/decrypt.c) Property changes on: trunk/src/lib/crypto/krb/decrypt.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.4 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/decrypt_iov.c (from rev 22475, trunk/src/lib/crypto/decrypt_iov.c) Property changes on: trunk/src/lib/crypto/krb/decrypt_iov.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.19 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/default_state.c (from rev 22475, trunk/src/lib/crypto/default_state.c) Property changes on: trunk/src/lib/crypto/krb/default_state.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.1 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Property changes on: trunk/src/lib/crypto/krb/dk/Makefile.in ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.22 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/dk/checksum.c (from rev 22475, trunk/src/lib/crypto/dk/checksum.c) Property changes on: trunk/src/lib/crypto/krb/dk/checksum.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.10 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/dk/deps (from rev 22475, trunk/src/lib/crypto/dk/deps) =================================================================== --- trunk/src/lib/crypto/dk/deps 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/krb/dk/deps 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,79 @@ +# +# Generated makefile dependencies follow. +# +checksum.so checksum.po $(OUTPRE)checksum.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../aead.h $(srcdir)/../cksumtypes.h $(srcdir)/../etypes.h \ + checksum.c dk.h +dk_aead.so dk_aead.po $(OUTPRE)dk_aead.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../aead.h \ + $(srcdir)/../cksumtypes.h dk.h dk_aead.c +dk_decrypt.so dk_decrypt.po $(OUTPRE)dk_decrypt.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + dk.h dk_decrypt.c +dk_encrypt.so dk_encrypt.po $(OUTPRE)dk_encrypt.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + dk.h dk_encrypt.c +dk_prf.so dk_prf.po $(OUTPRE)dk_prf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h dk.h dk_prf.c +derive.so derive.po $(OUTPRE)derive.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h derive.c dk.h +stringtokey.so stringtokey.po $(OUTPRE)stringtokey.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + dk.h stringtokey.c Property changes on: trunk/src/lib/crypto/krb/dk/deps ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/krb/dk/derive.c (from rev 22475, trunk/src/lib/crypto/dk/derive.c) Property changes on: trunk/src/lib/crypto/krb/dk/derive.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.8 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/dk/dk.h (from rev 22475, trunk/src/lib/crypto/dk/dk.h) Property changes on: trunk/src/lib/crypto/krb/dk/dk.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.10 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/dk/dk_aead.c (from rev 22475, trunk/src/lib/crypto/dk/dk_aead.c) Property changes on: trunk/src/lib/crypto/krb/dk/dk_aead.c ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/krb/dk/dk_decrypt.c (from rev 22475, trunk/src/lib/crypto/dk/dk_decrypt.c) Property changes on: trunk/src/lib/crypto/krb/dk/dk_decrypt.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.11 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/dk/dk_encrypt.c (from rev 22475, trunk/src/lib/crypto/dk/dk_encrypt.c) Property changes on: trunk/src/lib/crypto/krb/dk/dk_encrypt.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.12 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/dk/dk_prf.c (from rev 22475, trunk/src/lib/crypto/dk/dk_prf.c) Property changes on: trunk/src/lib/crypto/krb/dk/dk_prf.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/dk/stringtokey.c (from rev 22475, trunk/src/lib/crypto/dk/stringtokey.c) Property changes on: trunk/src/lib/crypto/krb/dk/stringtokey.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.9 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/enc_provider/Makefile.in (from rev 22475, trunk/src/lib/crypto/enc_provider/Makefile.in) =================================================================== --- trunk/src/lib/crypto/enc_provider/Makefile.in 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/krb/enc_provider/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,41 @@ +thisconfigdir=../../../.. +myfulldir=lib/crypto/krb/enc_provider +mydir=lib/crypto/krb/enc_provider +BUILDTOP=$(REL)..$(S)..$(S)..$(S).. +LOCALINCLUDES = -I$(srcdir)/../../@CRYPTO_IMPL@/des -I$(srcdir)/../../@CRYPTO_IMPL@/arcfour \ + -I$(srcdir)/../../@CRYPTO_IMPL@/aes -I$(srcdir)/.. -I$(srcdir)/../../@CRYPTO_IMPL@ +DEFS= + +##DOS##BUILDTOP = ..\..\..\.. +##DOS##PREFIXDIR=enc_provider +##DOS##OBJFILE=..\$(OUTPRE)enc_prov.lst + +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + +STLIBOBJS= des.o des3.o rc4.o aes.o + +OBJS= \ + $(OUTPRE)des.$(OBJEXT) \ + $(OUTPRE)des3.$(OBJEXT) \ + $(OUTPRE)aes.$(OBJEXT) \ + $(OUTPRE)rc4.$(OBJEXT) + +SRCS= \ + $(srcdir)/des.c \ + $(srcdir)/des3.c \ + $(srcdir)/aes.c \ + $(srcdir)/rc4.c + +##DOS##LIBOBJS = $(OBJS) + +all-unix:: all-libobjs + +includes:: depend + +depend:: $(SRCS) + +clean-unix:: clean-libobjs + + at libobj_frag@ + Property changes on: trunk/src/lib/crypto/krb/enc_provider/Makefile.in ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.26 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/enc_provider/aes.c (from rev 22475, trunk/src/lib/crypto/enc_provider/aes.c) Property changes on: trunk/src/lib/crypto/krb/enc_provider/aes.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.6 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/enc_provider/deps (from rev 22475, trunk/src/lib/crypto/enc_provider/deps) =================================================================== --- trunk/src/lib/crypto/enc_provider/deps 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/krb/enc_provider/deps 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,50 @@ +# +# Generated makefile dependencies follow. +# +des.so des.po $(OUTPRE)des.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/des/des_int.h \ + $(srcdir)/../aead.h $(srcdir)/../cksumtypes.h des.c \ + enc_provider.h +des3.so des3.po $(OUTPRE)des3.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/des/des_int.h \ + $(srcdir)/../aead.h $(srcdir)/../cksumtypes.h des3.c +aes.so aes.po $(OUTPRE)aes.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/aes/aes.h \ + $(srcdir)/../../builtin/aes/uitypes.h $(srcdir)/../aead.h \ + $(srcdir)/../cksumtypes.h aes.c enc_provider.h +rc4.so rc4.po $(OUTPRE)rc4.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/arcfour/arcfour-int.h \ + $(srcdir)/../../builtin/arcfour/arcfour.h $(srcdir)/../aead.h \ + $(srcdir)/../cksumtypes.h enc_provider.h rc4.c Property changes on: trunk/src/lib/crypto/krb/enc_provider/deps ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/krb/enc_provider/des.c (from rev 22475, trunk/src/lib/crypto/enc_provider/des.c) Property changes on: trunk/src/lib/crypto/krb/enc_provider/des.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.11 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/enc_provider/des3.c (from rev 22475, trunk/src/lib/crypto/enc_provider/des3.c) Property changes on: trunk/src/lib/crypto/krb/enc_provider/des3.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.12 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/enc_provider/enc_provider.h (from rev 22475, trunk/src/lib/crypto/enc_provider/enc_provider.h) Property changes on: trunk/src/lib/crypto/krb/enc_provider/enc_provider.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.6 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/enc_provider/rc4.c (from rev 22475, trunk/src/lib/crypto/enc_provider/rc4.c) Property changes on: trunk/src/lib/crypto/krb/enc_provider/rc4.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/encrypt.c (from rev 22475, trunk/src/lib/crypto/encrypt.c) Property changes on: trunk/src/lib/crypto/krb/encrypt.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.4 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/encrypt_iov.c (from rev 22475, trunk/src/lib/crypto/encrypt_iov.c) Property changes on: trunk/src/lib/crypto/krb/encrypt_iov.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.19 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/encrypt_length.c (from rev 22475, trunk/src/lib/crypto/encrypt_length.c) Property changes on: trunk/src/lib/crypto/krb/encrypt_length.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.3 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/enctype_compare.c (from rev 22475, trunk/src/lib/crypto/enctype_compare.c) Property changes on: trunk/src/lib/crypto/krb/enctype_compare.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.4 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/enctype_to_string.c (from rev 22475, trunk/src/lib/crypto/enctype_to_string.c) Property changes on: trunk/src/lib/crypto/krb/enctype_to_string.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.4 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/etypes.c (from rev 22475, trunk/src/lib/crypto/etypes.c) Property changes on: trunk/src/lib/crypto/krb/etypes.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.14 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/etypes.h (from rev 22475, trunk/src/lib/crypto/etypes.h) Property changes on: trunk/src/lib/crypto/krb/etypes.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.2 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/hash_provider/Makefile.in (from rev 22475, trunk/src/lib/crypto/hash_provider/Makefile.in) =================================================================== --- trunk/src/lib/crypto/hash_provider/Makefile.in 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/krb/hash_provider/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,35 @@ +thisconfigdir=../../../.. +myfulldir=lib/crypto/krb/hash_provider +mydir=lib/crypto/krb/hash_provider +BUILDTOP=$(REL)..$(S)..$(S)..$(S).. +LOCALINCLUDES = -I$(srcdir)/../crc32 -I$(srcdir)/../../@CRYPTO_IMPL@/md4 \ + -I$(srcdir)/../../@CRYPTO_IMPL@/md5 -I$(srcdir)/../../@CRYPTO_IMPL@/sha1 +DEFS= + +##DOS##BUILDTOP = ..\..\..\.. +##DOS##PREFIXDIR=hash_provider +##DOS##OBJFILE=..\$(OUTPRE)hash_pro.lst + +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + +STLIBOBJS= hash_crc32.o hash_md4.o hash_md5.o hash_sha1.o + +OBJS= $(OUTPRE)hash_crc32.$(OBJEXT) $(OUTPRE)hash_md4.$(OBJEXT) \ + $(OUTPRE)hash_md5.$(OBJEXT) $(OUTPRE)hash_sha1.$(OBJEXT) + +SRCS= $(srcdir)/hash_crc32.c $(srcdir)/hash_md4.c \ + $(srcdir)/hash_md5.c $(srcdir)/hash_sha1.c + +##DOS##LIBOBJS = $(OBJS) + +all-unix:: all-libobjs + +includes:: depend + +depend:: $(SRCS) + +clean-unix:: clean-libobjs + + at libobj_frag@ + Property changes on: trunk/src/lib/crypto/krb/hash_provider/Makefile.in ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.21 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/hash_provider/deps (from rev 22475, trunk/src/lib/crypto/hash_provider/deps) =================================================================== --- trunk/src/lib/crypto/hash_provider/deps 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/krb/hash_provider/deps 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,48 @@ +# +# Generated makefile dependencies follow. +# +hash_crc32.so hash_crc32.po $(OUTPRE)hash_crc32.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../crc32/crc-32.h hash_crc32.c hash_provider.h +hash_md4.so hash_md4.po $(OUTPRE)hash_md4.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../../builtin/md4/rsa-md4.h hash_md4.c hash_provider.h +hash_md5.so hash_md5.po $(OUTPRE)hash_md5.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../../builtin/md5/rsa-md5.h hash_md5.c hash_provider.h +hash_sha1.so hash_sha1.po $(OUTPRE)hash_sha1.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../../builtin/sha1/shs.h hash_provider.h \ + hash_sha1.c Property changes on: trunk/src/lib/crypto/krb/hash_provider/deps ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/krb/hash_provider/hash_crc32.c (from rev 22475, trunk/src/lib/crypto/hash_provider/hash_crc32.c) Property changes on: trunk/src/lib/crypto/krb/hash_provider/hash_crc32.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.5 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/hash_provider/hash_md4.c (from rev 22475, trunk/src/lib/crypto/hash_provider/hash_md4.c) Property changes on: trunk/src/lib/crypto/krb/hash_provider/hash_md4.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.6 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/hash_provider/hash_md5.c (from rev 22475, trunk/src/lib/crypto/hash_provider/hash_md5.c) Property changes on: trunk/src/lib/crypto/krb/hash_provider/hash_md5.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.6 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/hash_provider/hash_provider.h (from rev 22475, trunk/src/lib/crypto/hash_provider/hash_provider.h) Property changes on: trunk/src/lib/crypto/krb/hash_provider/hash_provider.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.4 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/hash_provider/hash_sha1.c (from rev 22475, trunk/src/lib/crypto/hash_provider/hash_sha1.c) Property changes on: trunk/src/lib/crypto/krb/hash_provider/hash_sha1.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.6 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/keyblocks.c (from rev 22475, trunk/src/lib/crypto/keyblocks.c) Property changes on: trunk/src/lib/crypto/krb/keyblocks.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.2 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/keyed_checksum_types.c (from rev 22475, trunk/src/lib/crypto/keyed_checksum_types.c) Property changes on: trunk/src/lib/crypto/krb/keyed_checksum_types.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.5 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/keyed_cksum.c (from rev 22475, trunk/src/lib/crypto/keyed_cksum.c) Property changes on: trunk/src/lib/crypto/krb/keyed_cksum.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.7 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/keyhash_provider/Makefile.in (from rev 22475, trunk/src/lib/crypto/keyhash_provider/Makefile.in) =================================================================== --- trunk/src/lib/crypto/keyhash_provider/Makefile.in 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/krb/keyhash_provider/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,34 @@ +thisconfigdir=../../../.. +myfulldir=lib/crypto/krb/keyhash_provider +mydir=lib/crypto/krb/keyhash_provider +BUILDTOP=$(REL)..$(S)..$(S)..$(S).. +LOCALINCLUDES = -I$(srcdir)/../../@CRYPTO_IMPL@/des -I$(srcdir)/../../@CRYPTO_IMPL@/md4 \ + -I$(srcdir)/../../@CRYPTO_IMPL@/md5 -I$(srcdir)/../../@CRYPTO_IMPL@/arcfour \ + -I$(srcdir)/../hash_provider +DEFS= + +##DOS##BUILDTOP = ..\..\..\.. +##DOS##PREFIXDIR=keyhash_provider +##DOS##OBJFILE=..\$(OUTPRE)kh_pro.lst + +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + +STLIBOBJS= descbc.o k5_md4des.o k5_md5des.o hmac_md5.o md5_hmac.o + +OBJS= $(OUTPRE)descbc.$(OBJEXT) $(OUTPRE)k5_md4des.$(OBJEXT) $(OUTPRE)k5_md5des.$(OBJEXT) $(OUTPRE)hmac_md5.$(OBJEXT) $(OUTPRE)md5_hmac.$(OBJEXT) + +SRCS= $(srcdir)/descbc.c $(srcdir)/k5_md4des.c $(srcdir)/k5_md5des.c $(srcdir)/hmac_md5.c $(srcdir)/md5_hmac.c + +##DOS##LIBOBJS = $(OBJS) + +all-unix:: all-libobjs + +includes:: depend + +depend:: $(SRCS) + +clean-unix:: clean-libobjs + + at libobj_frag@ + Property changes on: trunk/src/lib/crypto/krb/keyhash_provider/Makefile.in ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.31 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/keyhash_provider/deps (from rev 22475, trunk/src/lib/crypto/keyhash_provider/deps) =================================================================== --- trunk/src/lib/crypto/keyhash_provider/deps 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/krb/keyhash_provider/deps 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,65 @@ +# +# Generated makefile dependencies follow. +# +descbc.so descbc.po $(OUTPRE)descbc.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/des/des_int.h \ + descbc.c keyhash_provider.h +k5_md4des.so k5_md4des.po $(OUTPRE)k5_md4des.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../../builtin/des/des_int.h $(srcdir)/../../builtin/md4/rsa-md4.h \ + k5_md4des.c keyhash_provider.h +k5_md5des.so k5_md5des.po $(OUTPRE)k5_md5des.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../../builtin/des/des_int.h $(srcdir)/../../builtin/md5/rsa-md5.h \ + k5_md5des.c keyhash_provider.h +hmac_md5.so hmac_md5.po $(OUTPRE)hmac_md5.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../../builtin/arcfour/arcfour-int.h $(srcdir)/../../builtin/arcfour/arcfour.h \ + $(srcdir)/../../builtin/md5/rsa-md5.h $(srcdir)/../aead.h \ + $(srcdir)/../cksumtypes.h $(srcdir)/../hash_provider/hash_provider.h \ + hmac_md5.c keyhash_provider.h +md5_hmac.so md5_hmac.po $(OUTPRE)md5_hmac.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../../builtin/arcfour/arcfour-int.h $(srcdir)/../../builtin/arcfour/arcfour.h \ + $(srcdir)/../../builtin/md5/rsa-md5.h $(srcdir)/../hash_provider/hash_provider.h \ + keyhash_provider.h md5_hmac.c Property changes on: trunk/src/lib/crypto/krb/keyhash_provider/deps ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/krb/keyhash_provider/descbc.c (from rev 22475, trunk/src/lib/crypto/keyhash_provider/descbc.c) Property changes on: trunk/src/lib/crypto/krb/keyhash_provider/descbc.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.10 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/keyhash_provider/hmac_md5.c (from rev 22475, trunk/src/lib/crypto/keyhash_provider/hmac_md5.c) Property changes on: trunk/src/lib/crypto/krb/keyhash_provider/hmac_md5.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.3 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/keyhash_provider/k5_md4des.c (from rev 22475, trunk/src/lib/crypto/keyhash_provider/k5_md4des.c) Property changes on: trunk/src/lib/crypto/krb/keyhash_provider/k5_md4des.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.11 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/keyhash_provider/k5_md5des.c (from rev 22475, trunk/src/lib/crypto/keyhash_provider/k5_md5des.c) Property changes on: trunk/src/lib/crypto/krb/keyhash_provider/k5_md5des.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.11 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/keyhash_provider/keyhash_provider.h (from rev 22475, trunk/src/lib/crypto/keyhash_provider/keyhash_provider.h) Property changes on: trunk/src/lib/crypto/krb/keyhash_provider/keyhash_provider.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.5 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/keyhash_provider/md5_hmac.c (from rev 22475, trunk/src/lib/crypto/keyhash_provider/md5_hmac.c) Property changes on: trunk/src/lib/crypto/krb/keyhash_provider/md5_hmac.c ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/krb/keylengths.c (from rev 22475, trunk/src/lib/crypto/keylengths.c) Property changes on: trunk/src/lib/crypto/krb/keylengths.c ___________________________________________________________________ Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/make_checksum.c (from rev 22475, trunk/src/lib/crypto/make_checksum.c) Property changes on: trunk/src/lib/crypto/krb/make_checksum.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.13 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/make_checksum_iov.c (from rev 22475, trunk/src/lib/crypto/make_checksum_iov.c) Property changes on: trunk/src/lib/crypto/krb/make_checksum_iov.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.22 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/make_random_key.c (from rev 22475, trunk/src/lib/crypto/make_random_key.c) Property changes on: trunk/src/lib/crypto/krb/make_random_key.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.7 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/mandatory_sumtype.c (from rev 22475, trunk/src/lib/crypto/mandatory_sumtype.c) Property changes on: trunk/src/lib/crypto/krb/mandatory_sumtype.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.1 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/nfold.c (from rev 22475, trunk/src/lib/crypto/nfold.c) Property changes on: trunk/src/lib/crypto/krb/nfold.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.6 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/old/Makefile.in (from rev 22475, trunk/src/lib/crypto/old/Makefile.in) =================================================================== --- trunk/src/lib/crypto/old/Makefile.in 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/krb/old/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,35 @@ +thisconfigdir=../../../.. +myfulldir=lib/crypto/krb/old +mydir=lib/crypto/krb/old +BUILDTOP=$(REL)..$(S)..$(S)..$(S).. +LOCALINCLUDES = -I$(srcdir)/../../@CRYPTO_IMPL@/des -I$(srcdir) +DEFS= + +##DOS##BUILDTOP = ..\..\.. +##DOS##PREFIXDIR=old +##DOS##OBJFILE=..\$(OUTPRE)old.lst + +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + +RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf + +STLIBOBJS= old_decrypt.o old_encrypt.o des_stringtokey.o + +OBJS= $(OUTPRE)des_stringtokey.$(OBJEXT) $(OUTPRE)old_decrypt.$(OBJEXT) $(OUTPRE)old_encrypt.$(OBJEXT) + +SRCS= $(srcdir)/des_stringtokey.c $(srcdir)/old_decrypt.c \ + $(srcdir)/old_encrypt.c + +##DOS##LIBOBJS = $(OBJS) + +all-unix:: all-libobjs + +includes:: depend + +depend:: $(SRCS) + +clean-unix:: clean-libobjs + + at libobj_frag@ + Property changes on: trunk/src/lib/crypto/krb/old/Makefile.in ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.22 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/old/deps (from rev 22475, trunk/src/lib/crypto/old/deps) =================================================================== --- trunk/src/lib/crypto/old/deps 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/krb/old/deps 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,37 @@ +# +# Generated makefile dependencies follow. +# +des_stringtokey.so des_stringtokey.po $(OUTPRE)des_stringtokey.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../../builtin/des/des_int.h des_stringtokey.c \ + old.h +old_decrypt.so old_decrypt.po $(OUTPRE)old_decrypt.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + old.h old_decrypt.c +old_encrypt.so old_encrypt.po $(OUTPRE)old_encrypt.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + old.h old_encrypt.c Property changes on: trunk/src/lib/crypto/krb/old/deps ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/krb/old/des_stringtokey.c (from rev 22475, trunk/src/lib/crypto/old/des_stringtokey.c) Property changes on: trunk/src/lib/crypto/krb/old/des_stringtokey.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.11 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/old/old.h (from rev 22475, trunk/src/lib/crypto/old/old.h) Property changes on: trunk/src/lib/crypto/krb/old/old.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.5 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/old/old_decrypt.c (from rev 22475, trunk/src/lib/crypto/old/old_decrypt.c) Property changes on: trunk/src/lib/crypto/krb/old/old_decrypt.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.10 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/old/old_encrypt.c (from rev 22475, trunk/src/lib/crypto/old/old_encrypt.c) Property changes on: trunk/src/lib/crypto/krb/old/old_encrypt.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.7 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/old_api_glue.c (from rev 22475, trunk/src/lib/crypto/old_api_glue.c) Property changes on: trunk/src/lib/crypto/krb/old_api_glue.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.10 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/prf.c (from rev 22475, trunk/src/lib/crypto/prf.c) Property changes on: trunk/src/lib/crypto/krb/prf.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.1 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/prng.c (from rev 22475, trunk/src/lib/crypto/prng.c) Property changes on: trunk/src/lib/crypto/krb/prng.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.24 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/random_to_key.c (from rev 22475, trunk/src/lib/crypto/random_to_key.c) Property changes on: trunk/src/lib/crypto/krb/random_to_key.c ___________________________________________________________________ Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/raw/Makefile.in (from rev 22475, trunk/src/lib/crypto/raw/Makefile.in) =================================================================== --- trunk/src/lib/crypto/raw/Makefile.in 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/krb/raw/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,34 @@ +thisconfigdir=../../../.. +myfulldir=lib/crypto/krb/raw +mydir=lib/crypto/krb/raw +BUILDTOP=$(REL)..$(S)..$(S)..$(S).. +LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../@CRYPTO_IMPL@ +DEFS= + +##DOS##BUILDTOP = ..\..\.. +##DOS##PREFIXDIR=raw +##DOS##OBJFILE=..\$(OUTPRE)raw.lst + +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + +RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf + +STLIBOBJS= raw_decrypt.o raw_encrypt.o raw_aead.o + +OBJS= $(OUTPRE)raw_decrypt.$(OBJEXT) $(OUTPRE)raw_encrypt.$(OBJEXT) $(OUTPRE)raw_aead.$(OBJEXT) + +SRCS= $(srcdir)/raw_decrypt.c $(srcdir)/raw_encrypt.c $(srcdir)/raw_aead.c + +##DOS##LIBOBJS = $(OBJS) + +all-unix:: all-libobjs + +includes:: depend + +depend:: $(SRCS) + +clean-unix:: clean-libobjs + + at libobj_frag@ + Property changes on: trunk/src/lib/crypto/krb/raw/Makefile.in ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.20 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/raw/deps (from rev 22475, trunk/src/lib/crypto/raw/deps) =================================================================== --- trunk/src/lib/crypto/raw/deps 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/krb/raw/deps 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,37 @@ +# +# Generated makefile dependencies follow. +# +raw_decrypt.so raw_decrypt.po $(OUTPRE)raw_decrypt.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + raw.h raw_decrypt.c +raw_encrypt.so raw_encrypt.po $(OUTPRE)raw_encrypt.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + raw.h raw_encrypt.c +raw_aead.so raw_aead.po $(OUTPRE)raw_aead.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../aead.h $(srcdir)/../cksumtypes.h raw.h \ + raw_aead.c Property changes on: trunk/src/lib/crypto/krb/raw/deps ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/krb/raw/raw.h (from rev 22475, trunk/src/lib/crypto/raw/raw.h) Property changes on: trunk/src/lib/crypto/krb/raw/raw.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.4 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/raw/raw_aead.c (from rev 22475, trunk/src/lib/crypto/raw/raw_aead.c) Property changes on: trunk/src/lib/crypto/krb/raw/raw_aead.c ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/krb/raw/raw_decrypt.c (from rev 22475, trunk/src/lib/crypto/raw/raw_decrypt.c) Property changes on: trunk/src/lib/crypto/krb/raw/raw_decrypt.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.3 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/raw/raw_encrypt.c (from rev 22475, trunk/src/lib/crypto/raw/raw_encrypt.c) Property changes on: trunk/src/lib/crypto/krb/raw/raw_encrypt.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.4 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/state.c (from rev 22475, trunk/src/lib/crypto/state.c) Property changes on: trunk/src/lib/crypto/krb/state.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.2 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/string_to_cksumtype.c (from rev 22475, trunk/src/lib/crypto/string_to_cksumtype.c) Property changes on: trunk/src/lib/crypto/krb/string_to_cksumtype.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.4 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/string_to_enctype.c (from rev 22475, trunk/src/lib/crypto/string_to_enctype.c) Property changes on: trunk/src/lib/crypto/krb/string_to_enctype.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.4 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/string_to_key.c (from rev 22475, trunk/src/lib/crypto/string_to_key.c) Property changes on: trunk/src/lib/crypto/krb/string_to_key.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.10 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/valid_cksumtype.c (from rev 22475, trunk/src/lib/crypto/valid_cksumtype.c) Property changes on: trunk/src/lib/crypto/krb/valid_cksumtype.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.5 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/valid_enctype.c (from rev 22475, trunk/src/lib/crypto/valid_enctype.c) Property changes on: trunk/src/lib/crypto/krb/valid_enctype.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.5 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/verify_checksum.c (from rev 22475, trunk/src/lib/crypto/verify_checksum.c) Property changes on: trunk/src/lib/crypto/krb/verify_checksum.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 5.8 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/verify_checksum_iov.c (from rev 22475, trunk/src/lib/crypto/verify_checksum_iov.c) Property changes on: trunk/src/lib/crypto/krb/verify_checksum_iov.c ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/krb/yarrow/ASSUMPTIONS (from rev 22475, trunk/src/lib/crypto/yarrow/ASSUMPTIONS) Property changes on: trunk/src/lib/crypto/krb/yarrow/ASSUMPTIONS ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/yarrow/LICENSE (from rev 22475, trunk/src/lib/crypto/yarrow/LICENSE) Property changes on: trunk/src/lib/crypto/krb/yarrow/LICENSE ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/yarrow/Makefile.in (from rev 22475, trunk/src/lib/crypto/yarrow/Makefile.in) =================================================================== --- trunk/src/lib/crypto/yarrow/Makefile.in 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/krb/yarrow/Makefile.in 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,37 @@ +thisconfigdir=../../../.. +myfulldir=lib/crypto/krb/yarrow +mydir=lib/crypto/krb/yarrow +BUILDTOP=$(REL)..$(S)..$(S)..$(S).. +LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../@CRYPTO_IMPL@ -I$(srcdir)/../../@CRYPTO_IMPL@/sha1 -I$(srcdir)/../enc_provider +DEFS= + +##DOS##BUILDTOP = ..\..\..\.. +##DOS##PREFIXDIR=yarrow +##DOS##OBJFILE=..\$(OUTPRE)yarrow.lst + +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + +STLIBOBJS=\ + yarrow.o \ + ycipher.o +OBJS=\ + $(OUTPRE)yarrow.$(OBJEXT) \ + $(OUTPRE)ycipher.$(OBJEXT) + +SRCS=\ + $(srcdir)/yarrow.c \ + $(srcdir)/ycipher.c + +##DOS##LIBOBJS = $(OBJS) + +all-unix:: all-libobjs + +includes:: depend + +depend:: $(SRCS) + +clean-unix:: clean-libobjs + + at libobj_frag@ + Property changes on: trunk/src/lib/crypto/krb/yarrow/Makefile.in ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.14 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/yarrow/README (from rev 22475, trunk/src/lib/crypto/yarrow/README) Property changes on: trunk/src/lib/crypto/krb/yarrow/README ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/yarrow/TODO (from rev 22475, trunk/src/lib/crypto/yarrow/TODO) Property changes on: trunk/src/lib/crypto/krb/yarrow/TODO ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/yarrow/deps (from rev 22475, trunk/src/lib/crypto/yarrow/deps) =================================================================== --- trunk/src/lib/crypto/yarrow/deps 2009-07-30 19:06:37 UTC (rev 22475) +++ trunk/src/lib/crypto/krb/yarrow/deps 2009-08-03 14:19:16 UTC (rev 22477) @@ -0,0 +1,27 @@ +# +# Generated makefile dependencies follow. +# +yarrow.so yarrow.po $(OUTPRE)yarrow.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/sha1/shs.h \ + yarrow.c yarrow.h ycipher.h yexcep.h yhash.h ylock.h \ + ystate.h ytypes.h +ycipher.so ycipher.po $(OUTPRE)ycipher.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/sha1/shs.h \ + $(srcdir)/../enc_provider/enc_provider.h yarrow.h ycipher.c \ + ycipher.h yhash.h ytypes.h Property changes on: trunk/src/lib/crypto/krb/yarrow/deps ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/lib/crypto/krb/yarrow/yarrow.c (from rev 22475, trunk/src/lib/crypto/yarrow/yarrow.c) Property changes on: trunk/src/lib/crypto/krb/yarrow/yarrow.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.16 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/yarrow/yarrow.h (from rev 22475, trunk/src/lib/crypto/yarrow/yarrow.h) Property changes on: trunk/src/lib/crypto/krb/yarrow/yarrow.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.4 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/yarrow/yarrow.man (from rev 22475, trunk/src/lib/crypto/yarrow/yarrow.man) Property changes on: trunk/src/lib/crypto/krb/yarrow/yarrow.man ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + application/x-troff-man Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/yarrow/yarrow.pod (from rev 22475, trunk/src/lib/crypto/yarrow/yarrow.pod) Property changes on: trunk/src/lib/crypto/krb/yarrow/yarrow.pod ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/yarrow/ycipher.c (from rev 22475, trunk/src/lib/crypto/yarrow/ycipher.c) Property changes on: trunk/src/lib/crypto/krb/yarrow/ycipher.c ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.5 Name: svn:mime-type + text/x-csrc Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/yarrow/ycipher.h (from rev 22475, trunk/src/lib/crypto/yarrow/ycipher.h) Property changes on: trunk/src/lib/crypto/krb/yarrow/ycipher.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.5 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/yarrow/yexcep.h (from rev 22475, trunk/src/lib/crypto/yarrow/yexcep.h) Property changes on: trunk/src/lib/crypto/krb/yarrow/yexcep.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/yarrow/yhash.h (from rev 22475, trunk/src/lib/crypto/yarrow/yhash.h) Property changes on: trunk/src/lib/crypto/krb/yarrow/yhash.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.5 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/yarrow/ylock.h (from rev 22475, trunk/src/lib/crypto/yarrow/ylock.h) Property changes on: trunk/src/lib/crypto/krb/yarrow/ylock.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.4 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/yarrow/ystate.h (from rev 22475, trunk/src/lib/crypto/yarrow/ystate.h) Property changes on: trunk/src/lib/crypto/krb/yarrow/ystate.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.1 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: trunk/src/lib/crypto/krb/yarrow/ytypes.h (from rev 22475, trunk/src/lib/crypto/yarrow/ytypes.h) Property changes on: trunk/src/lib/crypto/krb/yarrow/ytypes.h ___________________________________________________________________ Name: cvs2svn:cvs-rev + 1.3 Name: svn:mime-type + text/x-chdr Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native From ghudson at MIT.EDU Mon Aug 3 14:40:23 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Mon, 3 Aug 2009 14:40:23 -0400 Subject: svn rev #22482: trunk/src/lib/ crypto/builtin/ crypto/builtin/aes/ crypto/builtin/arcfour/ ... Message-ID: <200908031840.n73IeNRd003856@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22482 Commit By: ghudson Log Message: Re-run make depend. (I am not certain why the dependencies from r22477 didn't work for me.) Changed Files: U trunk/src/lib/crypto/builtin/aes/deps U trunk/src/lib/crypto/builtin/arcfour/deps U trunk/src/lib/crypto/builtin/deps U trunk/src/lib/crypto/builtin/des/deps U trunk/src/lib/crypto/builtin/md4/deps U trunk/src/lib/crypto/builtin/md5/deps U trunk/src/lib/crypto/builtin/sha1/deps U trunk/src/lib/crypto/krb/crc32/deps U trunk/src/lib/crypto/krb/deps U trunk/src/lib/crypto/krb/dk/deps U trunk/src/lib/crypto/krb/enc_provider/deps U trunk/src/lib/crypto/krb/hash_provider/deps U trunk/src/lib/crypto/krb/keyhash_provider/deps U trunk/src/lib/crypto/krb/old/deps U trunk/src/lib/crypto/krb/raw/deps U trunk/src/lib/crypto/krb/yarrow/deps U trunk/src/lib/krb5/krb/deps Modified: trunk/src/lib/crypto/builtin/aes/deps =================================================================== --- trunk/src/lib/crypto/builtin/aes/deps 2009-08-03 18:00:18 UTC (rev 22481) +++ trunk/src/lib/crypto/builtin/aes/deps 2009-08-03 18:40:22 UTC (rev 22482) @@ -10,12 +10,11 @@ aes.h aeskey.c aesopt.h uitypes.h aes_s2k.so aes_s2k.po $(OUTPRE)aes_s2k.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/../../krb/dk/dk.h \ - aes_s2k.c aes_s2k.h + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../../krb/dk/dk.h aes_s2k.c aes_s2k.h Modified: trunk/src/lib/crypto/builtin/arcfour/deps =================================================================== --- trunk/src/lib/crypto/builtin/arcfour/deps 2009-08-03 18:00:18 UTC (rev 22481) +++ trunk/src/lib/crypto/builtin/arcfour/deps 2009-08-03 18:40:22 UTC (rev 22482) @@ -3,36 +3,36 @@ # arcfour.so arcfour.po $(OUTPRE)arcfour.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/../../krb/hash_provider/hash_provider.h \ - arcfour-int.h arcfour.c arcfour.h -arcfour_aead.so arcfour_aead.po $(OUTPRE)arcfour_aead.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/../../krb/aead.h $(srcdir)/../../krb/cksumtypes.h \ - arcfour-int.h arcfour.h arcfour_aead.c -arcfour_s2k.so arcfour_s2k.po $(OUTPRE)arcfour_s2k.$(OBJEXT): \ + $(srcdir)/../../krb/hash_provider/hash_provider.h arcfour-int.h \ + arcfour.c arcfour.h +arcfour_aead.so arcfour_aead.po $(OUTPRE)arcfour_aead.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/k5-utf8.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/../md4/rsa-md4.h \ - arcfour-int.h arcfour.h arcfour_s2k.c + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../krb/aead.h \ + $(srcdir)/../../krb/cksumtypes.h arcfour-int.h arcfour.h \ + arcfour_aead.c +arcfour_s2k.so arcfour_s2k.po $(OUTPRE)arcfour_s2k.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/k5-utf8.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../md4/rsa-md4.h arcfour-int.h arcfour.h \ + arcfour_s2k.c Modified: trunk/src/lib/crypto/builtin/deps =================================================================== --- trunk/src/lib/crypto/builtin/deps 2009-08-03 18:00:18 UTC (rev 22481) +++ trunk/src/lib/crypto/builtin/deps 2009-08-03 18:40:22 UTC (rev 22482) @@ -3,23 +3,22 @@ # hmac.so hmac.po $(OUTPRE)hmac.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/../builtin/hmac.c \ - $(srcdir)/../krb/aead.h $(srcdir)/../krb/cksumtypes.h + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../builtin/hmac.c $(srcdir)/../krb/aead.h \ + $(srcdir)/../krb/cksumtypes.h pbkdf2.so pbkdf2.po $(OUTPRE)pbkdf2.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/../builtin/pbkdf2.c \ - $(srcdir)/../krb/hash_provider/hash_provider.h + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../builtin/pbkdf2.c $(srcdir)/../krb/hash_provider/hash_provider.h Modified: trunk/src/lib/crypto/builtin/des/deps =================================================================== --- trunk/src/lib/crypto/builtin/des/deps 2009-08-03 18:00:18 UTC (rev 22481) +++ trunk/src/lib/crypto/builtin/des/deps 2009-08-03 18:40:22 UTC (rev 22482) @@ -4,155 +4,143 @@ afsstring2key.so afsstring2key.po $(OUTPRE)afsstring2key.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h afsstring2key.c des_int.h +d3_cbc.so d3_cbc.po $(OUTPRE)d3_cbc.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - afsstring2key.c des_int.h -d3_cbc.so d3_cbc.po $(OUTPRE)d3_cbc.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h d3_cbc.c des_int.h \ - f_tables.h + d3_cbc.c des_int.h f_tables.h d3_aead.so d3_aead.po $(OUTPRE)d3_aead.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/../../krb/aead.h \ - $(srcdir)/../../krb/cksumtypes.h d3_aead.c des_int.h \ - f_tables.h -d3_kysched.so d3_kysched.po $(OUTPRE)d3_kysched.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - d3_kysched.c des_int.h -des_prf.so des_prf.po $(OUTPRE)des_prf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(srcdir)/../../krb/aead.h $(srcdir)/../../krb/cksumtypes.h \ + d3_aead.c des_int.h f_tables.h +d3_kysched.so d3_kysched.po $(OUTPRE)d3_kysched.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/../../krb/hash_provider/hash_provider.h \ - des_prf.c -f_aead.so f_aead.po $(OUTPRE)f_aead.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(SRCTOP)/include/socket-utils.h d3_kysched.c des_int.h +des_prf.so des_prf.po $(OUTPRE)des_prf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/../../krb/aead.h \ - $(srcdir)/../../krb/cksumtypes.h des_int.h f_aead.c \ - f_tables.h -f_cbc.so f_cbc.po $(OUTPRE)f_cbc.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h des_int.h f_cbc.c \ - f_tables.h -f_cksum.so f_cksum.po $(OUTPRE)f_cksum.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h des_int.h f_cksum.c \ - f_tables.h -f_parity.so f_parity.po $(OUTPRE)f_parity.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - des_int.h f_parity.c -f_sched.so f_sched.po $(OUTPRE)f_sched.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(srcdir)/../../krb/hash_provider/hash_provider.h des_prf.c +f_aead.so f_aead.po $(OUTPRE)f_aead.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h des_int.h f_sched.c -f_tables.so f_tables.po $(OUTPRE)f_tables.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - des_int.h f_tables.c f_tables.h -key_sched.so key_sched.po $(OUTPRE)key_sched.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(srcdir)/../../krb/aead.h $(srcdir)/../../krb/cksumtypes.h \ + des_int.h f_aead.c f_tables.h +f_cbc.so f_cbc.po $(OUTPRE)f_cbc.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - des_int.h key_sched.c -weak_key.so weak_key.po $(OUTPRE)weak_key.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + des_int.h f_cbc.c f_tables.h +f_cksum.so f_cksum.po $(OUTPRE)f_cksum.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - des_int.h weak_key.c -string2key.so string2key.po $(OUTPRE)string2key.$(OBJEXT): \ + des_int.h f_cksum.c f_tables.h +f_parity.so f_parity.po $(OUTPRE)f_parity.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h des_int.h f_parity.c +f_sched.so f_sched.po $(OUTPRE)f_sched.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - des_int.h string2key.c + des_int.h f_sched.c +f_tables.so f_tables.po $(OUTPRE)f_tables.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h des_int.h f_tables.c \ + f_tables.h +key_sched.so key_sched.po $(OUTPRE)key_sched.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h des_int.h key_sched.c +weak_key.so weak_key.po $(OUTPRE)weak_key.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h des_int.h weak_key.c +string2key.so string2key.po $(OUTPRE)string2key.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h des_int.h string2key.c Modified: trunk/src/lib/crypto/builtin/md4/deps =================================================================== --- trunk/src/lib/crypto/builtin/md4/deps 2009-08-03 18:00:18 UTC (rev 22481) +++ trunk/src/lib/crypto/builtin/md4/deps 2009-08-03 18:40:22 UTC (rev 22482) @@ -3,11 +3,11 @@ # md4.so md4.po $(OUTPRE)md4.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h md4.c rsa-md4.h + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + md4.c rsa-md4.h Modified: trunk/src/lib/crypto/builtin/md5/deps =================================================================== --- trunk/src/lib/crypto/builtin/md5/deps 2009-08-03 18:00:18 UTC (rev 22481) +++ trunk/src/lib/crypto/builtin/md5/deps 2009-08-03 18:40:22 UTC (rev 22482) @@ -3,11 +3,11 @@ # md5.so md5.po $(OUTPRE)md5.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h md5.c rsa-md5.h + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + md5.c rsa-md5.h Modified: trunk/src/lib/crypto/builtin/sha1/deps =================================================================== --- trunk/src/lib/crypto/builtin/sha1/deps 2009-08-03 18:00:18 UTC (rev 22481) +++ trunk/src/lib/crypto/builtin/sha1/deps 2009-08-03 18:40:22 UTC (rev 22482) @@ -3,11 +3,11 @@ # shs.so shs.po $(OUTPRE)shs.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h shs.c shs.h + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + shs.c shs.h Modified: trunk/src/lib/crypto/krb/crc32/deps =================================================================== --- trunk/src/lib/crypto/krb/crc32/deps 2009-08-03 18:00:18 UTC (rev 22481) +++ trunk/src/lib/crypto/krb/crc32/deps 2009-08-03 18:40:22 UTC (rev 22482) @@ -3,11 +3,11 @@ # crc32.so crc32.po $(OUTPRE)crc32.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h crc-32.h crc32.c + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + crc-32.h crc32.c Modified: trunk/src/lib/crypto/krb/deps =================================================================== --- trunk/src/lib/crypto/krb/deps 2009-08-03 18:00:18 UTC (rev 22481) +++ trunk/src/lib/crypto/krb/deps 2009-08-03 18:40:22 UTC (rev 22482) @@ -3,443 +3,421 @@ # aead.so aead.po $(OUTPRE)aead.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/dk/dk.h \ - aead.c aead.h cksumtypes.h etypes.h -block_size.so block_size.po $(OUTPRE)block_size.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - block_size.c etypes.h + $(srcdir)/dk/dk.h aead.c aead.h cksumtypes.h etypes.h +block_size.so block_size.po $(OUTPRE)block_size.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h block_size.c etypes.h checksum_length.so checksum_length.po $(OUTPRE)checksum_length.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - checksum_length.c cksumtypes.h + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h checksum_length.c \ + cksumtypes.h cksumtype_to_string.so cksumtype_to_string.po $(OUTPRE)cksumtype_to_string.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - cksumtype_to_string.c cksumtypes.h + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h cksumtype_to_string.c \ + cksumtypes.h cksumtypes.so cksumtypes.po $(OUTPRE)cksumtypes.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/hash_provider/hash_provider.h $(srcdir)/keyhash_provider/keyhash_provider.h \ - cksumtypes.c cksumtypes.h + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/hash_provider/hash_provider.h \ + $(srcdir)/keyhash_provider/keyhash_provider.h cksumtypes.c \ + cksumtypes.h coll_proof_cksum.so coll_proof_cksum.po $(OUTPRE)coll_proof_cksum.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - cksumtypes.h coll_proof_cksum.c + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h cksumtypes.h coll_proof_cksum.c combine_keys.so combine_keys.po $(OUTPRE)combine_keys.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/dk/dk.h combine_keys.c etypes.h + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/dk/dk.h \ + combine_keys.c etypes.h crypto_length.so crypto_length.po $(OUTPRE)crypto_length.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - aead.h cksumtypes.h crypto_length.c etypes.h + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h aead.h cksumtypes.h \ + crypto_length.c etypes.h crypto_libinit.so crypto_libinit.po $(OUTPRE)crypto_libinit.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - crypto_libinit.c + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h crypto_libinit.c default_state.so default_state.po $(OUTPRE)default_state.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - default_state.c -decrypt.so decrypt.po $(OUTPRE)decrypt.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h aead.h cksumtypes.h \ - decrypt.c etypes.h -decrypt_iov.so decrypt_iov.po $(OUTPRE)decrypt_iov.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/socket-utils.h default_state.c +decrypt.so decrypt.po $(OUTPRE)decrypt.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - aead.h cksumtypes.h decrypt_iov.c etypes.h -encrypt.so encrypt.po $(OUTPRE)encrypt.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + aead.h cksumtypes.h decrypt.c etypes.h +decrypt_iov.so decrypt_iov.po $(OUTPRE)decrypt_iov.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h aead.h cksumtypes.h \ - encrypt.c etypes.h -encrypt_iov.so encrypt_iov.po $(OUTPRE)encrypt_iov.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + decrypt_iov.c etypes.h +encrypt.so encrypt.po $(OUTPRE)encrypt.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - encrypt_iov.c etypes.h + aead.h cksumtypes.h encrypt.c etypes.h +encrypt_iov.so encrypt_iov.po $(OUTPRE)encrypt_iov.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h encrypt_iov.c etypes.h encrypt_length.so encrypt_length.po $(OUTPRE)encrypt_length.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - aead.h cksumtypes.h encrypt_length.c etypes.h + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h aead.h cksumtypes.h \ + encrypt_length.c etypes.h enctype_compare.so enctype_compare.po $(OUTPRE)enctype_compare.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - enctype_compare.c etypes.h + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h enctype_compare.c \ + etypes.h enctype_to_string.so enctype_to_string.po $(OUTPRE)enctype_to_string.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - enctype_to_string.c etypes.h -etypes.so etypes.po $(OUTPRE)etypes.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/../builtin/aes/aes_s2k.h \ - $(srcdir)/../builtin/arcfour/arcfour.h $(srcdir)/../builtin/des/des_int.h \ - $(srcdir)/dk/dk.h $(srcdir)/enc_provider/enc_provider.h \ - $(srcdir)/hash_provider/hash_provider.h $(srcdir)/old/old.h \ - $(srcdir)/raw/raw.h etypes.c etypes.h -keyblocks.so keyblocks.po $(OUTPRE)keyblocks.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/socket-utils.h enctype_to_string.c \ + etypes.h +etypes.so etypes.po $(OUTPRE)etypes.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - keyblocks.c + $(srcdir)/../builtin/aes/aes_s2k.h $(srcdir)/../builtin/arcfour/arcfour.h \ + $(srcdir)/../builtin/des/des_int.h $(srcdir)/dk/dk.h \ + $(srcdir)/enc_provider/enc_provider.h $(srcdir)/hash_provider/hash_provider.h \ + $(srcdir)/old/old.h $(srcdir)/raw/raw.h etypes.c etypes.h +keyblocks.so keyblocks.po $(OUTPRE)keyblocks.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h keyblocks.c keyed_cksum.so keyed_cksum.po $(OUTPRE)keyed_cksum.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - cksumtypes.h keyed_cksum.c + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h cksumtypes.h keyed_cksum.c keyed_checksum_types.so keyed_checksum_types.po $(OUTPRE)keyed_checksum_types.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - cksumtypes.h etypes.h keyed_checksum_types.c + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h cksumtypes.h etypes.h \ + keyed_checksum_types.c keylengths.so keylengths.po $(OUTPRE)keylengths.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - etypes.h keylengths.c + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h etypes.h keylengths.c make_checksum.so make_checksum.po $(OUTPRE)make_checksum.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/dk/dk.h cksumtypes.h etypes.h make_checksum.c -make_checksum_iov.so make_checksum_iov.po $(OUTPRE)make_checksum_iov.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - aead.h cksumtypes.h make_checksum_iov.c -make_random_key.so make_random_key.po $(OUTPRE)make_random_key.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - etypes.h make_random_key.c -mandatory_sumtype.so mandatory_sumtype.po $(OUTPRE)mandatory_sumtype.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - etypes.h mandatory_sumtype.c -nfold.so nfold.po $(OUTPRE)nfold.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h nfold.c -old_api_glue.so old_api_glue.po $(OUTPRE)old_api_glue.$(OBJEXT): \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/dk/dk.h \ + cksumtypes.h etypes.h make_checksum.c +make_checksum_iov.so make_checksum_iov.po $(OUTPRE)make_checksum_iov.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - old_api_glue.c -prf.so prf.po $(OUTPRE)prf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h etypes.h prf.c -cf2.so cf2.po $(OUTPRE)cf2.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/socket-utils.h aead.h cksumtypes.h \ + make_checksum_iov.c +make_random_key.so make_random_key.po $(OUTPRE)make_random_key.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h cf2.c etypes.h -prng.so prng.po $(OUTPRE)prng.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/socket-utils.h etypes.h make_random_key.c +mandatory_sumtype.so mandatory_sumtype.po $(OUTPRE)mandatory_sumtype.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/../builtin/sha1/shs.h \ - $(srcdir)/enc_provider/enc_provider.h $(srcdir)/yarrow/yarrow.h \ - $(srcdir)/yarrow/ycipher.h $(srcdir)/yarrow/yhash.h \ - $(srcdir)/yarrow/ytypes.h prng.c -random_to_key.so random_to_key.po $(OUTPRE)random_to_key.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/socket-utils.h etypes.h mandatory_sumtype.c +nfold.so nfold.po $(OUTPRE)nfold.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - etypes.h random_to_key.c -state.so state.po $(OUTPRE)state.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + nfold.c +old_api_glue.so old_api_glue.po $(OUTPRE)old_api_glue.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h etypes.h state.c -string_to_cksumtype.so string_to_cksumtype.po $(OUTPRE)string_to_cksumtype.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/socket-utils.h old_api_glue.c +prf.so prf.po $(OUTPRE)prf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - cksumtypes.h string_to_cksumtype.c -string_to_enctype.so string_to_enctype.po $(OUTPRE)string_to_enctype.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + etypes.h prf.c +cf2.so cf2.po $(OUTPRE)cf2.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - etypes.h string_to_enctype.c -string_to_key.so string_to_key.po $(OUTPRE)string_to_key.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + cf2.c etypes.h +prng.so prng.po $(OUTPRE)prng.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - etypes.h string_to_key.c -valid_cksumtype.so valid_cksumtype.po $(OUTPRE)valid_cksumtype.$(OBJEXT): \ + $(srcdir)/../builtin/sha1/shs.h $(srcdir)/enc_provider/enc_provider.h \ + $(srcdir)/yarrow/yarrow.h $(srcdir)/yarrow/ycipher.h \ + $(srcdir)/yarrow/yhash.h $(srcdir)/yarrow/ytypes.h \ + prng.c +random_to_key.so random_to_key.po $(OUTPRE)random_to_key.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h etypes.h random_to_key.c +state.so state.po $(OUTPRE)state.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - cksumtypes.h valid_cksumtype.c + etypes.h state.c +string_to_cksumtype.so string_to_cksumtype.po $(OUTPRE)string_to_cksumtype.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h cksumtypes.h string_to_cksumtype.c +string_to_enctype.so string_to_enctype.po $(OUTPRE)string_to_enctype.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h etypes.h string_to_enctype.c +string_to_key.so string_to_key.po $(OUTPRE)string_to_key.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h etypes.h string_to_key.c +valid_cksumtype.so valid_cksumtype.po $(OUTPRE)valid_cksumtype.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h cksumtypes.h valid_cksumtype.c valid_enctype.so valid_enctype.po $(OUTPRE)valid_enctype.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - etypes.h valid_enctype.c + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h etypes.h valid_enctype.c verify_checksum.so verify_checksum.po $(OUTPRE)verify_checksum.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - cksumtypes.h verify_checksum.c + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h cksumtypes.h verify_checksum.c verify_checksum_iov.so verify_checksum_iov.po $(OUTPRE)verify_checksum_iov.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - aead.h cksumtypes.h verify_checksum_iov.c + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h aead.h cksumtypes.h \ + verify_checksum_iov.c Modified: trunk/src/lib/crypto/krb/dk/deps =================================================================== --- trunk/src/lib/crypto/krb/dk/deps 2009-08-03 18:00:18 UTC (rev 22481) +++ trunk/src/lib/crypto/krb/dk/deps 2009-08-03 18:40:22 UTC (rev 22482) @@ -4,76 +4,73 @@ checksum.so checksum.po $(OUTPRE)checksum.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/../aead.h $(srcdir)/../cksumtypes.h $(srcdir)/../etypes.h \ - checksum.c dk.h -dk_aead.so dk_aead.po $(OUTPRE)dk_aead.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(srcdir)/../aead.h \ - $(srcdir)/../cksumtypes.h dk.h dk_aead.c -dk_decrypt.so dk_decrypt.po $(OUTPRE)dk_decrypt.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(srcdir)/../cksumtypes.h $(srcdir)/../etypes.h checksum.c \ + dk.h +dk_aead.so dk_aead.po $(OUTPRE)dk_aead.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - dk.h dk_decrypt.c -dk_encrypt.so dk_encrypt.po $(OUTPRE)dk_encrypt.$(OBJEXT): \ + $(srcdir)/../aead.h $(srcdir)/../cksumtypes.h dk.h \ + dk_aead.c +dk_decrypt.so dk_decrypt.po $(OUTPRE)dk_decrypt.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - dk.h dk_encrypt.c -dk_prf.so dk_prf.po $(OUTPRE)dk_prf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h dk.h dk_prf.c -derive.so derive.po $(OUTPRE)derive.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/socket-utils.h dk.h dk_decrypt.c +dk_encrypt.so dk_encrypt.po $(OUTPRE)dk_encrypt.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h derive.c dk.h -stringtokey.so stringtokey.po $(OUTPRE)stringtokey.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/socket-utils.h dk.h dk_encrypt.c +dk_prf.so dk_prf.po $(OUTPRE)dk_prf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - dk.h stringtokey.c + dk.h dk_prf.c +derive.so derive.po $(OUTPRE)derive.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ + $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + derive.c dk.h +stringtokey.so stringtokey.po $(OUTPRE)stringtokey.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h dk.h stringtokey.c Modified: trunk/src/lib/crypto/krb/enc_provider/deps =================================================================== --- trunk/src/lib/crypto/krb/enc_provider/deps 2009-08-03 18:00:18 UTC (rev 22481) +++ trunk/src/lib/crypto/krb/enc_provider/deps 2009-08-03 18:40:22 UTC (rev 22482) @@ -3,48 +3,47 @@ # des.so des.po $(OUTPRE)des.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/des/des_int.h \ - $(srcdir)/../aead.h $(srcdir)/../cksumtypes.h des.c \ - enc_provider.h + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../../builtin/des/des_int.h $(srcdir)/../aead.h \ + $(srcdir)/../cksumtypes.h des.c enc_provider.h des3.so des3.po $(OUTPRE)des3.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/des/des_int.h \ - $(srcdir)/../aead.h $(srcdir)/../cksumtypes.h des3.c + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../../builtin/des/des_int.h $(srcdir)/../aead.h \ + $(srcdir)/../cksumtypes.h des3.c aes.so aes.po $(OUTPRE)aes.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/aes/aes.h \ - $(srcdir)/../../builtin/aes/uitypes.h $(srcdir)/../aead.h \ - $(srcdir)/../cksumtypes.h aes.c enc_provider.h + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../../builtin/aes/aes.h $(srcdir)/../../builtin/aes/uitypes.h \ + $(srcdir)/../aead.h $(srcdir)/../cksumtypes.h aes.c \ + enc_provider.h rc4.so rc4.po $(OUTPRE)rc4.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/arcfour/arcfour-int.h \ - $(srcdir)/../../builtin/arcfour/arcfour.h $(srcdir)/../aead.h \ - $(srcdir)/../cksumtypes.h enc_provider.h rc4.c + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../../builtin/arcfour/arcfour-int.h $(srcdir)/../../builtin/arcfour/arcfour.h \ + $(srcdir)/../aead.h $(srcdir)/../cksumtypes.h enc_provider.h \ + rc4.c Modified: trunk/src/lib/crypto/krb/hash_provider/deps =================================================================== --- trunk/src/lib/crypto/krb/hash_provider/deps 2009-08-03 18:00:18 UTC (rev 22481) +++ trunk/src/lib/crypto/krb/hash_provider/deps 2009-08-03 18:40:22 UTC (rev 22482) @@ -4,45 +4,44 @@ hash_crc32.so hash_crc32.po $(OUTPRE)hash_crc32.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/../crc32/crc-32.h hash_crc32.c hash_provider.h + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../crc32/crc-32.h \ + hash_crc32.c hash_provider.h hash_md4.so hash_md4.po $(OUTPRE)hash_md4.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/../../builtin/md4/rsa-md4.h hash_md4.c hash_provider.h + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/md4/rsa-md4.h \ + hash_md4.c hash_provider.h hash_md5.so hash_md5.po $(OUTPRE)hash_md5.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/../../builtin/md5/rsa-md5.h hash_md5.c hash_provider.h + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/md5/rsa-md5.h \ + hash_md5.c hash_provider.h hash_sha1.so hash_sha1.po $(OUTPRE)hash_sha1.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/../../builtin/sha1/shs.h hash_provider.h \ - hash_sha1.c + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/sha1/shs.h \ + hash_provider.h hash_sha1.c Modified: trunk/src/lib/crypto/krb/keyhash_provider/deps =================================================================== --- trunk/src/lib/crypto/krb/keyhash_provider/deps 2009-08-03 18:00:18 UTC (rev 22481) +++ trunk/src/lib/crypto/krb/keyhash_provider/deps 2009-08-03 18:40:22 UTC (rev 22482) @@ -3,63 +3,59 @@ # descbc.so descbc.po $(OUTPRE)descbc.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/des/des_int.h \ - descbc.c keyhash_provider.h -k5_md4des.so k5_md4des.po $(OUTPRE)k5_md4des.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/../../builtin/des/des_int.h $(srcdir)/../../builtin/md4/rsa-md4.h \ - k5_md4des.c keyhash_provider.h + $(srcdir)/../../builtin/des/des_int.h descbc.c keyhash_provider.h +k5_md4des.so k5_md4des.po $(OUTPRE)k5_md4des.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/des/des_int.h \ + $(srcdir)/../../builtin/md4/rsa-md4.h k5_md4des.c keyhash_provider.h k5_md5des.so k5_md5des.po $(OUTPRE)k5_md5des.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/../../builtin/des/des_int.h $(srcdir)/../../builtin/md5/rsa-md5.h \ - k5_md5des.c keyhash_provider.h + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/des/des_int.h \ + $(srcdir)/../../builtin/md5/rsa-md5.h k5_md5des.c keyhash_provider.h hmac_md5.so hmac_md5.po $(OUTPRE)hmac_md5.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/../../builtin/arcfour/arcfour-int.h $(srcdir)/../../builtin/arcfour/arcfour.h \ - $(srcdir)/../../builtin/md5/rsa-md5.h $(srcdir)/../aead.h \ - $(srcdir)/../cksumtypes.h $(srcdir)/../hash_provider/hash_provider.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/arcfour/arcfour-int.h \ + $(srcdir)/../../builtin/arcfour/arcfour.h $(srcdir)/../../builtin/md5/rsa-md5.h \ + $(srcdir)/../aead.h $(srcdir)/../cksumtypes.h $(srcdir)/../hash_provider/hash_provider.h \ hmac_md5.c keyhash_provider.h md5_hmac.so md5_hmac.po $(OUTPRE)md5_hmac.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/../../builtin/arcfour/arcfour-int.h $(srcdir)/../../builtin/arcfour/arcfour.h \ - $(srcdir)/../../builtin/md5/rsa-md5.h $(srcdir)/../hash_provider/hash_provider.h \ - keyhash_provider.h md5_hmac.c + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/arcfour/arcfour-int.h \ + $(srcdir)/../../builtin/arcfour/arcfour.h $(srcdir)/../../builtin/md5/rsa-md5.h \ + $(srcdir)/../hash_provider/hash_provider.h keyhash_provider.h \ + md5_hmac.c Modified: trunk/src/lib/crypto/krb/old/deps =================================================================== --- trunk/src/lib/crypto/krb/old/deps 2009-08-03 18:00:18 UTC (rev 22481) +++ trunk/src/lib/crypto/krb/old/deps 2009-08-03 18:40:22 UTC (rev 22482) @@ -4,34 +4,31 @@ des_stringtokey.so des_stringtokey.po $(OUTPRE)des_stringtokey.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/../../builtin/des/des_int.h des_stringtokey.c \ - old.h + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/des/des_int.h \ + des_stringtokey.c old.h old_decrypt.so old_decrypt.po $(OUTPRE)old_decrypt.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - old.h old_decrypt.c + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h old.h old_decrypt.c old_encrypt.so old_encrypt.po $(OUTPRE)old_encrypt.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - old.h old_encrypt.c + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h old.h old_encrypt.c Modified: trunk/src/lib/crypto/krb/raw/deps =================================================================== --- trunk/src/lib/crypto/krb/raw/deps 2009-08-03 18:00:18 UTC (rev 22481) +++ trunk/src/lib/crypto/krb/raw/deps 2009-08-03 18:40:22 UTC (rev 22482) @@ -4,34 +4,31 @@ raw_decrypt.so raw_decrypt.po $(OUTPRE)raw_decrypt.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - raw.h raw_decrypt.c + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h raw.h raw_decrypt.c raw_encrypt.so raw_encrypt.po $(OUTPRE)raw_encrypt.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - raw.h raw_encrypt.c + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h raw.h raw_encrypt.c raw_aead.so raw_aead.po $(OUTPRE)raw_aead.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ - $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(srcdir)/../aead.h $(srcdir)/../cksumtypes.h raw.h \ - raw_aead.c + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(srcdir)/../aead.h \ + $(srcdir)/../cksumtypes.h raw.h raw_aead.c Modified: trunk/src/lib/crypto/krb/yarrow/deps =================================================================== --- trunk/src/lib/crypto/krb/yarrow/deps 2009-08-03 18:00:18 UTC (rev 22481) +++ trunk/src/lib/crypto/krb/yarrow/deps 2009-08-03 18:40:22 UTC (rev 22482) @@ -3,25 +3,23 @@ # yarrow.so yarrow.po $(OUTPRE)yarrow.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/sha1/shs.h \ - yarrow.c yarrow.h ycipher.h yexcep.h yhash.h ylock.h \ - ystate.h ytypes.h + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../../builtin/sha1/shs.h yarrow.c yarrow.h \ + ycipher.h yexcep.h yhash.h ylock.h ystate.h ytypes.h ycipher.so ycipher.po $(OUTPRE)ycipher.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \ - $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ - $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ - $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/sha1/shs.h \ - $(srcdir)/../enc_provider/enc_provider.h yarrow.h ycipher.c \ - ycipher.h yhash.h ytypes.h + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ + $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ + $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ + $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ + $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ + $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ + $(srcdir)/../../builtin/sha1/shs.h $(srcdir)/../enc_provider/enc_provider.h \ + yarrow.h ycipher.c ycipher.h yhash.h ytypes.h Modified: trunk/src/lib/krb5/krb/deps =================================================================== --- trunk/src/lib/krb5/krb/deps 2009-08-03 18:00:18 UTC (rev 22481) +++ trunk/src/lib/krb5/krb/deps 2009-08-03 18:40:22 UTC (rev 22482) @@ -943,3 +943,13 @@ $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ t_princ.c +t_etypes.so t_etypes.po $(OUTPRE)t_etypes.$(OBJEXT): \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \ + $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \ + $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ + $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h t_etypes.c From ghudson at MIT.EDU Mon Aug 3 13:57:05 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Mon, 3 Aug 2009 13:57:05 -0400 Subject: svn rev #22480: trunk/src/ Message-ID: <200908031757.n73Hv5cl032457@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22480 Commit By: ghudson Log Message: In configure.in's list of Makefiles to generate, remove the trailing slash from lib/crypto/krb as it breaks Makefile auto-regeneration. While here, wrap the list to fit within 80 columns and use tab indents to match the surrounding lines. Changed Files: U trunk/src/configure.in Modified: trunk/src/configure.in =================================================================== --- trunk/src/configure.in 2009-08-03 17:53:39 UTC (rev 22479) +++ trunk/src/configure.in 2009-08-03 17:57:05 UTC (rev 22480) @@ -1059,12 +1059,12 @@ lib lib/kdb - lib/crypto lib/crypto/krb/ lib/crypto/krb/crc32 lib/crypto/builtin/des lib/crypto/krb/dk - lib/crypto/krb/enc_provider lib/crypto/krb/hash_provider - lib/crypto/krb/keyhash_provider - lib/crypto/builtin lib/crypto/builtin/md4 lib/crypto/builtin/md5 - lib/crypto/krb/old lib/crypto/krb/raw lib/crypto/builtin/sha1 - lib/crypto/builtin/arcfour lib/crypto/krb/yarrow lib/crypto/builtin/aes + lib/crypto lib/crypto/krb lib/crypto/krb/crc32 lib/crypto/builtin/des + lib/crypto/krb/dk lib/crypto/krb/enc_provider + lib/crypto/krb/hash_provider lib/crypto/krb/keyhash_provider + lib/crypto/builtin lib/crypto/builtin/md4 lib/crypto/builtin/md5 + lib/crypto/krb/old lib/crypto/krb/raw lib/crypto/builtin/sha1 + lib/crypto/builtin/arcfour lib/crypto/krb/yarrow lib/crypto/builtin/aes lib/crypto/crypto_tests lib/krb5 lib/krb5/error_tables lib/krb5/asn.1 lib/krb5/ccache From ghudson at MIT.EDU Mon Aug 3 14:00:19 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Mon, 3 Aug 2009 14:00:19 -0400 Subject: svn rev #22481: trunk/src/lib/crypto/crypto_tests/ Message-ID: <200908031800.n73I0JP4032765@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22481 Commit By: ghudson Log Message: In the crypto-tests check target, refer to t_cf2.expected in the source tree (where it lives) instead of the cwd. Changed Files: U trunk/src/lib/crypto/crypto_tests/Makefile.in Modified: trunk/src/lib/crypto/crypto_tests/Makefile.in =================================================================== --- trunk/src/lib/crypto/crypto_tests/Makefile.in 2009-08-03 17:57:05 UTC (rev 22480) +++ trunk/src/lib/crypto/crypto_tests/Makefile.in 2009-08-03 18:00:18 UTC (rev 22481) @@ -56,7 +56,7 @@ $(RUN_SETUP) $(VALGRIND) ./t_prf <$(srcdir)/t_prf.in >t_prf.output diff t_prf.output $(srcdir)/t_prf.expected $(RUN_SETUP) $(VALGRIND) ./t_cf2 <$(srcdir)/t_cf2.in >t_cf2.output - diff t_cf2.output ./t_cf2.expected + diff t_cf2.output $(srcdir)/t_cf2.expected $(RUN_SETUP) $(VALGRIND) ./t_cksum4 "this is a test" $(RUN_SETUP) $(VALGRIND) ./t_cksum5 "this is a test" $(RUN_SETUP) $(VALGRIND) ./t_crc From ghudson at MIT.EDU Mon Aug 3 16:27:04 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Mon, 3 Aug 2009 16:27:04 -0400 Subject: svn rev #22486: trunk/src/ appl/libpty/ include/ kadmin/dbutil/ kadmin/passwd/ ... Message-ID: <200908032027.n73KR4tI013607@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22486 Commit By: ghudson Log Message: Get "make depend" to work in an unbuilt source tree, since bad deps files can make it difficult to build the tree. To do this, make the depends target depend on generated header files and on header file copies or links into the main include directory. Changed Files: U trunk/src/appl/libpty/Makefile.in U trunk/src/include/Makefile.in U trunk/src/kadmin/dbutil/Makefile.in U trunk/src/kadmin/passwd/Makefile.in U trunk/src/kdc/Makefile.in U trunk/src/lib/gssapi/generic/Makefile.in U trunk/src/lib/gssapi/krb5/Makefile.in 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/kdb/Makefile.in U trunk/src/util/et/Makefile.in Modified: trunk/src/appl/libpty/Makefile.in =================================================================== --- trunk/src/appl/libpty/Makefile.in 2009-08-03 19:59:00 UTC (rev 22485) +++ trunk/src/appl/libpty/Makefile.in 2009-08-03 20:27:03 UTC (rev 22486) @@ -65,7 +65,7 @@ $(RM) libpty.a $(BUILDTOP)/include/libpty.h pty_err.c pty_err.h clean-unix:: clean-liblinks clean-libs clean-libobjs -depend:: pty_err.h +depend:: includes pty_err.h #install:: libpty.h # $(INSTALL_DATA) $(srcdir)/libpty.h $(DESTDIR)$(KRB5_INCDIR)/libpty.h Modified: trunk/src/include/Makefile.in =================================================================== --- trunk/src/include/Makefile.in 2009-08-03 19:59:00 UTC (rev 22485) +++ trunk/src/include/Makefile.in 2009-08-03 20:27:03 UTC (rev 22486) @@ -137,3 +137,5 @@ $(INSTALL_DATA) $(srcdir)/krb5/locate_plugin.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)locate_plugin.h $(INSTALL_DATA) profile.h $(DESTDIR)$(KRB5_INCDIR)$(S)profile.h $(INSTALL_DATA) $(srcdir)/gssapi.h $(DESTDIR)$(KRB5_INCDIR)$(S)gssapi.h + +depend:: krb5/krb5.h $(BUILT_HEADERS) Modified: trunk/src/kadmin/dbutil/Makefile.in =================================================================== --- trunk/src/kadmin/dbutil/Makefile.in 2009-08-03 19:59:00 UTC (rev 22485) +++ trunk/src/kadmin/dbutil/Makefile.in 2009-08-03 20:27:03 UTC (rev 22486) @@ -34,3 +34,4 @@ clean:: $(RM) $(PROG) $(OBJS) import_err.c import_err.h +depend:: import_err.h Modified: trunk/src/kadmin/passwd/Makefile.in =================================================================== --- trunk/src/kadmin/passwd/Makefile.in 2009-08-03 19:59:00 UTC (rev 22485) +++ trunk/src/kadmin/passwd/Makefile.in 2009-08-03 20:27:03 UTC (rev 22486) @@ -24,3 +24,5 @@ clean:: $(RM) kpasswd_strings.c kpasswd_strings.h $(PROG) $(OBJS) + +depend:: kpasswd_strings.h Modified: trunk/src/kdc/Makefile.in =================================================================== --- trunk/src/kdc/Makefile.in 2009-08-03 19:59:00 UTC (rev 22485) +++ trunk/src/kdc/Makefile.in 2009-08-03 20:27:03 UTC (rev 22486) @@ -54,7 +54,7 @@ policy.o \ extern.o -depend:: kdc5_err.c +depend:: kdc5_err.c kdc5_err.h kdc5_err.c: kdc5_err.et Modified: trunk/src/lib/gssapi/generic/Makefile.in =================================================================== --- trunk/src/lib/gssapi/generic/Makefile.in 2009-08-03 19:59:00 UTC (rev 22485) +++ trunk/src/lib/gssapi/generic/Makefile.in 2009-08-03 20:27:03 UTC (rev 22486) @@ -167,7 +167,7 @@ $(DESTDIR)$(KRB5_INCDIR)/gssapi/$$f ; \ done -depend:: $(ETSRCS) +depend:: $(ETSRCS) $(ETHDRS) $(HDRS) errmap.h maptest.h @libobj_frag@ Modified: trunk/src/lib/gssapi/krb5/Makefile.in =================================================================== --- trunk/src/lib/gssapi/krb5/Makefile.in 2009-08-03 19:59:00 UTC (rev 22485) +++ trunk/src/lib/gssapi/krb5/Makefile.in 2009-08-03 20:27:03 UTC (rev 22486) @@ -263,7 +263,7 @@ $(DESTDIR)$(KRB5_INCDIR)/gssapi/$$f ; \ done -depend:: $(ETSRCS) +depend:: $(ETSRCS) $(ETHDRS) $(GSSAPI_KRB5_HDR) error_map.h includes:: gssapi_krb5.h Modified: trunk/src/lib/kadm5/Makefile.in =================================================================== --- trunk/src/lib/kadm5/Makefile.in 2009-08-03 19:59:00 UTC (rev 22485) +++ trunk/src/lib/kadm5/Makefile.in 2009-08-03 20:27:03 UTC (rev 22486) @@ -103,5 +103,7 @@ $(INSTALL_DATA) chpass_util_strings.h $(DESTDIR)$(KRB5_INCDIR)$(S)kadm5$(S)chpass_util_strings.h $(INSTALL_DATA) kadm_err.h $(DESTDIR)$(KRB5_INCDIR)$(S)kadm5$(S)kadm_err.h +depend:: includes + @libobj_frag@ Modified: trunk/src/lib/kadm5/clnt/Makefile.in =================================================================== --- trunk/src/lib/kadm5/clnt/Makefile.in 2009-08-03 19:59:00 UTC (rev 22485) +++ trunk/src/lib/kadm5/clnt/Makefile.in 2009-08-03 20:27:03 UTC (rev 22486) @@ -72,6 +72,8 @@ install:: install-libs +depend:: includes + @lib_frag@ @libobj_frag@ Modified: trunk/src/lib/kadm5/srv/Makefile.in =================================================================== --- trunk/src/lib/kadm5/srv/Makefile.in 2009-08-03 19:59:00 UTC (rev 22485) +++ trunk/src/lib/kadm5/srv/Makefile.in 2009-08-03 20:27:03 UTC (rev 22486) @@ -89,6 +89,8 @@ install:: install-libs +depend:: includes + @lib_frag@ @libobj_frag@ Modified: trunk/src/lib/kdb/Makefile.in =================================================================== --- trunk/src/lib/kdb/Makefile.in 2009-08-03 19:59:00 UTC (rev 22485) +++ trunk/src/lib/kdb/Makefile.in 2009-08-03 20:27:03 UTC (rev 22486) @@ -61,6 +61,8 @@ generate-files-mac: darwin.exports +depend:: adb_err.h + @lib_frag@ @libobj_frag@ Modified: trunk/src/util/et/Makefile.in =================================================================== --- trunk/src/util/et/Makefile.in 2009-08-03 19:59:00 UTC (rev 22485) +++ trunk/src/util/et/Makefile.in 2009-08-03 20:27:03 UTC (rev 22486) @@ -242,7 +242,7 @@ etags et_name.c error_message.c compile_et.c \ error_table.c init_et.c -depend:: et_lex.lex.c +depend:: et_lex.lex.c includes compile_et @lib_frag@ From tlyu at MIT.EDU Mon Aug 3 17:19:46 2009 From: tlyu at MIT.EDU (tlyu@MIT.EDU) Date: Mon, 3 Aug 2009 17:19:46 -0400 Subject: svn rev #22487: trunk/src/lib/crypto/crypto_tests/ Message-ID: <200908032119.n73LJkEi022379@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22487 Commit By: tlyu Log Message: Fix deplibs for t_crc Changed Files: U trunk/src/lib/crypto/crypto_tests/Makefile.in Modified: trunk/src/lib/crypto/crypto_tests/Makefile.in =================================================================== --- trunk/src/lib/crypto/crypto_tests/Makefile.in 2009-08-03 20:27:03 UTC (rev 22486) +++ trunk/src/lib/crypto/crypto_tests/Makefile.in 2009-08-03 21:19:46 UTC (rev 22487) @@ -120,7 +120,7 @@ t_cksum5: t_cksum5.o $(CRYPTO_DEPLIB) $(CC_LINK) -o t_cksum5 t_cksum5.o $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) $(LIBS) -t_crc: t_crc.o $(K5CRYPTO_LIB) $(SUPPORT_DEPLIB) +t_crc: t_crc.o $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) $(CC_LINK) -o $@ t_crc.o $(K5CRYPTO_LIB) $(SUPPORT_LIB) aes-test: aes-test.$(OBJEXT) $(CRYPTO_DEPLIB) From tlyu at MIT.EDU Mon Aug 3 17:58:16 2009 From: tlyu at MIT.EDU (tlyu@MIT.EDU) Date: Mon, 3 Aug 2009 17:58:16 -0400 Subject: svn rev #22488: trunk/src/lib/crypto/crypto_tests/ Message-ID: <200908032158.n73LwG8E028993@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22488 Commit By: tlyu Log Message: Be a little more verbose about errors from mit_des_key_sched(), and remember to print newlines. Changed Files: U trunk/src/lib/crypto/crypto_tests/destest.c Modified: trunk/src/lib/crypto/crypto_tests/destest.c =================================================================== --- trunk/src/lib/crypto/crypto_tests/destest.c 2009-08-03 21:19:46 UTC (rev 22487) +++ trunk/src/lib/crypto/crypto_tests/destest.c 2009-08-03 21:58:15 UTC (rev 22488) @@ -95,7 +95,8 @@ retval = mit_des_key_sched(key, sched); if (retval) { - fprintf(stderr, "des test: can't process key"); + fprintf(stderr, "des test: can't process key: %d\n", retval); + fprintf(stderr, "des test: %s %s %s\n", block1, block2, block3); exit(1); } mit_des_cbc_encrypt((const mit_des_cblock *) input, output2, 8, From ghudson at MIT.EDU Mon Aug 3 19:18:43 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Mon, 3 Aug 2009 19:18:43 -0400 Subject: svn rev #22489: trunk/src/lib/crypto/crypto_tests/ Message-ID: <200908032318.n73NIhMw003591@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22489 Commit By: ghudson Log Message: In crypto_tests: for t_nfold, link against an nfold object file in the build directory, not the source directory. Remove the nfold object from the t_encrypt dependency list since we don't directly use it in the linking rule. Changed Files: U trunk/src/lib/crypto/crypto_tests/Makefile.in Modified: trunk/src/lib/crypto/crypto_tests/Makefile.in =================================================================== --- trunk/src/lib/crypto/crypto_tests/Makefile.in 2009-08-03 21:58:15 UTC (rev 22488) +++ trunk/src/lib/crypto/crypto_tests/Makefile.in 2009-08-03 23:18:42 UTC (rev 22489) @@ -79,10 +79,10 @@ # $(RUN_SETUP) $(VALGRIND) ./t_pkcs5 -t_nfold$(EXEEXT): t_nfold.$(OBJEXT) $(srcdir)/../krb/nfold$(DYNOBJEXT) $(SUPPORT_DEPLIB) - $(CC_LINK) -o $@ t_nfold.$(OBJEXT) $(srcdir)/../krb/nfold$(DYNOBJEXT) $(SUPPORT_LIB) +t_nfold$(EXEEXT): t_nfold.$(OBJEXT) ../krb/nfold$(DYNOBJEXT) $(SUPPORT_DEPLIB) + $(CC_LINK) -o $@ t_nfold.$(OBJEXT) ../krb/nfold$(DYNOBJEXT) $(SUPPORT_LIB) -t_encrypt$(EXEEXT): t_encrypt.$(OBJEXT) $(srcdir)/../krb/nfold$(DYNOBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) +t_encrypt$(EXEEXT): t_encrypt.$(OBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) $(CC_LINK) -o $@ t_encrypt.$(OBJEXT) -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) t_prf$(EXEEXT): t_prf.$(OBJEXT) $(SUPPORT_DEPLIB) From ghudson at MIT.EDU Fri Aug 7 15:17:57 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Fri, 7 Aug 2009 15:17:57 -0400 Subject: svn rev #22501: trunk/src/ kadmin/cli/ plugins/kdb/ldap/ldap_util/ Message-ID: <200908071917.n77JHvpq011875@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22501 Commit By: ghudson Log Message: Fix the LDAP build, which was broken by the build reordering in r22406. Build kdb5_util's getdate from the kadmin/cli getdate source, instead of borrowing the object file from the kadmin/cli build directory. Changed Files: U trunk/src/kadmin/cli/getdate.y U trunk/src/plugins/kdb/ldap/ldap_util/Makefile.in Modified: trunk/src/kadmin/cli/getdate.y =================================================================== --- trunk/src/kadmin/cli/getdate.y 2009-08-07 16:30:48 UTC (rev 22500) +++ trunk/src/kadmin/cli/getdate.y 2009-08-07 19:17:57 UTC (rev 22501) @@ -883,8 +883,9 @@ /* For get_date extern declaration compatibility check... yuck. */ #include -#include "kadmin.h" +time_t get_date(char *); + time_t get_date(p) char *p; Modified: trunk/src/plugins/kdb/ldap/ldap_util/Makefile.in =================================================================== --- trunk/src/plugins/kdb/ldap/ldap_util/Makefile.in 2009-08-07 16:30:48 UTC (rev 22500) +++ trunk/src/plugins/kdb/ldap/ldap_util/Makefile.in 2009-08-07 19:17:57 UTC (rev 22501) @@ -11,16 +11,21 @@ KDB_DEP_LIB=$(DL_LIB) -lkdb_ldap $(THREAD_LINKOPTS) PROG = kdb5_ldap_util -OBJS = kdb5_ldap_util.o kdb5_ldap_list.o kdb5_ldap_realm.o kdb5_ldap_policy.o kdb5_ldap_services.o +OBJS = kdb5_ldap_util.o kdb5_ldap_list.o kdb5_ldap_realm.o kdb5_ldap_policy.o kdb5_ldap_services.o getdate.o -GETDATE = ../../../../kadmin/cli/getdate.o +GETDATE = $(srcdir)/../../../../kadmin/cli/getdate.y all:: $(PROG) $(PROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIB) $(GETDATE) - $(CC_LINK) -o $(PROG) $(OBJS) $(GETDATE) \ + $(CC_LINK) -o $(PROG) $(OBJS) \ $(KADMSRV_LIBS) $(KDB_DEP_LIB) $(KRB5_BASE_LIBS) +getdate.c: $(GETDATE) + $(RM) getdate.c y.tab.c + $(YACC) $(GETDATE) + $(MV) y.tab.c getdate.c + install:: $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG) $(INSTALL_DATA) $(srcdir)/$(PROG).M ${DESTDIR}$(ADMIN_MANDIR)/$(PROG).8 From ghudson at MIT.EDU Mon Aug 10 00:42:45 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Mon, 10 Aug 2009 00:42:45 -0400 Subject: svn rev #22512: trunk/src/plugins/preauth/pkinit/ Message-ID: <200908100442.n7A4gj6W010887@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22512 Commit By: ghudson Log Message: Remove pkinit_identity_process_option, which wasn't doing anything besides picking a subsidiary function based on the (constant) input argument. Remove the associated constants from pkinit.h as well. No functional change. Changed Files: U trunk/src/plugins/preauth/pkinit/pkinit.h U trunk/src/plugins/preauth/pkinit/pkinit_identity.c Modified: trunk/src/plugins/preauth/pkinit/pkinit.h =================================================================== --- trunk/src/plugins/preauth/pkinit/pkinit.h 2009-08-09 09:52:56 UTC (rev 22511) +++ trunk/src/plugins/preauth/pkinit/pkinit.h 2009-08-10 04:42:44 UTC (rev 22512) @@ -182,13 +182,6 @@ * information about identity from config file or command line */ -#define PKINIT_ID_OPT_USER_IDENTITY 1 -#define PKINIT_ID_OPT_ANCHOR_CAS 2 -#define PKINIT_ID_OPT_INTERMEDIATE_CAS 3 -#define PKINIT_ID_OPT_CRLS 4 -#define PKINIT_ID_OPT_OCSP 5 -#define PKINIT_ID_OPT_DN_MAPPING 6 /* XXX ? */ - typedef struct _pkinit_identity_opts { char *identity; char **identity_alt; Modified: trunk/src/plugins/preauth/pkinit/pkinit_identity.c =================================================================== --- trunk/src/plugins/preauth/pkinit/pkinit_identity.c 2009-08-09 09:52:56 UTC (rev 22511) +++ trunk/src/plugins/preauth/pkinit/pkinit_identity.c 2009-08-10 04:42:44 UTC (rev 22512) @@ -503,51 +503,6 @@ idtype, catype, residual); } -static krb5_error_code -pkinit_identity_process_option(krb5_context context, - pkinit_plg_crypto_context plg_cryptoctx, - pkinit_req_crypto_context req_cryptoctx, - pkinit_identity_opts *idopts, - pkinit_identity_crypto_context id_cryptoctx, - int attr, - const char *value) -{ - krb5_error_code retval = 0; - - switch (attr) { - case PKINIT_ID_OPT_USER_IDENTITY: - retval = process_option_identity(context, plg_cryptoctx, - req_cryptoctx, idopts, - id_cryptoctx, value); - break; - case PKINIT_ID_OPT_ANCHOR_CAS: - retval = process_option_ca_crl(context, plg_cryptoctx, - req_cryptoctx, idopts, - id_cryptoctx, value, - CATYPE_ANCHORS); - break; - case PKINIT_ID_OPT_INTERMEDIATE_CAS: - retval = process_option_ca_crl(context, plg_cryptoctx, - req_cryptoctx, idopts, - id_cryptoctx, - value, CATYPE_INTERMEDIATES); - break; - case PKINIT_ID_OPT_CRLS: - retval = process_option_ca_crl(context, plg_cryptoctx, - req_cryptoctx, idopts, - id_cryptoctx, - value, CATYPE_CRLS); - break; - case PKINIT_ID_OPT_OCSP: - retval = ENOTSUP; - break; - default: - retval = EINVAL; - break; - } - return retval; -} - krb5_error_code pkinit_identity_initialize(krb5_context context, pkinit_plg_crypto_context plg_cryptoctx, @@ -573,18 +528,15 @@ * in the config file. */ if (idopts->identity != NULL) { - retval = pkinit_identity_process_option(context, plg_cryptoctx, - req_cryptoctx, idopts, - id_cryptoctx, - PKINIT_ID_OPT_USER_IDENTITY, - idopts->identity); + retval = process_option_identity(context, plg_cryptoctx, req_cryptoctx, + idopts, id_cryptoctx, + idopts->identity); } else if (idopts->identity_alt != NULL) { for (i = 0; retval != 0 && idopts->identity_alt[i] != NULL; i++) - retval = pkinit_identity_process_option(context, plg_cryptoctx, - req_cryptoctx, idopts, - id_cryptoctx, - PKINIT_ID_OPT_USER_IDENTITY, - idopts->identity_alt[i]); + retval = process_option_identity(context, plg_cryptoctx, + req_cryptoctx, idopts, + id_cryptoctx, + idopts->identity_alt[i]); } else { pkiDebug("%s: no user identity options specified\n", __FUNCTION__); goto errout; @@ -625,41 +577,31 @@ goto errout; for (i = 0; idopts->anchors != NULL && idopts->anchors[i] != NULL; i++) { - retval = pkinit_identity_process_option(context, plg_cryptoctx, - req_cryptoctx, idopts, - id_cryptoctx, - PKINIT_ID_OPT_ANCHOR_CAS, - idopts->anchors[i]); + retval = process_option_ca_crl(context, plg_cryptoctx, req_cryptoctx, + idopts, id_cryptoctx, + idopts->anchors[i], CATYPE_ANCHORS); if (retval) goto errout; } for (i = 0; idopts->intermediates != NULL && idopts->intermediates[i] != NULL; i++) { - retval = pkinit_identity_process_option(context, plg_cryptoctx, - req_cryptoctx, idopts, - id_cryptoctx, - PKINIT_ID_OPT_INTERMEDIATE_CAS, - idopts->intermediates[i]); + retval = process_option_ca_crl(context, plg_cryptoctx, req_cryptoctx, + idopts, id_cryptoctx, + idopts->intermediates[i], + CATYPE_INTERMEDIATES); if (retval) goto errout; } for (i = 0; idopts->crls != NULL && idopts->crls[i] != NULL; i++) { - retval = pkinit_identity_process_option(context, plg_cryptoctx, - req_cryptoctx, idopts, - id_cryptoctx, - PKINIT_ID_OPT_CRLS, - idopts->crls[i]); + retval = process_option_ca_crl(context, plg_cryptoctx, req_cryptoctx, + idopts, id_cryptoctx, idopts->crls[i], + CATYPE_CRLS); if (retval) goto errout; } if (idopts->ocsp != NULL) { - retval = pkinit_identity_process_option(context, plg_cryptoctx, - req_cryptoctx, idopts, - id_cryptoctx, - PKINIT_ID_OPT_OCSP, - idopts->ocsp); - if (retval) - goto errout; + retval = ENOTSUP; + goto errout; } errout: From ghudson at MIT.EDU Mon Aug 10 01:02:44 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Mon, 10 Aug 2009 01:02:44 -0400 Subject: svn rev #22513: trunk/src/ lib/kadm5/srv/ plugins/preauth/pkinit/ Message-ID: <200908100502.n7A52ikY012573@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22513 Commit By: ghudson Log Message: Convert all uses of strtok() in libraries to strtok_r() for thread safety. Changed Files: U trunk/src/lib/kadm5/srv/server_acl.c U trunk/src/plugins/preauth/pkinit/pkinit_identity.c Modified: trunk/src/lib/kadm5/srv/server_acl.c =================================================================== --- trunk/src/lib/kadm5/srv/server_acl.c 2009-08-10 04:42:44 UTC (rev 22512) +++ trunk/src/lib/kadm5/srv/server_acl.c 2009-08-10 05:02:43 UTC (rev 22513) @@ -282,7 +282,7 @@ char *s; restriction_t **rpp; { - char *sp = NULL, *tp, *ap; + char *sp = NULL, *tp, *ap, *save; static const char *delims = "\t\n\f\v\r ,"; krb5_deltat dt; krb5_flags flag; @@ -299,7 +299,8 @@ code = ENOMEM; } else { memset(*rpp, 0, sizeof(**rpp)); - for (tp=strtok(sp, delims); tp; tp=strtok((char *)NULL, delims)) { + for (tp = strtok_r(sp, delims, &save); tp; + tp = strtok_r(NULL, delims, &save)) { flag = 0; if (!krb5_string_to_flags(tp, "+", "-", &flag)) { /* OK, but was it in the positive or negative sense? */ @@ -315,7 +316,7 @@ (*rpp)->mask |= KADM5_POLICY_CLR; } else { /* everything else needs an argument ... */ - if (!(ap = strtok((char *)NULL, delims))) { + if (!(ap = strtok_r(NULL, delims, &save))) { code = EINVAL; break; } Modified: trunk/src/plugins/preauth/pkinit/pkinit_identity.c =================================================================== --- trunk/src/plugins/preauth/pkinit/pkinit_identity.c 2009-08-10 04:42:44 UTC (rev 22512) +++ trunk/src/plugins/preauth/pkinit/pkinit_identity.c 2009-08-10 05:02:43 UTC (rev 22513) @@ -261,7 +261,7 @@ pkinit_identity_opts *idopts, const char *residual) { - char *s, *cp, *vp; + char *s, *cp, *vp, *save; krb5_error_code retval = ENOMEM; if (residual == NULL || residual[0] == '\0') @@ -272,7 +272,7 @@ if (s == NULL) return retval; - for ((cp = strtok(s, ":")); cp; (cp = strtok(NULL, ":"))) { + for (cp = strtok_r(s, ":", &save); cp; cp = strtok_r(NULL, ":", &save)) { vp = strchr(cp, '='); /* If there is no "=", this is a pkcs11 module name */ @@ -334,7 +334,7 @@ pkinit_identity_opts *idopts, const char *residual) { - char *certname, *keyname; + char *certname, *keyname, *save; krb5_error_code retval = ENOMEM; if (residual == NULL || residual[0] == '\0') @@ -344,8 +344,8 @@ if (certname == NULL) goto cleanup; - certname = strtok(certname, ","); - keyname = strtok(NULL, ","); + certname = strtok_r(certname, ",", &save); + keyname = strtok_r(NULL, ",", &save); idopts->cert_filename = strdup(certname); if (idopts->cert_filename == NULL) From ghudson at MIT.EDU Mon Aug 10 01:16:24 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Mon, 10 Aug 2009 01:16:24 -0400 Subject: svn rev #22514: trunk/src/plugins/preauth/pkinit/ Message-ID: <200908100516.n7A5GOgI013813@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22514 Commit By: ghudson Log Message: In pkinit_clnt.c, make private functions static. There and in pkinit_srv.c, only declare static functions when necessary for forward references (as is consistent with the other pkinit sources). Remove the empty functions pkinit_init_client_profile and pkinit_fini_client_profile. Changed Files: U trunk/src/plugins/preauth/pkinit/pkinit_clnt.c U trunk/src/plugins/preauth/pkinit/pkinit_srv.c Modified: trunk/src/plugins/preauth/pkinit/pkinit_clnt.c =================================================================== --- trunk/src/plugins/preauth/pkinit/pkinit_clnt.c 2009-08-10 05:02:43 UTC (rev 22513) +++ trunk/src/plugins/preauth/pkinit/pkinit_clnt.c 2009-08-10 05:16:24 UTC (rev 22514) @@ -58,67 +58,22 @@ int longhorn = 0; /* Talking to a Longhorn server? */ #endif -krb5_error_code pkinit_client_process - (krb5_context context, void *plugin_context, void *request_context, - krb5_get_init_creds_opt *gic_opt, - preauth_get_client_data_proc get_data_proc, - struct _krb5_preauth_client_rock *rock, - krb5_kdc_req * request, krb5_data *encoded_request_body, - krb5_data *encoded_previous_request, krb5_pa_data *in_padata, - krb5_prompter_fct prompter, void *prompter_data, - preauth_get_as_key_proc gak_fct, void *gak_data, - krb5_data * salt, krb5_data * s2kparams, - krb5_keyblock * as_key, krb5_pa_data *** out_padata); - -krb5_error_code pkinit_client_tryagain - (krb5_context context, void *plugin_context, void *request_context, - krb5_get_init_creds_opt *gic_opt, - preauth_get_client_data_proc get_data_proc, - struct _krb5_preauth_client_rock *rock, - krb5_kdc_req * request, krb5_data *encoded_request_body, - krb5_data *encoded_previous_request, - krb5_pa_data *in_padata, krb5_error *err_reply, - krb5_prompter_fct prompter, void *prompter_data, - preauth_get_as_key_proc gak_fct, void *gak_data, - krb5_data * salt, krb5_data * s2kparams, - krb5_keyblock * as_key, krb5_pa_data *** out_padata); - -void pkinit_client_req_init - (krb5_context contex, void *plugin_context, void **request_context); - -void pkinit_client_req_fini - (krb5_context context, void *plugin_context, void *request_context); - -krb5_error_code pa_pkinit_gen_req +static krb5_error_code pkinit_as_req_create (krb5_context context, pkinit_context plgctx, - pkinit_req_context reqctx, krb5_kdc_req * request, - krb5_pa_data * in_padata, krb5_pa_data *** out_padata, - krb5_prompter_fct prompter, void *prompter_data, - krb5_get_init_creds_opt *gic_opt); - -krb5_error_code pkinit_as_req_create - (krb5_context context, pkinit_context plgctx, pkinit_req_context reqctx, krb5_timestamp ctsec, krb5_int32 cusec, krb5_ui_4 nonce, const krb5_checksum * cksum, krb5_principal server, krb5_data ** as_req); -krb5_error_code pkinit_as_rep_parse +static krb5_error_code pkinit_as_rep_parse (krb5_context context, pkinit_context plgctx, pkinit_req_context reqctx, krb5_preauthtype pa_type, krb5_kdc_req * request, const krb5_data * as_rep, krb5_keyblock * key_block, krb5_enctype etype, krb5_data *); -krb5_error_code pa_pkinit_parse_rep - (krb5_context context, pkinit_context plgctx, - pkinit_req_context reqcxt, krb5_kdc_req * request, - krb5_pa_data * in_padata, krb5_enctype etype, - krb5_keyblock * as_key, krb5_data *); - -static int pkinit_client_plugin_init(krb5_context context, void **blob); static void pkinit_client_plugin_fini(krb5_context context, void *blob); -krb5_error_code +static krb5_error_code pa_pkinit_gen_req(krb5_context context, pkinit_context plgctx, pkinit_req_context reqctx, @@ -265,7 +220,7 @@ return retval; } -krb5_error_code +static krb5_error_code pkinit_as_req_create(krb5_context context, pkinit_context plgctx, pkinit_req_context reqctx, @@ -490,7 +445,7 @@ return retval; } -krb5_error_code +static krb5_error_code pa_pkinit_parse_rep(krb5_context context, pkinit_context plgctx, pkinit_req_context reqctx, @@ -683,7 +638,7 @@ * certificate chain. * Optionally returns various components. */ -krb5_error_code +static krb5_error_code pkinit_as_rep_parse(krb5_context context, pkinit_context plgctx, pkinit_req_context reqctx, @@ -1004,7 +959,7 @@ &reqctx->idopts->identity_alt); } -krb5_error_code +static krb5_error_code pkinit_client_process(krb5_context context, void *plugin_context, void *request_context, @@ -1110,7 +1065,7 @@ return retval; } -krb5_error_code +static krb5_error_code pkinit_client_tryagain(krb5_context context, void *plugin_context, void *request_context, @@ -1229,7 +1184,7 @@ 0 }; -void +static void pkinit_client_req_init(krb5_context context, void *plugin_context, void **request_context) @@ -1292,7 +1247,7 @@ return; } -void +static void pkinit_client_req_fini(krb5_context context, void *plugin_context, void *request_context) @@ -1324,18 +1279,6 @@ return; } -static void -pkinit_fini_client_profile(krb5_context context, pkinit_context plgctx) -{ - /* This should clean up anything allocated in pkinit_init_client_profile */ -} - -static krb5_error_code -pkinit_init_client_profile(krb5_context context, pkinit_context plgctx) -{ - return 0; -} - static int pkinit_client_plugin_init(krb5_context context, void **blob) { @@ -1367,10 +1310,6 @@ if (retval) goto errout; - retval = pkinit_init_client_profile(context, ctx); - if (retval) - goto errout; - *blob = ctx; pkiDebug("%s: returning plgctx at %p\n", __FUNCTION__, ctx); @@ -1393,7 +1332,6 @@ } pkiDebug("%s: got plgctx at %p\n", __FUNCTION__, ctx); - pkinit_fini_client_profile(context, ctx); pkinit_fini_identity_opts(ctx->idopts); pkinit_fini_plg_crypto(ctx->cryptoctx); pkinit_fini_plg_opts(ctx->opts); Modified: trunk/src/plugins/preauth/pkinit/pkinit_srv.c =================================================================== --- trunk/src/plugins/preauth/pkinit/pkinit_srv.c 2009-08-10 05:02:43 UTC (rev 22513) +++ trunk/src/plugins/preauth/pkinit/pkinit_srv.c 2009-08-10 05:16:24 UTC (rev 22514) @@ -38,61 +38,15 @@ /* Remove when FAST PKINIT is settled. */ #include "../fast_factor.h" -static krb5_error_code -pkinit_server_get_edata(krb5_context context, - krb5_kdc_req * request, - struct _krb5_db_entry_new * client, - struct _krb5_db_entry_new * server, - preauth_get_entry_data_proc server_get_entry_data, - void *pa_plugin_context, - krb5_pa_data * data); - -static krb5_error_code -pkinit_server_verify_padata(krb5_context context, - struct _krb5_db_entry_new * client, - krb5_data *req_pkt, - krb5_kdc_req * request, - krb5_enc_tkt_part * enc_tkt_reply, - krb5_pa_data * data, - preauth_get_entry_data_proc server_get_entry_data, - void *pa_plugin_context, - void **pa_request_context, - krb5_data **e_data, - krb5_authdata ***authz_data); - -static krb5_error_code -pkinit_server_return_padata(krb5_context context, - krb5_pa_data * padata, - struct _krb5_db_entry_new * client, - krb5_data *req_pkt, - krb5_kdc_req * request, - krb5_kdc_rep * reply, - struct _krb5_key_data * client_key, - krb5_keyblock * encrypting_key, - krb5_pa_data ** send_pa, - preauth_get_entry_data_proc server_get_entry_data, - void *pa_plugin_context, - void **pa_request_context); - -static int pkinit_server_get_flags - (krb5_context kcontext, krb5_preauthtype patype); - static krb5_error_code pkinit_init_kdc_req_context (krb5_context, void **blob); static void pkinit_fini_kdc_req_context (krb5_context context, void *blob); -static int pkinit_server_plugin_init_realm - (krb5_context context, const char *realmname, - pkinit_kdc_context *pplgctx); - static void pkinit_server_plugin_fini_realm (krb5_context context, pkinit_kdc_context plgctx); -static int pkinit_server_plugin_init - (krb5_context context, void **blob, const char **realmnames); - static void pkinit_server_plugin_fini (krb5_context context, void *blob); From ghudson at MIT.EDU Mon Aug 10 01:26:05 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Mon, 10 Aug 2009 01:26:05 -0400 Subject: svn rev #22515: trunk/src/plugins/preauth/pkinit/ Message-ID: <200908100526.n7A5Q5jh014613@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22515 Commit By: ghudson Log Message: Narrow the contract of pkinit_client_profile by passing in the realm instead of the whole request. Changed Files: U trunk/src/plugins/preauth/pkinit/pkinit_clnt.c Modified: trunk/src/plugins/preauth/pkinit/pkinit_clnt.c =================================================================== --- trunk/src/plugins/preauth/pkinit/pkinit_clnt.c 2009-08-10 05:16:24 UTC (rev 22514) +++ trunk/src/plugins/preauth/pkinit/pkinit_clnt.c 2009-08-10 05:26:05 UTC (rev 22515) @@ -886,26 +886,26 @@ pkinit_client_profile(krb5_context context, pkinit_context plgctx, pkinit_req_context reqctx, - krb5_kdc_req *request) + const krb5_data *realm) { char *eku_string = NULL; pkiDebug("pkinit_client_profile %p %p %p %p\n", - context, plgctx, reqctx, request); + context, plgctx, reqctx, realm); - pkinit_libdefault_boolean(context, &request->server->realm, + pkinit_libdefault_boolean(context, realm, KRB5_CONF_PKINIT_WIN2K, reqctx->opts->win2k_target, &reqctx->opts->win2k_target); - pkinit_libdefault_boolean(context, &request->server->realm, + pkinit_libdefault_boolean(context, realm, KRB5_CONF_PKINIT_WIN2K_REQUIRE_BINDING, reqctx->opts->win2k_require_cksum, &reqctx->opts->win2k_require_cksum); - pkinit_libdefault_boolean(context, &request->server->realm, + pkinit_libdefault_boolean(context, realm, KRB5_CONF_PKINIT_REQUIRE_CRL_CHECKING, reqctx->opts->require_crl_checking, &reqctx->opts->require_crl_checking); - pkinit_libdefault_integer(context, &request->server->realm, + pkinit_libdefault_integer(context, realm, KRB5_CONF_PKINIT_DH_MIN_BITS, reqctx->opts->dh_size, &reqctx->opts->dh_size); @@ -916,7 +916,7 @@ reqctx->opts->dh_size, PKINIT_DEFAULT_DH_MIN_BITS); reqctx->opts->dh_size = PKINIT_DEFAULT_DH_MIN_BITS; } - pkinit_libdefault_string(context, &request->server->realm, + pkinit_libdefault_string(context, realm, KRB5_CONF_PKINIT_EKU_CHECKING, &eku_string); if (eku_string != NULL) { @@ -937,7 +937,7 @@ } #ifdef LONGHORN_BETA_COMPAT /* Temporarily just set global flag from config file */ - pkinit_libdefault_boolean(context, &request->server->realm, + pkinit_libdefault_boolean(context, realm, KRB5_CONF_PKINIT_LONGHORN, 0, &longhorn); @@ -945,16 +945,16 @@ /* Only process anchors here if they were not specified on command line */ if (reqctx->idopts->anchors == NULL) - pkinit_libdefault_strings(context, &request->server->realm, + pkinit_libdefault_strings(context, realm, KRB5_CONF_PKINIT_ANCHORS, &reqctx->idopts->anchors); - pkinit_libdefault_strings(context, &request->server->realm, + pkinit_libdefault_strings(context, realm, KRB5_CONF_PKINIT_POOL, &reqctx->idopts->intermediates); - pkinit_libdefault_strings(context, &request->server->realm, + pkinit_libdefault_strings(context, realm, KRB5_CONF_PKINIT_REVOKE, &reqctx->idopts->crls); - pkinit_libdefault_strings(context, &request->server->realm, + pkinit_libdefault_strings(context, realm, KRB5_CONF_PKINIT_IDENTITIES, &reqctx->idopts->identity_alt); } @@ -1028,7 +1028,8 @@ } if (processing_request) { - pkinit_client_profile(context, plgctx, reqctx, request); + pkinit_client_profile(context, plgctx, reqctx, + &request->server->realm); pkinit_identity_set_prompter(reqctx->idctx, prompter, prompter_data); retval = pkinit_identity_initialize(context, plgctx->cryptoctx, reqctx->cryptoctx, reqctx->idopts, From ghudson at MIT.EDU Mon Aug 10 15:12:47 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Mon, 10 Aug 2009 15:12:47 -0400 Subject: svn rev #22516: trunk/src/plugins/preauth/pkinit/ Message-ID: <200908101912.n7AJClXF019116@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22516 Commit By: ghudson Log Message: ticket: 6542 subject: Check for null characters in pkinit cert fields tags: pullup target_version: 1.7 When processing DNS names or MS UPNs in pkinit certs, disallow embedded null characters. Changed Files: U trunk/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c Modified: trunk/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c =================================================================== --- trunk/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2009-08-10 05:26:05 UTC (rev 22515) +++ trunk/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2009-08-10 19:12:47 UTC (rev 22516) @@ -1761,6 +1761,9 @@ } else if (upns != NULL && OBJ_cmp(plgctx->id_ms_san_upn, gen->d.otherName->type_id) == 0) { + /* Prevent abuse of embedded null characters. */ + if (memchr(name.data, '\0', name.length)) + break; ret = krb5_parse_name(context, name.data, &upns[u]); if (ret) { pkiDebug("%s: failed parsing ms-upn san value\n", @@ -1778,6 +1781,10 @@ break; case GEN_DNS: if (dnss != NULL) { + /* Prevent abuse of embedded null characters. */ + if (memchr(gen->d.dNSName->data, '\0', + gen->d.dNSName->length)) + break; pkiDebug("%s: found dns name = %s\n", __FUNCTION__, gen->d.dNSName->data); dnss[d] = (unsigned char *) From ghudson at MIT.EDU Mon Aug 10 15:35:34 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Mon, 10 Aug 2009 15:35:34 -0400 Subject: svn rev #22517: trunk/src/lib/crypto/crypto_tests/ Message-ID: <200908101935.n7AJZYvj021338@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22517 Commit By: ghudson Log Message: Correct the t_nfold build rules again. We don't have a simple way of plucking object files from other directories (we don't know for sure what extension to use), so build an nfold.o in this directory from the nfold.c in the ../krb source directory. Changed Files: U trunk/src/lib/crypto/crypto_tests/Makefile.in Modified: trunk/src/lib/crypto/crypto_tests/Makefile.in =================================================================== --- trunk/src/lib/crypto/crypto_tests/Makefile.in 2009-08-10 19:12:47 UTC (rev 22516) +++ trunk/src/lib/crypto/crypto_tests/Makefile.in 2009-08-10 19:35:34 UTC (rev 22517) @@ -79,9 +79,12 @@ # $(RUN_SETUP) $(VALGRIND) ./t_pkcs5 -t_nfold$(EXEEXT): t_nfold.$(OBJEXT) ../krb/nfold$(DYNOBJEXT) $(SUPPORT_DEPLIB) +t_nfold$(EXEEXT): t_nfold.$(OBJEXT) nfold.$(OBJEXT) $(SUPPORT_DEPLIB) $(CC_LINK) -o $@ t_nfold.$(OBJEXT) ../krb/nfold$(DYNOBJEXT) $(SUPPORT_LIB) +nfold.$(OBJEXT): $(srcdir)/../krb/nfold.c + $(CC) -c $(ALL_CFLAGS) $(srcdir)/../krb/nfold.c + t_encrypt$(EXEEXT): t_encrypt.$(OBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) $(CC_LINK) -o $@ t_encrypt.$(OBJEXT) -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) From raeburn at MIT.EDU Wed Aug 12 13:58:25 2009 From: raeburn at MIT.EDU (raeburn@MIT.EDU) Date: Wed, 12 Aug 2009 13:58:25 -0400 Subject: svn rev #22518: trunk/ src/kdc/ src/tests/dejagnu/krb-standalone/ Message-ID: <200908121758.n7CHwP1e005140@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22518 Commit By: raeburn Log Message: r22529 at squish: raeburn | 2009-08-12 13:49:45 -0400 . r22530 at squish: raeburn | 2009-08-12 13:55:57 -0400 Change KRBCONF_KDC_MODIFIES_KDB to a mostly run-time option. Change all code conditionals to test a new global variable, the initial value of which is based on KRBCONF_KDC_MODIFIES_KDB. There is currently no way to alter the value from the command line; that will presumably be desired later. Change initialize_realms to store db_args in a global variable. In process_as_req, call db_open instead of the old set_name + init. Don't reopen if an error is reported by krb5_db_fini. Add a test of running kinit with an incorrect password, to trigger a kdb update if enabled. r22531 at squish: raeburn | 2009-08-12 13:58:13 -0400 Fix trailing whitespace. Changed Files: _U trunk/ U trunk/src/kdc/do_as_req.c U trunk/src/kdc/extern.c U trunk/src/kdc/extern.h U trunk/src/kdc/main.c U trunk/src/tests/dejagnu/krb-standalone/standalone.exp Modified: trunk/src/kdc/do_as_req.c =================================================================== --- trunk/src/kdc/do_as_req.c 2009-08-10 19:35:34 UTC (rev 22517) +++ trunk/src/kdc/do_as_req.c 2009-08-12 17:58:24 UTC (rev 22518) @@ -393,20 +393,20 @@ if (errcode == KRB5KDC_ERR_PREAUTH_FAILED) get_preauth_hint_list(request, &client, &server, &e_data); -#ifdef KRBCONF_KDC_MODIFIES_KDB - /* - * Note: this doesn't work if you're using slave servers!!! - * It also causes the database to be modified (and thus - * need to be locked) frequently. - */ - if (client.fail_auth_count < KRB5_MAX_FAIL_COUNT) { - client.fail_auth_count = client.fail_auth_count + 1; - if (client.fail_auth_count == KRB5_MAX_FAIL_COUNT) { - client.attributes |= KRB5_KDB_DISALLOW_ALL_TIX; + if (kdc_modifies_kdb) { + /* + * Note: this doesn't work if you're using slave servers!!! + * It also causes the database to be modified (and thus + * need to be locked) frequently. + */ + if (client.fail_auth_count < KRB5_MAX_FAIL_COUNT) { + client.fail_auth_count = client.fail_auth_count + 1; + if (client.fail_auth_count == KRB5_MAX_FAIL_COUNT) { + client.attributes |= KRB5_KDB_DISALLOW_ALL_TIX; + } } + client.last_failed = kdc_time; } - client.last_failed = kdc_time; -#endif update_client = 1; status = "PREAUTH_FAILED"; #ifdef KRBCONF_VAGUE_ERRORS @@ -622,13 +622,13 @@ memset(reply.enc_part.ciphertext.data, 0, reply.enc_part.ciphertext.length); free(reply.enc_part.ciphertext.data); -#ifdef KRBCONF_KDC_MODIFIES_KDB - /* - * If we get this far, we successfully did the AS_REQ. - */ - client.last_success = kdc_time; - client.fail_auth_count = 0; -#endif /* KRBCONF_KDC_MODIFIES_KDB */ + if (kdc_modifies_kdb) { + /* + * If we get this far, we successfully did the AS_REQ. + */ + client.last_success = kdc_time; + client.fail_auth_count = 0; + } update_client = 1; log_as_req(from, request, &reply, &client, cname, &server, sname, @@ -684,21 +684,22 @@ if (sname != NULL) free(sname); if (c_nprincs) { -#ifdef KRBCONF_KDC_MODIFIES_KDB - if (update_client) { - krb5_db_put_principal(kdc_context, &client, &c_nprincs); - /* - * ptooey. We want krb5_db_sync() or something like that. - */ - krb5_db_fini(kdc_context); - if (kdc_active_realm->realm_dbname) - krb5_db_set_name(kdc_active_realm->realm_context, - kdc_active_realm->realm_dbname); - krb5_db_init(kdc_context); - /* Reset master key */ - krb5_db_set_mkey(kdc_context, &kdc_active_realm->realm_mkey); + if (kdc_modifies_kdb) { + if (update_client) { + krb5_error_code errcode2; + + krb5_db_put_principal(kdc_context, &client, &c_nprincs); + /* + * ptooey. We want krb5_db_sync() or something like that. + */ + errcode2 = krb5_db_fini(kdc_context); + if (errcode2 == 0) + errcode2 = krb5_db_open(kdc_context, db_args, + KRB5_KDB_OPEN_RW|KRB5_KDB_SRV_TYPE_KDC); + /* Reset master key */ + krb5_db_set_mkey(kdc_context, &kdc_active_realm->realm_mkey); + } } -#endif /* KRBCONF_KDC_MODIFIES_KDB */ krb5_db_free_principal(kdc_context, &client, c_nprincs); } if (s_nprincs) Modified: trunk/src/kdc/extern.c =================================================================== --- trunk/src/kdc/extern.c 2009-08-10 19:35:34 UTC (rev 22517) +++ trunk/src/kdc/extern.c 2009-08-12 17:58:24 UTC (rev 22518) @@ -38,6 +38,11 @@ krb5_timestamp kdc_infinity = KRB5_INT32_MAX; /* XXX */ krb5_rcache kdc_rcache = (krb5_rcache) NULL; krb5_keyblock psr_key; +#ifdef KRBCONF_KDC_MODIFIES_KDB +const int kdc_modifies_kdb = 1; +#else +const int kdc_modifies_kdb = 0; +#endif krb5_int32 max_dgram_reply_size = MAX_DGRAM_SIZE; volatile int signal_requests_exit = 0; /* gets set when signal hits */ Modified: trunk/src/kdc/extern.h =================================================================== --- trunk/src/kdc/extern.h 2009-08-10 19:35:34 UTC (rev 22517) +++ trunk/src/kdc/extern.h 2009-08-12 17:58:24 UTC (rev 22518) @@ -101,6 +101,8 @@ extern krb5_timestamp kdc_infinity; /* greater than all other timestamps */ extern krb5_rcache kdc_rcache; /* replay cache */ extern krb5_keyblock psr_key; /* key for predicted sam response */ +extern const int kdc_modifies_kdb; +extern char **db_args; extern krb5_int32 max_dgram_reply_size; /* maximum datagram size */ extern volatile int signal_requests_exit; Modified: trunk/src/kdc/main.c =================================================================== --- trunk/src/kdc/main.c 2009-08-10 19:35:34 UTC (rev 22517) +++ trunk/src/kdc/main.c 2009-08-12 17:58:24 UTC (rev 22518) @@ -381,11 +381,10 @@ } /* first open the database before doing anything */ -#ifdef KRBCONF_KDC_MODIFIES_KDB - kdb_open_flags = KRB5_KDB_OPEN_RW | KRB5_KDB_SRV_TYPE_KDC; -#else - kdb_open_flags = KRB5_KDB_OPEN_RO | KRB5_KDB_SRV_TYPE_KDC; -#endif + if (kdc_modifies_kdb) + kdb_open_flags = KRB5_KDB_OPEN_RW | KRB5_KDB_SRV_TYPE_KDC; + else + kdb_open_flags = KRB5_KDB_OPEN_RO | KRB5_KDB_SRV_TYPE_KDC; if ((kret = krb5_db_open(rdp->realm_context, db_args, kdb_open_flags))) { kdc_err(rdp->realm_context, kret, "while initializing database for realm %s", realm); @@ -558,6 +557,7 @@ return; } +char **db_args = NULL; void initialize_realms(krb5_context kcontext, int argc, char **argv) { @@ -574,7 +574,6 @@ char *default_tcp_ports = 0; krb5_pointer aprof; const char *hierarchy[3]; - char **db_args = NULL; char *no_refrls = NULL; char *host_based_srvcs = NULL; int db_args_size = 0; Modified: trunk/src/tests/dejagnu/krb-standalone/standalone.exp =================================================================== --- trunk/src/tests/dejagnu/krb-standalone/standalone.exp 2009-08-10 19:35:34 UTC (rev 22517) +++ trunk/src/tests/dejagnu/krb-standalone/standalone.exp 2009-08-12 17:58:24 UTC (rev 22518) @@ -74,6 +74,56 @@ } } +proc kinit_wrong_pw { name badpass } { + global REALMNAME + global KINIT + global spawn_id + + # Use kinit to get a ticket. + # + # For now always get forwardable tickets. Later when we need to make + # tests that distiguish between forwardable tickets and otherwise + # we should but another option to this proc. --proven + # + spawn $KINIT -5 -f $name@$REALMNAME + expect { + "Password for $name@$REALMNAME:" { + verbose "kinit started" + } + timeout { + fail "kinit bad pw" + return 0 + } + eof { + fail "kinit bad pw" + return 0 + } + } + send "$badpass\r" + expect { + "Password incorrect while getting initial credentials" { + } + timeout { + fail "kinit bad pw" + # kill it? + } + eof { + fail "kinit bad pw" + return + } + } + expect eof + + set status_list [wait -i $spawn_id] + catch "close -i $spawn_id" + verbose -log "exit status: $status_list" + if { [lindex $status_list 2] != 0 || [lindex $status_list 3] != 0 } { + pass "kinit bad pw" + } else { + fail "kinit bad pw" + } +} + proc doit { } { global REALMNAME global KLIST @@ -140,6 +190,9 @@ verbose "wait -i $spawn_id returned $k_stat (kadmin addpol)" catch "close -i $spawn_id" + # Test use of wrong password. + kinit_wrong_pw krbtest/admin wrongpassword + setup_kerberos_env client # Use kinit to get a ticket. if ![kinit krbtest/admin adminpass$KEY 1] { Property changes on: trunk ___________________________________________________________________ Name: svk:merge - 122d7f7f-0217-0410-a6d0-d37b9a318acc:/local/krb5/trunk:22385 304ed8f4-7412-0410-a0db-8249d8f37659:/my-branches/kdb-config:339 7730498b-6e33-413f-85a5-9d713b9baaee:/krb5/dev/1ac:533 7730498b-6e33-413f-85a5-9d713b9baaee:/krb5/dev/advisory:1726 7730498b-6e33-413f-85a5-9d713b9baaee:/krb5/dev/misc:1927 7730498b-6e33-413f-85a5-9d713b9baaee:/krb5/dev/sprintf:936 dc483132-0cff-0310-8789-dd5450dbe970:/branches/ccapi:18199 dc483132-0cff-0310-8789-dd5450dbe970:/branches/referrals/trunk:18581 f228080b-b206-47c0-aedc-518b743a947e:/krb5/dev/coverity:18 f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/asn1:1187 f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/asn1-encode-tests:1181 f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/ldap-patches-080218:908 f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/rcache-none-leak:1772 f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/threads-no-debug:832 f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/walk-rtree:767 f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/warnings:837 + 122d7f7f-0217-0410-a6d0-d37b9a318acc:/local/krb5/trunk:22385 304ed8f4-7412-0410-a0db-8249d8f37659:/my-branches/kdb-config:339 7730498b-6e33-413f-85a5-9d713b9baaee:/krb5/dev/1ac:533 7730498b-6e33-413f-85a5-9d713b9baaee:/krb5/dev/advisory:1726 7730498b-6e33-413f-85a5-9d713b9baaee:/krb5/dev/misc:1927 7730498b-6e33-413f-85a5-9d713b9baaee:/krb5/dev/sprintf:936 aa3b92db-c9d7-402f-bc2c-a27ec44e79f1:/krb5/dev/kdc-kdb-update:22531 dc483132-0cff-0310-8789-dd5450dbe970:/branches/ccapi:18199 dc483132-0cff-0310-8789-dd5450dbe970:/branches/referrals/trunk:18581 f228080b-b206-47c0-aedc-518b743a947e:/krb5/dev/coverity:18 f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/asn1:1187 f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/asn1-encode-tests:1181 f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/ldap-patches-080218:908 f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/rcache-none-leak:1772 f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/threads-no-debug:832 f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/walk-rtree:767 f8a82ec2-6512-0410-82e6-bb8077266e58:/krb5/dev/warnings:837 From ghudson at MIT.EDU Wed Aug 12 14:53:48 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Wed, 12 Aug 2009 14:53:48 -0400 Subject: svn rev #22519: trunk/src/appl/gssftp/ftpd/ Message-ID: <200908121853.n7CIrmkP010253@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22519 Commit By: ghudson Log Message: ticket: 6543 subject: Reply message ordering bug in ftpd tags: pullup target_version: 1.7 user() was replying to the user command and then calling login(), which could send a continuation reply if it fails to chdir to the user's homedir. Continuation replies must come before the actual reply; the mis-ordering was causing ftp and ftpd to deadlock. To fix the bug, invoke login() before reply() so that the continuation reply comes first. Changed Files: U trunk/src/appl/gssftp/ftpd/ftpd.c Modified: trunk/src/appl/gssftp/ftpd/ftpd.c =================================================================== --- trunk/src/appl/gssftp/ftpd/ftpd.c 2009-08-12 17:58:24 UTC (rev 22518) +++ trunk/src/appl/gssftp/ftpd/ftpd.c 2009-08-12 18:53:47 UTC (rev 22519) @@ -758,11 +758,10 @@ result = 331; } else result = 232; - reply(result, "%s", buf); - syslog(authorized ? LOG_INFO : LOG_ERR, "%s", buf); - if (result == 232) login(NULL, result); + reply(result, "%s", buf); + syslog(authorized ? LOG_INFO : LOG_ERR, "%s", buf); return; } From ghudson at MIT.EDU Thu Aug 13 14:48:46 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Thu, 13 Aug 2009 14:48:46 -0400 Subject: svn rev #22520: trunk/src/lib/crypto/krb/dk/ Message-ID: <200908131848.n7DImkr7011215@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22520 Commit By: ghudson Log Message: Fix lib/crypto/krb/dk/Makefile.in mydir value. Changed Files: U trunk/src/lib/crypto/krb/dk/Makefile.in Modified: trunk/src/lib/crypto/krb/dk/Makefile.in =================================================================== --- trunk/src/lib/crypto/krb/dk/Makefile.in 2009-08-12 18:53:47 UTC (rev 22519) +++ trunk/src/lib/crypto/krb/dk/Makefile.in 2009-08-13 18:48:46 UTC (rev 22520) @@ -1,6 +1,6 @@ thisconfigdir=../../../.. myfulldir=lib/crypto/krb/dk -mydir=lib/crypto/dk +mydir=lib/crypto/krb/dk BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../@CRYPTO_IMPL@ DEFS= From ghudson at MIT.EDU Thu Aug 13 17:25:55 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Thu, 13 Aug 2009 17:25:55 -0400 Subject: svn rev #22521: trunk/src/ config/ kadmin/ kadmin/server/ kadmin/testing/scripts/ ... Message-ID: <200908132125.n7DLPtue025359@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22521 Commit By: ghudson Log Message: ticket: 6544 subject: Remove kadmin v1 API support The kadmin v1 API and the even older ovsec_kadm_* API were legacy when kadmin was first incorporated in 1996, and compatibility with them is no longer believed to be necessary. The uninstalled kadmin/passwd has been removed (since it used the ovsec API). The test suite has been updated to use the v2 API where appropriate, and the parts specifically designed to test the old API have been excised. Changed Files: U trunk/src/config/pre.in U trunk/src/configure.in U trunk/src/kadmin/Makefile.in D trunk/src/kadmin/passwd/ U trunk/src/kadmin/server/Makefile.in U trunk/src/kadmin/server/misc.h U trunk/src/kadmin/server/ovsec_kadmd.c D trunk/src/kadmin/server/server_glue_v1.c U trunk/src/kadmin/server/server_stubs.c U trunk/src/kadmin/testing/scripts/env-setup.shin U trunk/src/kadmin/testing/scripts/init_db U trunk/src/kadmin/testing/scripts/make-host-keytab.plin U trunk/src/kadmin/testing/scripts/start_servers_local U trunk/src/kadmin/testing/util/Makefile.in U trunk/src/kadmin/testing/util/deps U trunk/src/kadmin/testing/util/tcl_kadm5.c U trunk/src/kadmin/testing/util/tcl_kadm5.h A trunk/src/kadmin/testing/util/tcl_kadm5_syntax D trunk/src/kadmin/testing/util/tcl_ovsec_kadm.c D trunk/src/kadmin/testing/util/tcl_ovsec_kadm_syntax U trunk/src/kadmin/testing/util/test.c U trunk/src/lib/kadm5/Makefile.in U trunk/src/lib/kadm5/admin.h U trunk/src/lib/kadm5/admin_internal.h U trunk/src/lib/kadm5/chpass_util_strings.et U trunk/src/lib/kadm5/clnt/client_init.c U trunk/src/lib/kadm5/clnt/client_principal.c U trunk/src/lib/kadm5/clnt/clnt_policy.c U trunk/src/lib/kadm5/clnt/libkadm5clnt.exports U trunk/src/lib/kadm5/kadm_rpc_xdr.c U trunk/src/lib/kadm5/misc_free.c D trunk/src/lib/kadm5/ovsec_glue.c U trunk/src/lib/kadm5/srv/libkadm5srv.exports U trunk/src/lib/kadm5/srv/server_init.c U trunk/src/lib/kadm5/srv/svr_misc_free.c U trunk/src/lib/kadm5/srv/svr_policy.c U trunk/src/lib/kadm5/srv/svr_principal.c U trunk/src/lib/kadm5/unit-test/Makefile.in D trunk/src/lib/kadm5/unit-test/README.new-tests D trunk/src/lib/kadm5/unit-test/api.0/ D trunk/src/lib/kadm5/unit-test/api.1/lock.exp U trunk/src/lib/kadm5/unit-test/config/unix.exp U trunk/src/lib/kadm5/unit-test/destroy-test.c U trunk/src/lib/kadm5/unit-test/handle-test.c U trunk/src/lib/kadm5/unit-test/init-test.c U trunk/src/lib/kadm5/unit-test/iter-test.c U trunk/src/lib/kadm5/unit-test/lib/lib.t U trunk/src/lib/kadm5/unit-test/lock-test.c U trunk/src/lib/kadm5/unit-test/randkey-test.c U trunk/src/lib/kadm5/unit-test/site.exp U trunk/src/lib/rpc/unit-test/lib/helpers.exp U trunk/src/lib/rpc/unit-test/rpc_test_setup.sh Modified: trunk/src/config/pre.in =================================================================== --- trunk/src/config/pre.in 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/config/pre.in 2009-08-13 21:25:54 UTC (rev 22521) @@ -235,8 +235,8 @@ MAKE_KEYTAB = $(TESTDIR)/scripts/make-host-keytab.pl LOCAL_MAKE_KEYTAB= $(TESTDIR)/scripts/make-host-keytab.pl ENV_SETUP = $(TESTDIR)/scripts/env-setup.sh -CLNTTCL = $(TESTDIR)/util/ovsec_kadm_clnt_tcl -SRVTCL = $(TESTDIR)/util/ovsec_kadm_srv_tcl +CLNTTCL = $(TESTDIR)/util/kadm5_clnt_tcl +SRVTCL = $(TESTDIR)/util/kadm5_srv_tcl # Dejagnu variables. # We have to set the host with --host so that setup_xfail will work. # If we don't set it, then the host type used is "native", which Modified: trunk/src/configure.in =================================================================== --- trunk/src/configure.in 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/configure.in 2009-08-13 21:25:54 UTC (rev 22521) @@ -1101,8 +1101,7 @@ clients clients/klist clients/kinit clients/kvno clients/kdestroy clients/kpasswd clients/ksu - kadmin kadmin/cli kadmin/dbutil kadmin/passwd - kadmin/passwd/unit-test kadmin/ktutil kadmin/server + kadmin kadmin/cli kadmin/dbutil kadmin/ktutil kadmin/server kadmin/testing kadmin/testing/scripts kadmin/testing/util appl Modified: trunk/src/kadmin/Makefile.in =================================================================== --- trunk/src/kadmin/Makefile.in 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/kadmin/Makefile.in 2009-08-13 21:25:54 UTC (rev 22521) @@ -2,7 +2,7 @@ myfulldir=kadmin mydir=kadmin BUILDTOP=$(REL).. -SUBDIRS = cli dbutil passwd ktutil server testing +SUBDIRS = cli dbutil ktutil server testing all:: Modified: trunk/src/kadmin/server/Makefile.in =================================================================== --- trunk/src/kadmin/server/Makefile.in 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/kadmin/server/Makefile.in 2009-08-13 21:25:54 UTC (rev 22521) @@ -13,8 +13,8 @@ PROG_RPATH=$(KRB5_LIBDIR) PROG = kadmind -OBJS = kadm_rpc_svc.o server_stubs.o ovsec_kadmd.o schpw.o misc.o server_glue_v1.o ipropd_svc.o network.o -SRCS = kadm_rpc_svc.c server_stubs.c ovsec_kadmd.c schpw.c misc.c server_glue_v1.c ipropd_svc.c network.c +OBJS = kadm_rpc_svc.o server_stubs.o ovsec_kadmd.o schpw.o misc.o ipropd_svc.o network.o +SRCS = kadm_rpc_svc.c server_stubs.c ovsec_kadmd.c schpw.c misc.c ipropd_svc.c network.c all:: $(PROG) Modified: trunk/src/kadmin/server/misc.h =================================================================== --- trunk/src/kadmin/server/misc.h 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/kadmin/server/misc.h 2009-08-13 21:25:54 UTC (rev 22521) @@ -45,14 +45,6 @@ kadm5_ret_t check_min_life(void *server_handle, krb5_principal principal, char *msg_ret, unsigned int msg_len); -kadm5_ret_t kadm5_get_principal_v1(void *server_handle, - krb5_principal principal, - kadm5_principal_ent_t_v1 *ent); - -kadm5_ret_t kadm5_get_policy_v1(void *server_handle, kadm5_policy_t name, - kadm5_policy_ent_t *ent); - - krb5_error_code process_chpw_request(krb5_context context, void *server_handle, char *realm, Modified: trunk/src/kadmin/server/ovsec_kadmd.c =================================================================== --- trunk/src/kadmin/server/ovsec_kadmd.c 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/kadmin/server/ovsec_kadmd.c 2009-08-13 21:25:54 UTC (rev 22521) @@ -89,14 +89,6 @@ gss_name_t gss_kadmin_name = NULL; void *global_server_handle; -/* - * This is a kludge, but the server needs these constants to be - * compatible with old clients. They are defined in , - * but only if USE_KADM5_API_VERSION == 1. - */ -#define OVSEC_KADM_ADMIN_SERVICE "ovsec_adm/admin" -#define OVSEC_KADM_CHANGEPW_SERVICE "ovsec_adm/changepw" - extern krb5_keyblock master_keyblock; extern krb5_keylist_node *master_keylist; @@ -210,7 +202,7 @@ { extern char *optarg; extern int optind, opterr; - int ret, oldnames = 0; + int ret; OM_uint32 OMret, major_status, minor_status; char *whoami; gss_buffer_desc in_buf; @@ -365,11 +357,7 @@ names[0].name = build_princ_name(KADM5_ADMIN_SERVICE, params.realm); names[1].name = build_princ_name(KADM5_CHANGEPW_SERVICE, params.realm); - names[2].name = build_princ_name(OVSEC_KADM_ADMIN_SERVICE, params.realm); - names[3].name = build_princ_name(OVSEC_KADM_CHANGEPW_SERVICE, - params.realm); - if (names[0].name == NULL || names[1].name == NULL || - names[2].name == NULL || names[3].name == NULL) { + if (names[0].name == NULL || names[1].name == NULL) { krb5_klog_syslog(LOG_ERR, "Cannot build GSS-API authentication names, " "failing."); @@ -424,13 +412,7 @@ exit(1); } - /* - * Try to acquire creds for the old OV services as well as the - * new names, but if that fails just fall back on the new names. - */ - if (svcauth_gssapi_set_names(names, 4) == TRUE) - oldnames++; - if (!oldnames && svcauth_gssapi_set_names(names, 2) == FALSE) { + if (svcauth_gssapi_set_names(names, 2) == FALSE) { krb5_klog_syslog(LOG_ERR, "Cannot set GSS-API authentication names (keytab not present?), " "failing."); @@ -447,12 +429,6 @@ in_buf.length = strlen(names[1].name) + 1; (void) gss_import_name(&OMret, &in_buf, nt_krb5_name_oid, &gss_changepw_name); - if (oldnames) { - in_buf.value = names[3].name; - in_buf.length = strlen(names[3].name) + 1; - (void) gss_import_name(&OMret, &in_buf, nt_krb5_name_oid, - &gss_oldchangepw_name); - } svcauth_gssapi_set_log_badauth_func(log_badauth, NULL); svcauth_gssapi_set_log_badverf_func(log_badverf, NULL); Deleted: trunk/src/kadmin/server/server_glue_v1.c Modified: trunk/src/kadmin/server/server_stubs.c =================================================================== --- trunk/src/kadmin/server/server_stubs.c 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/kadmin/server/server_stubs.c 2009-08-13 21:25:54 UTC (rev 22521) @@ -641,7 +641,6 @@ get_principal_2_svc(gprinc_arg *arg, struct svc_req *rqstp) { static gprinc_ret ret; - kadm5_principal_ent_t_v1 e; char *prime_arg, *funcname; gss_buffer_desc client_name, service_name; @@ -659,8 +658,7 @@ ret.api_version = handle->api_version; - funcname = handle->api_version == KADM5_API_VERSION_1 ? - "kadm5_get_principal (V1)" : "kadm5_get_principal"; + funcname = "kadm5_get_principal"; if (setup_gss_names(rqstp, &client_name, &service_name) < 0) { ret.code = KADM5_FAILURE; @@ -681,18 +679,8 @@ log_unauth(funcname, prime_arg, &client_name, &service_name, rqstp); } else { - if (handle->api_version == KADM5_API_VERSION_1) { - ret.code = kadm5_get_principal_v1((void *)handle, - arg->princ, &e); - if(ret.code == KADM5_OK) { - memcpy(&ret.rec, e, sizeof(kadm5_principal_ent_rec_v1)); - free(e); - } - } else { - ret.code = kadm5_get_principal((void *)handle, - arg->princ, &ret.rec, - arg->mask); - } + ret.code = kadm5_get_principal(handle, arg->princ, &ret.rec, + arg->mask); if( ret.code != 0 ) errmsg = krb5_get_error_message(handle->context, ret.code); @@ -1114,8 +1102,7 @@ ret.api_version = handle->api_version; - funcname = handle->api_version == KADM5_API_VERSION_1 ? - "kadm5_randkey_principal (V1)" : "kadm5_randkey_principal"; + funcname = "kadm5_randkey_principal"; if (setup_gss_names(rqstp, &client_name, &service_name) < 0) { ret.code = KADM5_FAILURE; @@ -1141,13 +1128,8 @@ } if(ret.code == KADM5_OK) { - if (handle->api_version == KADM5_API_VERSION_1) { - krb5_copy_keyblock_contents(handle->context, k, &ret.key); - krb5_free_keyblock(handle->context, k); - } else { - ret.keys = k; - ret.n_keys = nkeys; - } + ret.keys = k; + ret.n_keys = nkeys; } if(ret.code != KADM5_AUTH_CHANGEPW) { @@ -1191,8 +1173,7 @@ ret.api_version = handle->api_version; - funcname = handle->api_version == KADM5_API_VERSION_1 ? - "kadm5_randkey_principal (V1)" : "kadm5_randkey_principal"; + funcname = "kadm5_randkey_principal"; if (setup_gss_names(rqstp, &client_name, &service_name) < 0) { ret.code = KADM5_FAILURE; @@ -1224,13 +1205,8 @@ } if(ret.code == KADM5_OK) { - if (handle->api_version == KADM5_API_VERSION_1) { - krb5_copy_keyblock_contents(handle->context, k, &ret.key); - krb5_free_keyblock(handle->context, k); - } else { - ret.keys = k; - ret.n_keys = nkeys; - } + ret.keys = k; + ret.n_keys = nkeys; } if(ret.code != KADM5_AUTH_CHANGEPW) { @@ -1437,8 +1413,7 @@ ret.api_version = handle->api_version; - funcname = handle->api_version == KADM5_API_VERSION_1 ? - "kadm5_get_policy (V1)" : "kadm5_get_policy"; + funcname = "kadm5_get_policy"; if (setup_gss_names(rqstp, &client_name, &service_name) < 0) { ret.code = KADM5_FAILURE; @@ -1468,16 +1443,7 @@ } if (ret.code == KADM5_OK) { - if (handle->api_version == KADM5_API_VERSION_1) { - ret.code = kadm5_get_policy_v1((void *)handle, arg->name, &e); - if(ret.code == KADM5_OK) { - memcpy(&ret.rec, e, sizeof(kadm5_policy_ent_rec)); - free(e); - } - } else { - ret.code = kadm5_get_policy((void *)handle, arg->name, - &ret.rec); - } + ret.code = kadm5_get_policy(handle, arg->name, &ret.rec); if( ret.code != 0 ) errmsg = krb5_get_error_message(handle->context, ret.code); @@ -1632,10 +1598,8 @@ slen = service_name.length; trunc_name(&slen, &sdots); /* okay to cast lengths to int because trunc_name limits max value */ - krb5_klog_syslog(LOG_NOTICE, "Request: %s, %.*s%s, %s, " + krb5_klog_syslog(LOG_NOTICE, "Request: kadm5_init, %.*s%s, %s, " "client=%.*s%s, service=%.*s%s, addr=%s, flavor=%d", - (ret.api_version == KADM5_API_VERSION_1 ? - "kadm5_init (V1)" : "kadm5_init"), (int)clen, (char *)client_name.value, cdots, errmsg ? errmsg : "success", (int)clen, (char *)client_name.value, cdots, Modified: trunk/src/kadmin/testing/scripts/env-setup.shin =================================================================== --- trunk/src/kadmin/testing/scripts/env-setup.shin 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/kadmin/testing/scripts/env-setup.shin 2009-08-13 21:25:54 UTC (rev 22521) @@ -74,8 +74,8 @@ QUALNAME=$TESTDIR/scripts/qualname.pl; export QUALNAME TCLUTIL=$STESTDIR/tcl/util.t; export TCLUTIL BSDDB_DUMP=$TESTDIR/util/bsddb_dump; export BSDDB_DUMP -CLNTTCL=$TESTDIR/util/ovsec_kadm_clnt_tcl; export CLNTTCL -SRVTCL=$TESTDIR/util/ovsec_kadm_srv_tcl; export SRVTCL +CLNTTCL=$TESTDIR/util/kadm5_clnt_tcl; export CLNTTCL +SRVTCL=$TESTDIR/util/kadm5_srv_tcl; export SRVTCL KRB5_CONFIG=$K5ROOT/krb5.conf; export KRB5_CONFIG KRB5_KDC_PROFILE=$K5ROOT/kdc.conf; export KRB5_KDC_PROFILE Modified: trunk/src/kadmin/testing/scripts/init_db =================================================================== --- trunk/src/kadmin/testing/scripts/init_db 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/kadmin/testing/scripts/init_db 2009-08-13 21:25:54 UTC (rev 22521) @@ -42,7 +42,7 @@ DUMMY=${TESTDIR=$TOP/testing}; export TESTDIR DUMMY=${STESTDIR=$STOP/testing} -DUMMY=${SRVTCL=$TESTDIR/util/ovsec_kadm_srv_tcl}; export SRVTCL +DUMMY=${SRVTCL=$TESTDIR/util/kadm5_srv_tcl}; export SRVTCL DUMMY=${TCLUTIL=$STESTDIR/tcl/util.t}; export TCLUTIL DUMMY=${LOCAL_MAKE_KEYTAB=$TESTDIR/scripts/make-host-keytab.pl} @@ -101,81 +101,82 @@ } set cmds { - {ovsec_kadm_init $env(SRVTCL) mrroot null $r $OVSEC_KADM_STRUCT_VERSION \ - $OVSEC_KADM_API_VERSION_1 server_handle} + {kadm5_init $env(SRVTCL) mrroot null \ + [config_params {KADM5_CONFIG_REALM} $r] $KADM5_STRUCT_VERSION \ + $KADM5_API_VERSION_2 server_handle} - {ovsec_kadm_create_policy $server_handle "test-pol 0 10000 8 2 3 0" \ - {OVSEC_KADM_POLICY OVSEC_KADM_PW_MIN_LENGTH OVSEC_KADM_PW_MIN_CLASSES OVSEC_KADM_PW_MAX_LIFE OVSEC_KADM_PW_HISTORY_NUM}} - {ovsec_kadm_create_policy $server_handle "once-a-min 10 0 0 0 0 0" \ - {OVSEC_KADM_POLICY OVSEC_KADM_PW_MIN_LIFE}} - {ovsec_kadm_create_policy $server_handle "dict-only 0 0 0 0 0 0" \ - {OVSEC_KADM_POLICY}} - {ovsec_kadm_create_policy $server_handle [simple_policy test-pol-nopw] \ - {OVSEC_KADM_POLICY}} + {kadm5_create_policy $server_handle "test-pol 0 10000 8 2 3 0" \ + {KADM5_POLICY KADM5_PW_MIN_LENGTH KADM5_PW_MIN_CLASSES KADM5_PW_MAX_LIFE KADM5_PW_HISTORY_NUM}} + {kadm5_create_policy $server_handle "once-a-min 10 0 0 0 0 0" \ + {KADM5_POLICY KADM5_PW_MIN_LIFE}} + {kadm5_create_policy $server_handle "dict-only 0 0 0 0 0 0" \ + {KADM5_POLICY}} + {kadm5_create_policy $server_handle [simple_policy test-pol-nopw] \ + {KADM5_POLICY}} - {ovsec_kadm_create_principal $server_handle \ - [simple_principal testuser@$r] {OVSEC_KADM_PRINCIPAL} notathena} - {ovsec_kadm_create_principal $server_handle \ - [simple_principal test1@$r] {OVSEC_KADM_PRINCIPAL} test1} - {ovsec_kadm_create_principal $server_handle \ - [simple_principal test2@$r] {OVSEC_KADM_PRINCIPAL} test2} - {ovsec_kadm_create_principal $server_handle \ - [simple_principal test3@$r] {OVSEC_KADM_PRINCIPAL} test3} - {ovsec_kadm_create_principal $server_handle \ - [simple_principal admin@$r] {OVSEC_KADM_PRINCIPAL} admin} - {ovsec_kadm_create_principal $server_handle \ - [simple_principal admin/get@$r] {OVSEC_KADM_PRINCIPAL} admin} - {ovsec_kadm_create_principal $server_handle \ - [simple_principal admin/modify@$r] {OVSEC_KADM_PRINCIPAL} admin} - {ovsec_kadm_create_principal $server_handle \ - [simple_principal admin/delete@$r] {OVSEC_KADM_PRINCIPAL} admin} - {ovsec_kadm_create_principal $server_handle \ - [simple_principal admin/add@$r] {OVSEC_KADM_PRINCIPAL} admin} - {ovsec_kadm_create_principal $server_handle \ - [simple_principal admin/none@$r] {OVSEC_KADM_PRINCIPAL} admin} - {ovsec_kadm_create_principal $server_handle \ - [simple_principal admin/rename@$r] {OVSEC_KADM_PRINCIPAL} admin} - {ovsec_kadm_create_principal $server_handle \ - [simple_principal admin/mod-add@$r] {OVSEC_KADM_PRINCIPAL} admin} - {ovsec_kadm_create_principal $server_handle \ - [simple_principal admin/mod-delete@$r] {OVSEC_KADM_PRINCIPAL} \ + {kadm5_create_principal $server_handle \ + [simple_principal testuser@$r] {KADM5_PRINCIPAL} notathena} + {kadm5_create_principal $server_handle \ + [simple_principal test1@$r] {KADM5_PRINCIPAL} test1} + {kadm5_create_principal $server_handle \ + [simple_principal test2@$r] {KADM5_PRINCIPAL} test2} + {kadm5_create_principal $server_handle \ + [simple_principal test3@$r] {KADM5_PRINCIPAL} test3} + {kadm5_create_principal $server_handle \ + [simple_principal admin@$r] {KADM5_PRINCIPAL} admin} + {kadm5_create_principal $server_handle \ + [simple_principal admin/get@$r] {KADM5_PRINCIPAL} admin} + {kadm5_create_principal $server_handle \ + [simple_principal admin/modify@$r] {KADM5_PRINCIPAL} admin} + {kadm5_create_principal $server_handle \ + [simple_principal admin/delete@$r] {KADM5_PRINCIPAL} admin} + {kadm5_create_principal $server_handle \ + [simple_principal admin/add@$r] {KADM5_PRINCIPAL} admin} + {kadm5_create_principal $server_handle \ + [simple_principal admin/none@$r] {KADM5_PRINCIPAL} admin} + {kadm5_create_principal $server_handle \ + [simple_principal admin/rename@$r] {KADM5_PRINCIPAL} admin} + {kadm5_create_principal $server_handle \ + [simple_principal admin/mod-add@$r] {KADM5_PRINCIPAL} admin} + {kadm5_create_principal $server_handle \ + [simple_principal admin/mod-delete@$r] {KADM5_PRINCIPAL} \ admin} - {ovsec_kadm_create_principal $server_handle \ - [simple_principal admin/get-add@$r] {OVSEC_KADM_PRINCIPAL} admin} - {ovsec_kadm_create_principal $server_handle \ - [simple_principal admin/get-delete@$r] {OVSEC_KADM_PRINCIPAL} \ + {kadm5_create_principal $server_handle \ + [simple_principal admin/get-add@$r] {KADM5_PRINCIPAL} admin} + {kadm5_create_principal $server_handle \ + [simple_principal admin/get-delete@$r] {KADM5_PRINCIPAL} \ admin} - {ovsec_kadm_create_principal $server_handle \ - [simple_principal admin/get-mod@$r] {OVSEC_KADM_PRINCIPAL} admin} - {ovsec_kadm_create_principal $server_handle \ - [simple_principal admin/no-add@$r] {OVSEC_KADM_PRINCIPAL} admin} - {ovsec_kadm_create_principal $server_handle \ - [simple_principal admin/no-delete@$r] {OVSEC_KADM_PRINCIPAL} admin} - {ovsec_kadm_create_principal $server_handle \ - [princ_w_pol pol1@$r test-pol] {OVSEC_KADM_PRINCIPAL \ - OVSEC_KADM_POLICY} pol111111} - {ovsec_kadm_create_principal $server_handle \ - [princ_w_pol pol2@$r once-a-min] {OVSEC_KADM_PRINCIPAL \ - OVSEC_KADM_POLICY} pol222222} - {ovsec_kadm_create_principal $server_handle \ - [princ_w_pol pol3@$r dict-only] {OVSEC_KADM_PRINCIPAL \ - OVSEC_KADM_POLICY} pol333333} - {ovsec_kadm_create_principal $server_handle \ + {kadm5_create_principal $server_handle \ + [simple_principal admin/get-mod@$r] {KADM5_PRINCIPAL} admin} + {kadm5_create_principal $server_handle \ + [simple_principal admin/no-add@$r] {KADM5_PRINCIPAL} admin} + {kadm5_create_principal $server_handle \ + [simple_principal admin/no-delete@$r] {KADM5_PRINCIPAL} admin} + {kadm5_create_principal $server_handle \ + [princ_w_pol pol1@$r test-pol] {KADM5_PRINCIPAL \ + KADM5_POLICY} pol111111} + {kadm5_create_principal $server_handle \ + [princ_w_pol pol2@$r once-a-min] {KADM5_PRINCIPAL \ + KADM5_POLICY} pol222222} + {kadm5_create_principal $server_handle \ + [princ_w_pol pol3@$r dict-only] {KADM5_PRINCIPAL \ + KADM5_POLICY} pol333333} + {kadm5_create_principal $server_handle \ [princ_w_pol admin/get-pol@$r test-pol-nopw] \ - {OVSEC_KADM_PRINCIPAL OVSEC_KADM_POLICY} StupidAdmin} - {ovsec_kadm_create_principal $server_handle \ - [princ_w_pol admin/pol@$r test-pol-nopw] {OVSEC_KADM_PRINCIPAL \ - OVSEC_KADM_POLICY} StupidAdmin} + {KADM5_PRINCIPAL KADM5_POLICY} StupidAdmin} + {kadm5_create_principal $server_handle \ + [princ_w_pol admin/pol@$r test-pol-nopw] {KADM5_PRINCIPAL \ + KADM5_POLICY} StupidAdmin} - {ovsec_kadm_create_principal $server_handle \ + {kadm5_create_principal $server_handle \ [simple_principal changepw/kerberos] \ - {OVSEC_KADM_PRINCIPAL} {XXX THIS IS WRONG}} + {KADM5_PRINCIPAL} {XXX THIS IS WRONG}} - {ovsec_kadm_create_principal $server_handle \ + {kadm5_create_principal $server_handle \ [simple_principal $whoami] \ - {OVSEC_KADM_PRINCIPAL} $whoami} + {KADM5_PRINCIPAL} $whoami} - {ovsec_kadm_destroy $server_handle} + {kadm5_destroy $server_handle} } foreach cmd $cmds { Modified: trunk/src/kadmin/testing/scripts/make-host-keytab.plin =================================================================== --- trunk/src/kadmin/testing/scripts/make-host-keytab.plin 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/kadmin/testing/scripts/make-host-keytab.plin 2009-08-13 21:25:54 UTC (rev 22521) @@ -67,7 +67,7 @@ $top = $ENV{'TOP'} if (! $top); $TESTDIR = ($ENV{'TESTDIR'} || "$top/testing"); $MAKE_KEYTAB = ($ENV{'MAKE_KEYTAB'} || "$TESTDIR/scripts/$whoami"); -$SRVTCL = ($ENV{'SRVTCL'} || "$TESTDIR/util/ovsec_kadm_srv_tcl"); +$SRVTCL = ($ENV{'SRVTCL'} || "$TESTDIR/util/kadm5_srv_tcl"); $TCLUTIL = ($ENV{'TCLUTIL'} || "$TESTDIR/tcl/util.t"); # This'll be wrong sometimes $RSH_CMD = ($ENV{'RSH_CMD'} || '/usr/ucb/rsh'); Modified: trunk/src/kadmin/testing/scripts/start_servers_local =================================================================== --- trunk/src/kadmin/testing/scripts/start_servers_local 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/kadmin/testing/scripts/start_servers_local 2009-08-13 21:25:54 UTC (rev 22521) @@ -3,7 +3,7 @@ DUMMY=${TESTDIR=$TOP/testing} DUMMY=${STESTDIR=$STOP/testing} DUMMY=${INITDB=$STESTDIR/scripts/init_db} -DUMMY=${SRVTCL=$TESTDIR/util/ovsec_kadm_srv_tcl}; export SRVTCL +DUMMY=${SRVTCL=$TESTDIR/util/kadm5_srv_tcl}; export SRVTCL DUMMY=${LOCAL_MAKE_KEYTAB=$TESTDIR/scripts/make-host-keytab.pl} DUMMY=${STOP_SERVERS_LOCAL=$STESTDIR/scripts/stop_servers_local} DUMMY=${KRB5RCACHEDIR=$TESTDIR} ; export KRB5RCACHEDIR @@ -81,11 +81,12 @@ source $env(STOP)/testing/tcl/util.t set r $env(REALM) set q $env(QUALNAME) - puts stdout [ovsec_kadm_init $env(SRVTCL) mrroot null $r \ - $OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 server_handle] - puts stdout [ovsec_kadm_create_principal $server_handle \ - [simple_principal host/$q@$r] {OVSEC_KADM_PRINCIPAL} notathena] - puts stdout [ovsec_kadm_destroy $server_handle] + puts stdout [kadm5_init $env(SRVTCL) mrroot null \ + [config_params {KADM5_CONFIG_REALM} $r] \ + $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 server_handle] + puts stdout [kadm5_create_principal $server_handle \ + [simple_principal host/$q@$r] {KADM5_PRINCIPAL} notathena] + puts stdout [kadm5_destroy $server_handle] } err]} { puts stderr "initialization error: $err" exit 1 Modified: trunk/src/kadmin/testing/util/Makefile.in =================================================================== --- trunk/src/kadmin/testing/util/Makefile.in 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/kadmin/testing/util/Makefile.in 2009-08-13 21:25:54 UTC (rev 22521) @@ -12,11 +12,11 @@ PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH) PROG_RPATH=$(KRB5_LIBDIR)$(TCL_RPATH) -SRCS = $(srcdir)/tcl_ovsec_kadm.c $(srcdir)/tcl_kadm5.c $(srcdir)/test.c -OBJS = tcl_ovsec_kadm.o tcl_kadm5.o test.o +SRCS = $(srcdir)/tcl_kadm5.c $(srcdir)/test.c +OBJS = tcl_kadm5.o test.o -CLNTPROG= ovsec_kadm_clnt_tcl -SRVPROG = ovsec_kadm_srv_tcl +CLNTPROG= kadm5_clnt_tcl +SRVPROG = kadm5_srv_tcl DO_ALL=@DO_ALL@ Modified: trunk/src/kadmin/testing/util/deps =================================================================== --- trunk/src/kadmin/testing/util/deps 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/kadmin/testing/util/deps 2009-08-13 21:25:54 UTC (rev 22521) @@ -1,17 +1,6 @@ # # Generated makefile dependencies follow. # -$(OUTPRE)tcl_ovsec_kadm.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/types.h \ - $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ - $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/krb5/krb5.h \ - $(BUILDTOP)/lib/kdb/adb_err.h $(COM_ERR_DEPS) $(SRCTOP)/include/gssrpc/auth.h \ - $(SRCTOP)/include/gssrpc/auth_gss.h $(SRCTOP)/include/gssrpc/auth_unix.h \ - $(SRCTOP)/include/gssrpc/clnt.h $(SRCTOP)/include/gssrpc/rename.h \ - $(SRCTOP)/include/gssrpc/rpc.h $(SRCTOP)/include/gssrpc/rpc_msg.h \ - $(SRCTOP)/include/gssrpc/svc.h $(SRCTOP)/include/gssrpc/svc_auth.h \ - $(SRCTOP)/include/gssrpc/xdr.h $(SRCTOP)/include/kdb.h \ - $(SRCTOP)/include/krb5.h tcl_kadm5.h tcl_ovsec_kadm.c $(OUTPRE)tcl_kadm5.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/types.h \ $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ Modified: trunk/src/kadmin/testing/util/tcl_kadm5.c =================================================================== --- trunk/src/kadmin/testing/util/tcl_kadm5.c 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/kadmin/testing/util/tcl_kadm5.c 2009-08-13 21:25:54 UTC (rev 22521) @@ -123,13 +123,6 @@ } do { - /* - * Handles from ovsec_kadm_init() and kadm5_init() should not - * be mixed during unit tests, but the API would happily - * accept them. Making the hash entry names different in - * tcl_kadm.c and tcl_ovsec_kadm.c ensures that GET_HANDLE - * will fail if presented a handle from the other API. - */ sprintf(buf, "kadm5_handle%d", i); entry = Tcl_CreateHashEntry(struct_table, buf, &newPtr); i++; @@ -152,11 +145,7 @@ else { if (! (struct_table && (entry = Tcl_FindHashEntry(struct_table, name)))) { - if (strncmp(name, "ovsec_kadm_handle", 17) == 0) - Tcl_AppendResult(interp, "ovsec_kadm handle " - "specified for kadm5 api: ", name, 0); - else - Tcl_AppendResult(interp, "unknown server handle ", name, 0); + Tcl_AppendResult(interp, "unknown server handle ", name, 0); return TCL_ERROR; } *handle = (void *) Tcl_GetHashValue(entry); @@ -2497,8 +2486,6 @@ KADM5_CHANGEPW_SERVICE, TCL_GLOBAL_ONLY); (void) sprintf(buf, "%d", KADM5_STRUCT_VERSION); Tcl_SetVar(interp, "KADM5_STRUCT_VERSION", buf, TCL_GLOBAL_ONLY); - (void) sprintf(buf, "%d", KADM5_API_VERSION_1); - Tcl_SetVar(interp, "KADM5_API_VERSION_1", buf, TCL_GLOBAL_ONLY); (void) sprintf(buf, "%d", KADM5_API_VERSION_2); Tcl_SetVar(interp, "KADM5_API_VERSION_2", buf, TCL_GLOBAL_ONLY); (void) sprintf(buf, "%d", KADM5_API_VERSION_MASK); Modified: trunk/src/kadmin/testing/util/tcl_kadm5.h =================================================================== --- trunk/src/kadmin/testing/util/tcl_kadm5.h 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/kadmin/testing/util/tcl_kadm5.h 2009-08-13 21:25:54 UTC (rev 22521) @@ -1,4 +1,3 @@ void Tcl_kadm5_init(Tcl_Interp *interp); -void Tcl_ovsec_kadm_init(Tcl_Interp *interp); Copied: trunk/src/kadmin/testing/util/tcl_kadm5_syntax (from rev 22500, trunk/src/kadmin/testing/util/tcl_ovsec_kadm_syntax) =================================================================== --- trunk/src/kadmin/testing/util/tcl_ovsec_kadm_syntax 2009-08-07 16:30:48 UTC (rev 22500) +++ trunk/src/kadmin/testing/util/tcl_kadm5_syntax 2009-08-13 21:25:54 UTC (rev 22521) @@ -0,0 +1,57 @@ +Here's a brief summary of the syntax of the tcl versions of the +kadm5 functions: + +string Can be a string or "null" which will turn into a null pointer +principal_ent A 12-field list in the order of the principal_ent + structure: {string number number number number string + number mask number number string mask} + It can also be "null", like a string, to indicate that + a null structure pointer should be used. +mask Either a number, representing the actual value of the + mask, or a sequence of symbols in a list. Example: + {PRINCIPAL ATTRIBUTES} is a valid principal mask. +boolean "1", "0", "true", "false", etc. +varname The name of a Tcl variable, or "null" to not assign. +policy_ent Similar to principal_ent, but with seven fields, + instead of 12. The first is a string, and the rest + are numbers. + +init + client_name:string pass:string service_name:string + realm:string struct_version:int api_version:int + server_handle_ret:varname +destroy + server_handle:string +create_principal + server_handle:string principal:principal_ent + mask:principal_mask password:string +delete_principal + server_handle:string name:string +modify_principal + server_handle:string principal_principal_ent + mask:principal_mask +rename_principal + server_handle:string source:string target:string +chpass_principal + server_handle:string name:string password:string +chpass_principal_util + server_handle:string name:string password:string + pw_ret:varname msg_ret:varname +randkey_principal + server_handle:string name:string keyblock_var:varname +get_principal [-struct] + server_handle:string name:string princ_var:varname +create_policy + server_handle:string policy:policy_ent mask:policy_mask +delete_policy + server_handle:string name:string +modify_policy + server_handle:string policy:policy_ent mask:policy_mask +get_policy [-struct] + server_handle:string name:string policy_var:varname +free_principal_ent + server_handle:string handle:string +free_policy_ent + server_handle:string handle:string +get_privs + server_handle:string privs:priv_var Deleted: trunk/src/kadmin/testing/util/tcl_ovsec_kadm.c Deleted: trunk/src/kadmin/testing/util/tcl_ovsec_kadm_syntax Modified: trunk/src/kadmin/testing/util/test.c =================================================================== --- trunk/src/kadmin/testing/util/test.c 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/kadmin/testing/util/test.c 2009-08-13 21:25:54 UTC (rev 22521) @@ -31,7 +31,6 @@ int Tcl_AppInit(Tcl_Interp *interp) { - Tcl_ovsec_kadm_init(interp); Tcl_kadm5_init(interp); return(TCL_OK); Modified: trunk/src/lib/kadm5/Makefile.in =================================================================== --- trunk/src/lib/kadm5/Makefile.in 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/Makefile.in 2009-08-13 21:25:54 UTC (rev 22521) @@ -19,7 +19,6 @@ SRCS = kadm_err.c \ chpass_util_strings.c \ - $(srcdir)/ovsec_glue.c \ $(srcdir)/misc_free.c \ $(srcdir)/kadm_rpc_xdr.c \ $(srcdir)/chpass_util.c \ @@ -29,7 +28,6 @@ OBJS = kadm_err.$(OBJEXT) \ chpass_util_strings.$(OBJEXT) \ - ovsec_glue.$(OBJEXT) \ misc_free.$(OBJEXT) \ kadm_rpc_xdr.$(OBJEXT) \ chpass_util.$(OBJEXT) \ @@ -40,7 +38,6 @@ STLIBOBJS = \ kadm_err.o \ chpass_util_strings.o \ - ovsec_glue.o \ misc_free.o \ kadm_rpc_xdr.o \ chpass_util.o \ Modified: trunk/src/lib/kadm5/admin.h =================================================================== --- trunk/src/lib/kadm5/admin.h 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/admin.h 2009-08-13 21:25:54 UTC (rev 22521) @@ -37,17 +37,11 @@ * releases (e.g. from 1.7 to 1.8). * - We will make some effort to avoid making incompatible changes for * bugfix releases, but will make them if necessary. - * - We make no commitments at all regarding the v1 API (obtained by - * defining USE_KADM5_API_VERSION to 1) and expect to remove it. */ #ifndef __KADM5_ADMIN_H__ #define __KADM5_ADMIN_H__ -#if !defined(USE_KADM5_API_VERSION) -#define USE_KADM5_API_VERSION 2 -#endif - #include #include #include @@ -181,10 +175,9 @@ #define KADM5_STRUCT_VERSION KADM5_STRUCT_VERSION_1 #define KADM5_API_VERSION_MASK 0x12345700 -#define KADM5_API_VERSION_1 (KADM5_API_VERSION_MASK|0x01) #define KADM5_API_VERSION_2 (KADM5_API_VERSION_MASK|0x02) -typedef struct _kadm5_principal_ent_t_v2 { +typedef struct _kadm5_principal_ent_t { krb5_principal principal; krb5_timestamp princ_expire_time; krb5_timestamp last_pwd_change; @@ -207,31 +200,8 @@ krb5_int16 n_tl_data; krb5_tl_data *tl_data; krb5_key_data *key_data; -} kadm5_principal_ent_rec_v2, *kadm5_principal_ent_t_v2; +} kadm5_principal_ent_rec, *kadm5_principal_ent_t; -typedef struct _kadm5_principal_ent_t_v1 { - krb5_principal principal; - krb5_timestamp princ_expire_time; - krb5_timestamp last_pwd_change; - krb5_timestamp pw_expiration; - krb5_deltat max_life; - krb5_principal mod_name; - krb5_timestamp mod_date; - krb5_flags attributes; - krb5_kvno kvno; - krb5_kvno mkvno; - char *policy; - long aux_attributes; -} kadm5_principal_ent_rec_v1, *kadm5_principal_ent_t_v1; - -#if USE_KADM5_API_VERSION == 1 -typedef struct _kadm5_principal_ent_t_v1 - kadm5_principal_ent_rec, *kadm5_principal_ent_t; -#else -typedef struct _kadm5_principal_ent_t_v2 - kadm5_principal_ent_rec, *kadm5_principal_ent_t; -#endif - typedef struct _kadm5_policy_ent_t { char *policy; long pw_min_life; @@ -330,7 +300,6 @@ * functions */ -#if USE_KADM5_API_VERSION > 1 krb5_error_code kadm5_get_config_params(krb5_context context, int use_kdc_config, kadm5_config_params *params_in, @@ -344,15 +313,10 @@ krb5_error_code kadm5_get_admin_service_name(krb5_context, char *, char *, size_t); -#endif kadm5_ret_t kadm5_init(char *client_name, char *pass, char *service_name, -#if USE_KADM5_API_VERSION == 1 - char *realm, -#else kadm5_config_params *params, -#endif krb5_ui_4 struct_version, krb5_ui_4 api_version, char **db_args, @@ -360,11 +324,7 @@ kadm5_ret_t kadm5_init_with_password(char *client_name, char *pass, char *service_name, -#if USE_KADM5_API_VERSION == 1 - char *realm, -#else kadm5_config_params *params, -#endif krb5_ui_4 struct_version, krb5_ui_4 api_version, char **db_args, @@ -372,16 +332,11 @@ kadm5_ret_t kadm5_init_with_skey(char *client_name, char *keytab, char *service_name, -#if USE_KADM5_API_VERSION == 1 - char *realm, -#else kadm5_config_params *params, -#endif krb5_ui_4 struct_version, krb5_ui_4 api_version, char **db_args, void **server_handle); -#if USE_KADM5_API_VERSION > 1 kadm5_ret_t kadm5_init_with_creds(char *client_name, krb5_ccache cc, char *service_name, @@ -390,7 +345,6 @@ krb5_ui_4 api_version, char **db_args, void **server_handle); -#endif kadm5_ret_t kadm5_lock(void *server_handle); kadm5_ret_t kadm5_unlock(void *server_handle); kadm5_ret_t kadm5_flush(void *server_handle); @@ -411,16 +365,10 @@ long mask); kadm5_ret_t kadm5_rename_principal(void *server_handle, krb5_principal,krb5_principal); -#if USE_KADM5_API_VERSION == 1 kadm5_ret_t kadm5_get_principal(void *server_handle, krb5_principal principal, - kadm5_principal_ent_t *ent); -#else -kadm5_ret_t kadm5_get_principal(void *server_handle, - krb5_principal principal, kadm5_principal_ent_t ent, long mask); -#endif kadm5_ret_t kadm5_chpass_principal(void *server_handle, krb5_principal principal, char *pass); @@ -430,13 +378,8 @@ int n_ks_tuple, krb5_key_salt_tuple *ks_tuple, char *pass); -#if USE_KADM5_API_VERSION == 1 kadm5_ret_t kadm5_randkey_principal(void *server_handle, krb5_principal principal, - krb5_keyblock **keyblock); -#else -kadm5_ret_t kadm5_randkey_principal(void *server_handle, - krb5_principal principal, krb5_keyblock **keyblocks, int *n_keys); kadm5_ret_t kadm5_randkey_principal_3(void *server_handle, @@ -446,7 +389,6 @@ krb5_key_salt_tuple *ks_tuple, krb5_keyblock **keyblocks, int *n_keys); -#endif kadm5_ret_t kadm5_setv4key_principal(void *server_handle, krb5_principal principal, krb5_keyblock *keyblock); @@ -496,15 +438,9 @@ kadm5_ret_t kadm5_modify_policy_internal(void *server_handle, kadm5_policy_ent_t entry, long mask); -#if USE_KADM5_API_VERSION == 1 kadm5_ret_t kadm5_get_policy(void *server_handle, kadm5_policy_t policy, - kadm5_policy_ent_t *ent); -#else -kadm5_ret_t kadm5_get_policy(void *server_handle, - kadm5_policy_t policy, kadm5_policy_ent_t ent); -#endif kadm5_ret_t kadm5_get_privs(void *server_handle, long *privs); @@ -529,11 +465,9 @@ char *exp, char ***pols, int *count); -#if USE_KADM5_API_VERSION > 1 kadm5_ret_t kadm5_free_key_data(void *server_handle, krb5_int16 *n_key_data, krb5_key_data *key_data); -#endif kadm5_ret_t kadm5_free_name_list(void *server_handle, char **names, int count); @@ -552,256 +486,6 @@ krb5_keyblock **keyblocks, int *n_keys); -#if USE_KADM5_API_VERSION == 1 -/* - * OVSEC_KADM_API_VERSION_1 should be, if possible, compile-time - * compatible with KADM5_API_VERSION_2. Basically, this means we have - * to continue to provide all the old ovsec_kadm function and symbol - * names. - */ - -#define OVSEC_KADM_ACLFILE "/krb5/ovsec_adm.acl" -#define OVSEC_KADM_WORDFILE "/krb5/ovsec_adm.dict" - -#define OVSEC_KADM_ADMIN_SERVICE "ovsec_adm/admin" -#define OVSEC_KADM_CHANGEPW_SERVICE "ovsec_adm/changepw" -#define OVSEC_KADM_HIST_PRINCIPAL "ovsec_adm/history" - -typedef krb5_principal ovsec_kadm_princ_t; -typedef krb5_keyblock ovsec_kadm_keyblock; -typedef char *ovsec_kadm_policy_t; -typedef long ovsec_kadm_ret_t; - -enum ovsec_kadm_salttype { OVSEC_KADM_SALT_V4, OVSEC_KADM_SALT_NORMAL }; -enum ovsec_kadm_saltmod { OVSEC_KADM_MOD_KEEP, OVSEC_KADM_MOD_V4, OVSEC_KADM_MOD_NORMAL }; - -#define OVSEC_KADM_PW_FIRST_PROMPT \ - ((char *) error_message(CHPASS_UTIL_NEW_PASSWORD_PROMPT)) -#define OVSEC_KADM_PW_SECOND_PROMPT \ - ((char *) error_message(CHPASS_UTIL_NEW_PASSWORD_AGAIN_PROMPT)) - -/* - * Successful return code - */ -#define OVSEC_KADM_OK 0 - -/* - * Create/Modify masks - */ -/* principal */ -#define OVSEC_KADM_PRINCIPAL 0x000001 -#define OVSEC_KADM_PRINC_EXPIRE_TIME 0x000002 -#define OVSEC_KADM_PW_EXPIRATION 0x000004 -#define OVSEC_KADM_LAST_PWD_CHANGE 0x000008 -#define OVSEC_KADM_ATTRIBUTES 0x000010 -#define OVSEC_KADM_MAX_LIFE 0x000020 -#define OVSEC_KADM_MOD_TIME 0x000040 -#define OVSEC_KADM_MOD_NAME 0x000080 -#define OVSEC_KADM_KVNO 0x000100 -#define OVSEC_KADM_MKVNO 0x000200 -#define OVSEC_KADM_AUX_ATTRIBUTES 0x000400 -#define OVSEC_KADM_POLICY 0x000800 -#define OVSEC_KADM_POLICY_CLR 0x001000 -/* policy */ -#define OVSEC_KADM_PW_MAX_LIFE 0x004000 -#define OVSEC_KADM_PW_MIN_LIFE 0x008000 -#define OVSEC_KADM_PW_MIN_LENGTH 0x010000 -#define OVSEC_KADM_PW_MIN_CLASSES 0x020000 -#define OVSEC_KADM_PW_HISTORY_NUM 0x040000 -#define OVSEC_KADM_REF_COUNT 0x080000 - -/* - * permission bits - */ -#define OVSEC_KADM_PRIV_GET 0x01 -#define OVSEC_KADM_PRIV_ADD 0x02 -#define OVSEC_KADM_PRIV_MODIFY 0x04 -#define OVSEC_KADM_PRIV_DELETE 0x08 - -/* - * API versioning constants - */ -#define OVSEC_KADM_MASK_BITS 0xffffff00 - -#define OVSEC_KADM_STRUCT_VERSION_MASK 0x12345600 -#define OVSEC_KADM_STRUCT_VERSION_1 (OVSEC_KADM_STRUCT_VERSION_MASK|0x01) -#define OVSEC_KADM_STRUCT_VERSION OVSEC_KADM_STRUCT_VERSION_1 - -#define OVSEC_KADM_API_VERSION_MASK 0x12345700 -#define OVSEC_KADM_API_VERSION_1 (OVSEC_KADM_API_VERSION_MASK|0x01) - - -typedef struct _ovsec_kadm_principal_ent_t { - krb5_principal principal; - krb5_timestamp princ_expire_time; - krb5_timestamp last_pwd_change; - krb5_timestamp pw_expiration; - krb5_deltat max_life; - krb5_principal mod_name; - krb5_timestamp mod_date; - krb5_flags attributes; - krb5_kvno kvno; - krb5_kvno mkvno; - char *policy; - long aux_attributes; -} ovsec_kadm_principal_ent_rec, *ovsec_kadm_principal_ent_t; - -typedef struct _ovsec_kadm_policy_ent_t { - char *policy; - long pw_min_life; - long pw_max_life; - long pw_min_length; - long pw_min_classes; - long pw_history_num; - long policy_refcnt; -} ovsec_kadm_policy_ent_rec, *ovsec_kadm_policy_ent_t; - -/* - * functions - */ -ovsec_kadm_ret_t ovsec_kadm_init(char *client_name, char *pass, - char *service_name, char *realm, - krb5_ui_4 struct_version, - krb5_ui_4 api_version, - char **db_args, - void **server_handle); -ovsec_kadm_ret_t ovsec_kadm_init_with_password(char *client_name, - char *pass, - char *service_name, - char *realm, - krb5_ui_4 struct_version, - krb5_ui_4 api_version, - char ** db_args, - void **server_handle); -ovsec_kadm_ret_t ovsec_kadm_init_with_skey(char *client_name, - char *keytab, - char *service_name, - char *realm, - krb5_ui_4 struct_version, - krb5_ui_4 api_version, - char **db_args, - void **server_handle); -ovsec_kadm_ret_t ovsec_kadm_flush(void *server_handle); -ovsec_kadm_ret_t ovsec_kadm_destroy(void *server_handle); -ovsec_kadm_ret_t ovsec_kadm_create_principal(void *server_handle, - ovsec_kadm_principal_ent_t ent, - long mask, char *pass); -ovsec_kadm_ret_t ovsec_kadm_delete_principal(void *server_handle, - krb5_principal principal); -ovsec_kadm_ret_t ovsec_kadm_modify_principal(void *server_handle, - ovsec_kadm_principal_ent_t ent, - long mask); -ovsec_kadm_ret_t ovsec_kadm_rename_principal(void *server_handle, - krb5_principal,krb5_principal); -ovsec_kadm_ret_t ovsec_kadm_get_principal(void *server_handle, - krb5_principal principal, - ovsec_kadm_principal_ent_t *ent); -ovsec_kadm_ret_t ovsec_kadm_chpass_principal(void *server_handle, - krb5_principal principal, - char *pass); -ovsec_kadm_ret_t ovsec_kadm_randkey_principal(void *server_handle, - krb5_principal principal, - krb5_keyblock **keyblock); -ovsec_kadm_ret_t ovsec_kadm_create_policy(void *server_handle, - ovsec_kadm_policy_ent_t ent, - long mask); -/* - * ovsec_kadm_create_policy_internal is not part of the supported, - * exposed API. It is available only in the server library, and you - * shouldn't use it unless you know why it's there and how it's - * different from ovsec_kadm_create_policy. - */ -ovsec_kadm_ret_t ovsec_kadm_create_policy_internal(void *server_handle, - ovsec_kadm_policy_ent_t - entry, long mask); -ovsec_kadm_ret_t ovsec_kadm_delete_policy(void *server_handle, - ovsec_kadm_policy_t policy); -ovsec_kadm_ret_t ovsec_kadm_modify_policy(void *server_handle, - ovsec_kadm_policy_ent_t ent, - long mask); -/* - * ovsec_kadm_modify_policy_internal is not part of the supported, - * exposed API. It is available only in the server library, and you - * shouldn't use it unless you know why it's there and how it's - * different from ovsec_kadm_modify_policy. - */ -ovsec_kadm_ret_t ovsec_kadm_modify_policy_internal(void *server_handle, - ovsec_kadm_policy_ent_t - entry, long mask); -ovsec_kadm_ret_t ovsec_kadm_get_policy(void *server_handle, - ovsec_kadm_policy_t policy, - ovsec_kadm_policy_ent_t *ent); -ovsec_kadm_ret_t ovsec_kadm_get_privs(void *server_handle, - long *privs); - -ovsec_kadm_ret_t ovsec_kadm_chpass_principal_util(void *server_handle, - krb5_principal princ, - char *new_pw, - char **ret_pw, - char *msg_ret); - -ovsec_kadm_ret_t ovsec_kadm_free_principal_ent(void *server_handle, - ovsec_kadm_principal_ent_t - ent); -ovsec_kadm_ret_t ovsec_kadm_free_policy_ent(void *server_handle, - ovsec_kadm_policy_ent_t ent); - -ovsec_kadm_ret_t ovsec_kadm_free_name_list(void *server_handle, - char **names, int count); - -ovsec_kadm_ret_t ovsec_kadm_get_principals(void *server_handle, - char *exp, char ***princs, - int *count); - -ovsec_kadm_ret_t ovsec_kadm_get_policies(void *server_handle, - char *exp, char ***pols, - int *count); - -#define OVSEC_KADM_FAILURE KADM5_FAILURE -#define OVSEC_KADM_AUTH_GET KADM5_AUTH_GET -#define OVSEC_KADM_AUTH_ADD KADM5_AUTH_ADD -#define OVSEC_KADM_AUTH_MODIFY KADM5_AUTH_MODIFY -#define OVSEC_KADM_AUTH_DELETE KADM5_AUTH_DELETE -#define OVSEC_KADM_AUTH_INSUFFICIENT KADM5_AUTH_INSUFFICIENT -#define OVSEC_KADM_BAD_DB KADM5_BAD_DB -#define OVSEC_KADM_DUP KADM5_DUP -#define OVSEC_KADM_RPC_ERROR KADM5_RPC_ERROR -#define OVSEC_KADM_NO_SRV KADM5_NO_SRV -#define OVSEC_KADM_BAD_HIST_KEY KADM5_BAD_HIST_KEY -#define OVSEC_KADM_NOT_INIT KADM5_NOT_INIT -#define OVSEC_KADM_UNK_PRINC KADM5_UNK_PRINC -#define OVSEC_KADM_UNK_POLICY KADM5_UNK_POLICY -#define OVSEC_KADM_BAD_MASK KADM5_BAD_MASK -#define OVSEC_KADM_BAD_CLASS KADM5_BAD_CLASS -#define OVSEC_KADM_BAD_LENGTH KADM5_BAD_LENGTH -#define OVSEC_KADM_BAD_POLICY KADM5_BAD_POLICY -#define OVSEC_KADM_BAD_PRINCIPAL KADM5_BAD_PRINCIPAL -#define OVSEC_KADM_BAD_AUX_ATTR KADM5_BAD_AUX_ATTR -#define OVSEC_KADM_BAD_HISTORY KADM5_BAD_HISTORY -#define OVSEC_KADM_BAD_MIN_PASS_LIFE KADM5_BAD_MIN_PASS_LIFE -#define OVSEC_KADM_PASS_Q_TOOSHORT KADM5_PASS_Q_TOOSHORT -#define OVSEC_KADM_PASS_Q_CLASS KADM5_PASS_Q_CLASS -#define OVSEC_KADM_PASS_Q_DICT KADM5_PASS_Q_DICT -#define OVSEC_KADM_PASS_REUSE KADM5_PASS_REUSE -#define OVSEC_KADM_PASS_TOOSOON KADM5_PASS_TOOSOON -#define OVSEC_KADM_POLICY_REF KADM5_POLICY_REF -#define OVSEC_KADM_INIT KADM5_INIT -#define OVSEC_KADM_BAD_PASSWORD KADM5_BAD_PASSWORD -#define OVSEC_KADM_PROTECT_PRINCIPAL KADM5_PROTECT_PRINCIPAL -#define OVSEC_KADM_BAD_SERVER_HANDLE KADM5_BAD_SERVER_HANDLE -#define OVSEC_KADM_BAD_STRUCT_VERSION KADM5_BAD_STRUCT_VERSION -#define OVSEC_KADM_OLD_STRUCT_VERSION KADM5_OLD_STRUCT_VERSION -#define OVSEC_KADM_NEW_STRUCT_VERSION KADM5_NEW_STRUCT_VERSION -#define OVSEC_KADM_BAD_API_VERSION KADM5_BAD_API_VERSION -#define OVSEC_KADM_OLD_LIB_API_VERSION KADM5_OLD_LIB_API_VERSION -#define OVSEC_KADM_OLD_SERVER_API_VERSION KADM5_OLD_SERVER_API_VERSION -#define OVSEC_KADM_NEW_LIB_API_VERSION KADM5_NEW_LIB_API_VERSION -#define OVSEC_KADM_NEW_SERVER_API_VERSION KADM5_NEW_SERVER_API_VERSION -#define OVSEC_KADM_SECURE_PRINC_MISSING KADM5_SECURE_PRINC_MISSING -#define OVSEC_KADM_NO_RENAME_SALT KADM5_NO_RENAME_SALT - -#endif /* USE_KADM5_API_VERSION == 1 */ - KADM5INT_END_DECLS #endif /* __KADM5_ADMIN_H__ */ Modified: trunk/src/lib/kadm5/admin_internal.h =================================================================== --- trunk/src/lib/kadm5/admin_internal.h 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/admin_internal.h 2009-08-13 21:25:54 UTC (rev 22521) @@ -29,7 +29,7 @@ if ((srvr->api_version & KADM5_MASK_BITS) != \ KADM5_API_VERSION_MASK) \ return KADM5_BAD_API_VERSION; \ - if (srvr->api_version < KADM5_API_VERSION_1) \ + if (srvr->api_version < KADM5_API_VERSION_2) \ return old_api_version; \ if (srvr->api_version > KADM5_API_VERSION_2) \ return new_api_version; \ Modified: trunk/src/lib/kadm5/chpass_util_strings.et =================================================================== --- trunk/src/lib/kadm5/chpass_util_strings.et 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/chpass_util_strings.et 2009-08-13 21:25:54 UTC (rev 22521) @@ -1,4 +1,4 @@ -# this is really a string table for ovsec_kadm_chpass_principal_util +# this is really a string table for chpass_principal_util error_table ovku Modified: trunk/src/lib/kadm5/clnt/client_init.c =================================================================== --- trunk/src/lib/kadm5/clnt/client_init.c 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/clnt/client_init.c 2009-08-13 21:25:54 UTC (rev 22521) @@ -231,21 +231,11 @@ * empty mask, and behave like version 2. */ memset(¶ms_local, 0, sizeof(params_local)); - if (api_version == KADM5_API_VERSION_1) { - realm = params_local.realm = (char *) params_in; - if (params_in) - params_local.mask = KADM5_CONFIG_REALM; + if (params_in && (params_in->mask & KADM5_CONFIG_REALM)) + realm = params_in->realm; + else + realm = NULL; - /* Use old AUTH_GSSAPI for version 1 protocol. */ - params_local.mask |= KADM5_CONFIG_OLD_AUTH_GSSAPI; - params_in = ¶ms_local; - } else { - if (params_in && (params_in->mask & KADM5_CONFIG_REALM)) - realm = params_in->realm; - else - realm = NULL; - } - #if 0 /* Since KDC config params can now be put in krb5.conf, these could show up even when you're just using the remote kadmin client. */ Modified: trunk/src/lib/kadm5/clnt/client_principal.c =================================================================== --- trunk/src/lib/kadm5/clnt/client_principal.c 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/clnt/client_principal.c 2009-08-13 21:25:54 UTC (rev 22521) @@ -43,22 +43,8 @@ if(princ == NULL) return EINVAL; - if (handle->api_version == KADM5_API_VERSION_1) { - memcpy(&arg.rec, princ, sizeof(kadm5_principal_ent_rec_v1)); - } else { - memcpy(&arg.rec, princ, sizeof(kadm5_principal_ent_rec)); - } - if (handle->api_version == KADM5_API_VERSION_1) { - /* - * hack hack cough cough. - * krb5_unparse name dumps core if we pass it in garbage - * or null. So, since the client is not allowed to set mod_name - * anyway, we just fill it in with a dummy principal. The server of - * course ignores this. - */ - krb5_parse_name(handle->context, "bogus/bogus", &arg.rec.mod_name); - } else - arg.rec.mod_name = NULL; + memcpy(&arg.rec, princ, sizeof(kadm5_principal_ent_rec)); + arg.rec.mod_name = NULL; if(!(mask & KADM5_POLICY)) arg.rec.policy = NULL; @@ -73,9 +59,6 @@ r = create_principal_2(&arg, handle->clnt); - if (handle->api_version == KADM5_API_VERSION_1) - krb5_free_principal(handle->context, arg.rec.mod_name); - if(r == NULL) eret(); return r->code; @@ -104,22 +87,8 @@ if(princ == NULL) return EINVAL; - if (handle->api_version == KADM5_API_VERSION_1) { - memcpy(&arg.rec, princ, sizeof(kadm5_principal_ent_rec_v1)); - } else { - memcpy(&arg.rec, princ, sizeof(kadm5_principal_ent_rec)); - } - if (handle->api_version == KADM5_API_VERSION_1) { - /* - * hack hack cough cough. - * krb5_unparse name dumps core if we pass it in garbage - * or null. So, since the client is not allowed to set mod_name - * anyway, we just fill it in with a dummy principal. The server of - * course ignores this. - */ - krb5_parse_name(handle->context, "bogus/bogus", &arg.rec.mod_name); - } else - arg.rec.mod_name = NULL; + memcpy(&arg.rec, princ, sizeof(kadm5_principal_ent_rec)); + arg.rec.mod_name = NULL; if(!(mask & KADM5_POLICY)) arg.rec.policy = NULL; @@ -134,9 +103,6 @@ r = create_principal3_2(&arg, handle->clnt); - if (handle->api_version == KADM5_API_VERSION_1) - krb5_free_principal(handle->context, arg.rec.mod_name); - if(r == NULL) eret(); return r->code; @@ -174,17 +140,9 @@ memset(&arg, 0, sizeof(arg)); arg.mask = mask; arg.api_version = handle->api_version; - /* - * cough cough gag gag - * see comment in create_principal. - */ if(princ == NULL) return EINVAL; - if (handle->api_version == KADM5_API_VERSION_1) { - memcpy(&arg.rec, princ, sizeof(kadm5_principal_ent_rec_v1)); - } else { - memcpy(&arg.rec, princ, sizeof(kadm5_principal_ent_rec)); - } + memcpy(&arg.rec, princ, sizeof(kadm5_principal_ent_rec)); if(!(mask & KADM5_POLICY)) arg.rec.policy = NULL; if (! (mask & KADM5_KEY_DATA)) { @@ -196,19 +154,10 @@ arg.rec.tl_data = NULL; } - if (handle->api_version == KADM5_API_VERSION_1) { - /* - * See comment in create_principal - */ - krb5_parse_name(handle->context, "bogus/bogus", &arg.rec.mod_name); - } else - arg.rec.mod_name = NULL; + arg.rec.mod_name = NULL; r = modify_principal_2(&arg, handle->clnt); - if (handle->api_version == KADM5_API_VERSION_1) - krb5_free_principal(handle->context, arg.rec.mod_name); - if(r == NULL) eret(); return r->code; @@ -228,33 +177,13 @@ if(princ == NULL) return EINVAL; arg.princ = princ; - if (handle->api_version == KADM5_API_VERSION_1) - arg.mask = KADM5_PRINCIPAL_NORMAL_MASK; - else - arg.mask = mask; + arg.mask = mask; arg.api_version = handle->api_version; r = get_principal_2(&arg, handle->clnt); if(r == NULL) eret(); - if (handle->api_version == KADM5_API_VERSION_1) { - kadm5_principal_ent_t_v1 *entp; - - entp = (kadm5_principal_ent_t_v1 *) ent; - if (r->code == 0) { - if (!(*entp = (kadm5_principal_ent_t_v1) - malloc(sizeof(kadm5_principal_ent_rec_v1)))) - return ENOMEM; - /* this memcpy works because the v1 structure is an initial - subset of the v2 struct. C guarantees that this will - result in the same layout in memory */ - memcpy(*entp, &r->rec, sizeof(**entp)); - } else { - *entp = NULL; - } - } else { - if (r->code == 0) - memcpy(ent, &r->rec, sizeof(r->rec)); - } + if (r->code == 0) + memcpy(ent, &r->rec, sizeof(r->rec)); return r->code; } @@ -460,29 +389,23 @@ r = chrand_principal3_2(&arg, handle->clnt); if(r == NULL) eret(); - if (handle->api_version == KADM5_API_VERSION_1) { - if (key) - krb5_copy_keyblock(handle->context, &r->key, key); - } else { - if (n_keys) - *n_keys = r->n_keys; - if (key) { - if(r->n_keys) { - *key = (krb5_keyblock *) - malloc(r->n_keys*sizeof(krb5_keyblock)); - if (*key == NULL) - return ENOMEM; - for (i = 0; i < r->n_keys; i++) { - ret = krb5_copy_keyblock_contents(handle->context, - &r->keys[i], - &(*key)[i]); - if (ret) { - free(*key); - return ENOMEM; - } - } - } else *key = NULL; - } + if (n_keys) + *n_keys = r->n_keys; + if (key) { + if(r->n_keys) { + *key = malloc(r->n_keys * sizeof(krb5_keyblock)); + if (*key == NULL) + return ENOMEM; + for (i = 0; i < r->n_keys; i++) { + ret = krb5_copy_keyblock_contents(handle->context, &r->keys[i], + &(*key)[i]); + if (ret) { + free(*key); + return ENOMEM; + } + } + } else + *key = NULL; } return r->code; @@ -508,29 +431,23 @@ r = chrand_principal_2(&arg, handle->clnt); if(r == NULL) eret(); - if (handle->api_version == KADM5_API_VERSION_1) { - if (key) - krb5_copy_keyblock(handle->context, &r->key, key); - } else { - if (n_keys) - *n_keys = r->n_keys; - if (key) { - if(r->n_keys) { - *key = (krb5_keyblock *) - malloc(r->n_keys*sizeof(krb5_keyblock)); - if (*key == NULL) - return ENOMEM; - for (i = 0; i < r->n_keys; i++) { - ret = krb5_copy_keyblock_contents(handle->context, - &r->keys[i], - &(*key)[i]); - if (ret) { - free(*key); - return ENOMEM; - } - } - } else *key = NULL; - } + if (n_keys) + *n_keys = r->n_keys; + if (key) { + if(r->n_keys) { + *key = malloc(r->n_keys * sizeof(krb5_keyblock)); + if (*key == NULL) + return ENOMEM; + for (i = 0; i < r->n_keys; i++) { + ret = krb5_copy_keyblock_contents(handle->context, &r->keys[i], + &(*key)[i]); + if (ret) { + free(*key); + return ENOMEM; + } + } + } else + *key = NULL; } return r->code; Modified: trunk/src/lib/kadm5/clnt/clnt_policy.c =================================================================== --- trunk/src/lib/kadm5/clnt/clnt_policy.c 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/clnt/clnt_policy.c 2009-08-13 21:25:54 UTC (rev 22521) @@ -103,22 +103,8 @@ r = get_policy_2(&arg, handle->clnt); if(r == NULL) return KADM5_RPC_ERROR; - if (handle->api_version == KADM5_API_VERSION_1) { - kadm5_policy_ent_t *entp; - - entp = (kadm5_policy_ent_t *) ent; - if(r->code == 0) { - if (!(*entp = (kadm5_policy_ent_t) - malloc(sizeof(kadm5_policy_ent_rec)))) - return ENOMEM; - memcpy(*entp, &r->rec, sizeof(**entp)); - } else { - *entp = NULL; - } - } else { - if (r->code == 0) - memcpy(ent, &r->rec, sizeof(r->rec)); - } + if (r->code == 0) + memcpy(ent, &r->rec, sizeof(r->rec)); return r->code; } Modified: trunk/src/lib/kadm5/clnt/libkadm5clnt.exports =================================================================== --- trunk/src/lib/kadm5/clnt/libkadm5clnt.exports 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/clnt/libkadm5clnt.exports 2009-08-13 21:25:54 UTC (rev 22521) @@ -58,29 +58,6 @@ krb5_read_realm_params krb5_string_to_flags krb5_string_to_keysalts -ovsec_kadm_chpass_principal -ovsec_kadm_chpass_principal_util -ovsec_kadm_create_policy -ovsec_kadm_create_principal -ovsec_kadm_delete_policy -ovsec_kadm_delete_principal -ovsec_kadm_destroy -ovsec_kadm_flush -ovsec_kadm_free_name_list -ovsec_kadm_free_policy_ent -ovsec_kadm_free_principal_ent -ovsec_kadm_get_policies -ovsec_kadm_get_policy -ovsec_kadm_get_principal -ovsec_kadm_get_principals -ovsec_kadm_get_privs -ovsec_kadm_init -ovsec_kadm_init_with_password -ovsec_kadm_init_with_skey -ovsec_kadm_modify_policy -ovsec_kadm_modify_principal -ovsec_kadm_randkey_principal -ovsec_kadm_rename_principal xdr_chpass3_arg xdr_chpass_arg xdr_chrand3_arg @@ -103,7 +80,6 @@ xdr_gprincs_ret xdr_kadm5_policy_ent_rec xdr_kadm5_principal_ent_rec -xdr_kadm5_principal_ent_rec_v1 xdr_kadm5_ret_t xdr_krb5_deltat xdr_krb5_enctype Modified: trunk/src/lib/kadm5/kadm_rpc_xdr.c =================================================================== --- trunk/src/lib/kadm5/kadm_rpc_xdr.c 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/kadm_rpc_xdr.c 2009-08-13 21:25:54 UTC (rev 22521) @@ -380,12 +380,6 @@ return (TRUE); } -bool_t xdr_kadm5_principal_ent_rec_v1(XDR *xdrs, - kadm5_principal_ent_rec *objp) -{ - return _xdr_kadm5_principal_ent_rec(xdrs, objp, KADM5_API_VERSION_1); -} - bool_t xdr_kadm5_principal_ent_rec(XDR *xdrs, kadm5_principal_ent_rec *objp) { @@ -413,15 +407,9 @@ if (!xdr_krb5_deltat(xdrs, &objp->max_life)) { return (FALSE); } - if (v == KADM5_API_VERSION_1) { - if (!xdr_krb5_principal(xdrs, &objp->mod_name)) { - return (FALSE); - } - } else { - if (!xdr_nulltype(xdrs, (void **) &objp->mod_name, - xdr_krb5_principal)) { - return (FALSE); - } + if (!xdr_nulltype(xdrs, (void **) &objp->mod_name, + xdr_krb5_principal)) { + return (FALSE); } if (!xdr_krb5_timestamp(xdrs, &objp->mod_date)) { return (FALSE); @@ -441,36 +429,34 @@ if (!xdr_long(xdrs, &objp->aux_attributes)) { return (FALSE); } - if (v != KADM5_API_VERSION_1) { - if (!xdr_krb5_deltat(xdrs, &objp->max_renewable_life)) { - return (FALSE); - } - if (!xdr_krb5_timestamp(xdrs, &objp->last_success)) { - return (FALSE); - } - if (!xdr_krb5_timestamp(xdrs, &objp->last_failed)) { - return (FALSE); - } - if (!xdr_krb5_kvno(xdrs, &objp->fail_auth_count)) { - return (FALSE); - } - if (!xdr_krb5_int16(xdrs, &objp->n_key_data)) { - return (FALSE); - } - if (!xdr_krb5_int16(xdrs, &objp->n_tl_data)) { - return (FALSE); - } - if (!xdr_nulltype(xdrs, (void **) &objp->tl_data, - xdr_krb5_tl_data)) { - return FALSE; - } - n = objp->n_key_data; - if (!xdr_array(xdrs, (caddr_t *) &objp->key_data, - &n, ~0, sizeof(krb5_key_data), - xdr_krb5_key_data_nocontents)) { - return (FALSE); - } + if (!xdr_krb5_deltat(xdrs, &objp->max_renewable_life)) { + return (FALSE); } + if (!xdr_krb5_timestamp(xdrs, &objp->last_success)) { + return (FALSE); + } + if (!xdr_krb5_timestamp(xdrs, &objp->last_failed)) { + return (FALSE); + } + if (!xdr_krb5_kvno(xdrs, &objp->fail_auth_count)) { + return (FALSE); + } + if (!xdr_krb5_int16(xdrs, &objp->n_key_data)) { + return (FALSE); + } + if (!xdr_krb5_int16(xdrs, &objp->n_tl_data)) { + return (FALSE); + } + if (!xdr_nulltype(xdrs, (void **) &objp->tl_data, + xdr_krb5_tl_data)) { + return FALSE; + } + n = objp->n_key_data; + if (!xdr_array(xdrs, (caddr_t *) &objp->key_data, + &n, ~0, sizeof(krb5_key_data), + xdr_krb5_key_data_nocontents)) { + return (FALSE); + } return (TRUE); } @@ -510,14 +496,8 @@ if (!xdr_ui_4(xdrs, &objp->api_version)) { return (FALSE); } - if (objp->api_version == KADM5_API_VERSION_1) { - if (!xdr_kadm5_principal_ent_rec_v1(xdrs, &objp->rec)) { - return (FALSE); - } - } else { - if (!xdr_kadm5_principal_ent_rec(xdrs, &objp->rec)) { - return (FALSE); - } + if (!xdr_kadm5_principal_ent_rec(xdrs, &objp->rec)) { + return (FALSE); } if (!xdr_long(xdrs, &objp->mask)) { return (FALSE); @@ -534,14 +514,8 @@ if (!xdr_ui_4(xdrs, &objp->api_version)) { return (FALSE); } - if (objp->api_version == KADM5_API_VERSION_1) { - if (!xdr_kadm5_principal_ent_rec_v1(xdrs, &objp->rec)) { - return (FALSE); - } - } else { - if (!xdr_kadm5_principal_ent_rec(xdrs, &objp->rec)) { - return (FALSE); - } + if (!xdr_kadm5_principal_ent_rec(xdrs, &objp->rec)) { + return (FALSE); } if (!xdr_long(xdrs, &objp->mask)) { return (FALSE); @@ -589,14 +563,8 @@ if (!xdr_ui_4(xdrs, &objp->api_version)) { return (FALSE); } - if (objp->api_version == KADM5_API_VERSION_1) { - if (!xdr_kadm5_principal_ent_rec_v1(xdrs, &objp->rec)) { - return (FALSE); - } - } else { - if (!xdr_kadm5_principal_ent_rec(xdrs, &objp->rec)) { - return (FALSE); - } + if (!xdr_kadm5_principal_ent_rec(xdrs, &objp->rec)) { + return (FALSE); } if (!xdr_long(xdrs, &objp->mask)) { return (FALSE); @@ -796,19 +764,10 @@ if (!xdr_kadm5_ret_t(xdrs, &objp->code)) { return (FALSE); } - if (objp->api_version == KADM5_API_VERSION_1) { - if(objp->code == KADM5_OK) { - if (!xdr_krb5_keyblock(xdrs, &objp->key)) { - return (FALSE); - } - } - } else { - if (objp->code == KADM5_OK) { - if (!xdr_array(xdrs, (char **)&objp->keys, &objp->n_keys, ~0, - sizeof(krb5_keyblock), - xdr_krb5_keyblock)) - return FALSE; - } + if (objp->code == KADM5_OK) { + if (!xdr_array(xdrs, (char **)&objp->keys, &objp->n_keys, ~0, + sizeof(krb5_keyblock), xdr_krb5_keyblock)) + return FALSE; } return (TRUE); @@ -823,8 +782,7 @@ if (!xdr_krb5_principal(xdrs, &objp->princ)) { return (FALSE); } - if ((objp->api_version > KADM5_API_VERSION_1) && - !xdr_long(xdrs, &objp->mask)) { + if (!xdr_long(xdrs, &objp->mask)) { return FALSE; } @@ -841,15 +799,9 @@ return (FALSE); } if(objp->code == KADM5_OK) { - if (objp->api_version == KADM5_API_VERSION_1) { - if (!xdr_kadm5_principal_ent_rec_v1(xdrs, &objp->rec)) { - return (FALSE); - } - } else { - if (!xdr_kadm5_principal_ent_rec(xdrs, &objp->rec)) { - return (FALSE); - } - } + if (!xdr_kadm5_principal_ent_rec(xdrs, &objp->rec)) { + return (FALSE); + } } return (TRUE); Modified: trunk/src/lib/kadm5/misc_free.c =================================================================== --- trunk/src/lib/kadm5/misc_free.c 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/misc_free.c 2009-08-13 21:25:54 UTC (rev 22521) @@ -18,12 +18,8 @@ _KADM5_CHECK_HANDLE(server_handle); - if(val) { - if (val->policy) - free(val->policy); - if (handle->api_version == KADM5_API_VERSION_1) - free(val); - } + if (val) + free(val->policy); return KADM5_OK; } @@ -74,42 +70,31 @@ } kadm5_ret_t -kadm5_free_principal_ent(void *server_handle, - kadm5_principal_ent_t val) +kadm5_free_principal_ent(void *server_handle, kadm5_principal_ent_t val) { - kadm5_server_handle_t handle = server_handle; + kadm5_server_handle_t handle = server_handle; + krb5_tl_data *tl; int i; _KADM5_CHECK_HANDLE(server_handle); - if(val) { - if(val->principal) - krb5_free_principal(handle->context, val->principal); - if(val->mod_name) - krb5_free_principal(handle->context, val->mod_name); - if(val->policy) - free(val->policy); - if (handle->api_version > KADM5_API_VERSION_1) { - if (val->n_key_data) { - for (i = 0; i < val->n_key_data; i++) - krb5_free_key_data_contents(handle->context, - &val->key_data[i]); - free(val->key_data); - } - if (val->tl_data) { - krb5_tl_data *tl; - - while (val->tl_data) { - tl = val->tl_data->tl_data_next; - free(val->tl_data->tl_data_contents); - free(val->tl_data); - val->tl_data = tl; - } - } - } - - if (handle->api_version == KADM5_API_VERSION_1) - free(val); + if (!val) + return KADM5_OK; + + krb5_free_principal(handle->context, val->principal); + krb5_free_principal(handle->context, val->mod_name); + free(val->policy); + if (val->n_key_data) { + for (i = 0; i < val->n_key_data; i++) + krb5_free_key_data_contents(handle->context, &val->key_data[i]); + free(val->key_data); } + + while (val->tl_data) { + tl = val->tl_data->tl_data_next; + free(val->tl_data->tl_data_contents); + free(val->tl_data); + val->tl_data = tl; + } return KADM5_OK; } Deleted: trunk/src/lib/kadm5/ovsec_glue.c Modified: trunk/src/lib/kadm5/srv/libkadm5srv.exports =================================================================== --- trunk/src/lib/kadm5/srv/libkadm5srv.exports 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/srv/libkadm5srv.exports 2009-08-13 21:25:54 UTC (rev 22521) @@ -90,29 +90,6 @@ master_keylist master_princ osa_free_princ_ent -ovsec_kadm_chpass_principal -ovsec_kadm_chpass_principal_util -ovsec_kadm_create_policy -ovsec_kadm_create_principal -ovsec_kadm_delete_policy -ovsec_kadm_delete_principal -ovsec_kadm_destroy -ovsec_kadm_flush -ovsec_kadm_free_name_list -ovsec_kadm_free_policy_ent -ovsec_kadm_free_principal_ent -ovsec_kadm_get_policies -ovsec_kadm_get_policy -ovsec_kadm_get_principal -ovsec_kadm_get_principals -ovsec_kadm_get_privs -ovsec_kadm_init -ovsec_kadm_init_with_password -ovsec_kadm_init_with_skey -ovsec_kadm_modify_policy -ovsec_kadm_modify_principal -ovsec_kadm_randkey_principal -ovsec_kadm_rename_principal passwd_check xdr_chpass3_arg xdr_chpass_arg @@ -136,7 +113,6 @@ xdr_gprincs_ret xdr_kadm5_policy_ent_rec xdr_kadm5_principal_ent_rec -xdr_kadm5_principal_ent_rec_v1 xdr_kadm5_ret_t xdr_krb5_deltat xdr_krb5_enctype Modified: trunk/src/lib/kadm5/srv/server_init.c =================================================================== --- trunk/src/lib/kadm5/srv/server_init.c 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/srv/server_init.c 2009-08-13 21:25:54 UTC (rev 22521) @@ -113,13 +113,11 @@ void **server_handle) { /* - * A program calling init_with_creds *never* expects to prompt the - * user. Therefore, always pass a dummy password in case this is - * KADM5_API_VERSION_1. If this is KADM5_API_VERSION_2 and - * MKEY_FROM_KBD is non-zero, return an error. + * A program calling init_with_creds *never* expects to prompt + * the user. If this is KADM5_API_VERSION_2 and MKEY_FROM_KBD is + * non-zero, return an error. */ - if (api_version == KADM5_API_VERSION_2 && params && - (params->mask & KADM5_CONFIG_MKEY_FROM_KBD) && + if (params && (params->mask & KADM5_CONFIG_MKEY_FROM_KBD) && params->mkey_from_kbd) return KADM5_BAD_SERVER_PARAMS; return kadm5_init(client_name, NULL, service_name, params, @@ -138,12 +136,10 @@ { /* * A program calling init_with_skey *never* expects to prompt the - * user. Therefore, always pass a dummy password in case this is - * KADM5_API_VERSION_1. If this is KADM5_API_VERSION_2 and - * MKEY_FROM_KBD is non-zero, return an error. + * user. If this is KADM5_API_VERSION_2 and MKEY_FROM_KBD is + * non-zero, return an error. */ - if (api_version == KADM5_API_VERSION_2 && params && - (params->mask & KADM5_CONFIG_MKEY_FROM_KBD) && + if (params && (params->mask & KADM5_CONFIG_MKEY_FROM_KBD) && params->mkey_from_kbd) return KADM5_BAD_SERVER_PARAMS; return kadm5_init(client_name, NULL, service_name, params, @@ -202,21 +198,11 @@ KADM5_NEW_SERVER_API_VERSION); /* - * Acquire relevant profile entries. In version 2, merge values + * Acquire relevant profile entries. Merge values * in params_in with values from profile, based on * params_in->mask. - * - * In version 1, we've given a realm (which may be NULL) instead - * of params_in. So use that realm, make params_in contain an - * empty mask, and behave like version 2. */ memset(¶ms_local, 0, sizeof(params_local)); - if (api_version == KADM5_API_VERSION_1) { - params_local.realm = (char *) params_in; - if (params_in) - params_local.mask = KADM5_CONFIG_REALM; - params_in = ¶ms_local; - } #if 0 /* Now that we look at krb5.conf as well as kdc.conf, we can expect to see admin_server being set sometimes. */ @@ -311,29 +297,9 @@ return ret; } - /* - * The KADM5_API_VERSION_1 spec said "If pass (or keytab) is NULL - * or an empty string, reads the master password from [the stash - * file]. Otherwise, the non-NULL password is ignored and the - * user is prompted for it via the tty." However, the code was - * implemented the other way: when a non-NULL password was - * provided, the stash file was used. This is somewhat more - * sensible, as then a local or remote client that provides a - * password does not prompt the user. This code maintains the - * previous actual behavior, and not the old spec behavior, - * because that is how the unit tests are written. - * - * In KADM5_API_VERSION_2, this decision is controlled by - * params. - * - * kdb_init_master's third argument is "from_keyboard". - */ ret = kdb_init_master(handle, handle->params.realm, - (handle->api_version == KADM5_API_VERSION_1 ? - ((pass == NULL) || !(strlen(pass))) : - ((handle->params.mask & KADM5_CONFIG_MKEY_FROM_KBD) - && handle->params.mkey_from_kbd) - )); + (handle->params.mask & KADM5_CONFIG_MKEY_FROM_KBD) + && handle->params.mkey_from_kbd); if (ret) { krb5_db_fini(handle->context); krb5_free_context(handle->context); Modified: trunk/src/lib/kadm5/srv/svr_misc_free.c =================================================================== --- trunk/src/lib/kadm5/srv/svr_misc_free.c 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/srv/svr_misc_free.c 2009-08-13 21:25:54 UTC (rev 22521) @@ -29,9 +29,6 @@ free(val->policy); /* XXX free key_data and tl_data */ - - if (handle->api_version == KADM5_API_VERSION_1) - free(val); } return KADM5_OK; } Modified: trunk/src/lib/kadm5/srv/svr_policy.c =================================================================== --- trunk/src/lib/kadm5/srv/svr_policy.c 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/srv/svr_policy.c 2009-08-13 21:25:54 UTC (rev 22521) @@ -258,7 +258,6 @@ kadm5_policy_ent_t entry) { osa_policy_ent_t t; - kadm5_policy_ent_rec entry_local, **entry_orig, *new; int ret; kadm5_server_handle_t handle = server_handle; int cnt=1; @@ -267,16 +266,6 @@ krb5_clear_error_message(handle->context); - /* - * In version 1, entry is a pointer to a kadm5_policy_ent_t that - * should be filled with allocated memory. - */ - if (handle->api_version == KADM5_API_VERSION_1) { - entry_orig = (kadm5_policy_ent_rec **) entry; - *entry_orig = NULL; - entry = &entry_local; - } - if (name == (kadm5_policy_t) NULL) return EINVAL; if(strlen(name) == 0) @@ -299,16 +288,5 @@ entry->policy_refcnt = t->policy_refcnt; krb5_db_free_policy(handle->context, t); - if (handle->api_version == KADM5_API_VERSION_1) { - new = (kadm5_policy_ent_t) malloc(sizeof(kadm5_policy_ent_rec)); - if (new == NULL) { - free(entry->policy); - krb5_db_free_policy(handle->context, t); - return ENOMEM; - } - *new = *entry; - *entry_orig = new; - } - return KADM5_OK; } Modified: trunk/src/lib/kadm5/srv/svr_principal.c =================================================================== --- trunk/src/lib/kadm5/srv/svr_principal.c 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/srv/svr_principal.c 2009-08-13 21:25:54 UTC (rev 22521) @@ -745,7 +745,6 @@ long mask; int i; kadm5_server_handle_t handle = server_handle; - kadm5_principal_ent_rec entry_local, *entry_orig; CHECK_HANDLE(server_handle); @@ -756,13 +755,7 @@ * entry is a pointer to a kadm5_principal_ent_t_v1 that should be * filled with allocated memory. */ - if (handle->api_version == KADM5_API_VERSION_1) { - mask = KADM5_PRINCIPAL_NORMAL_MASK; - entry_orig = entry; - entry = &entry_local; - } else { - mask = in_mask; - } + mask = in_mask; memset(entry, 0, sizeof(*entry)); @@ -833,102 +826,51 @@ if (ret) goto done; - /* - * It's my understanding that KADM5_API_VERSION_1 is for OpenVision admin - * system compatiblity and is not required to maintain at this point so I'm - * commenting out this code. - * -- Will Fiveash - */ -#if 0 /************** Begin IFDEF'ed OUT *******************************/ - if (handle->api_version == KADM5_API_VERSION_2) - entry->mkvno = 0; - else { - /* XXX I'll be damned if I know how to deal with this one --marc */ - entry->mkvno = 1; - } -#endif /**************** END IFDEF'ed OUT *******************************/ + if (mask & KADM5_MAX_RLIFE) + entry->max_renewable_life = kdb.max_renewable_life; + if (mask & KADM5_LAST_SUCCESS) + entry->last_success = kdb.last_success; + if (mask & KADM5_LAST_FAILED) + entry->last_failed = kdb.last_failed; + if (mask & KADM5_FAIL_AUTH_COUNT) + entry->fail_auth_count = kdb.fail_auth_count; + if (mask & KADM5_TL_DATA) { + krb5_tl_data *tl, *tl2; - /* - * The new fields that only exist in version 2 start here - */ - if (handle->api_version == KADM5_API_VERSION_2) { - if (mask & KADM5_MAX_RLIFE) - entry->max_renewable_life = kdb.max_renewable_life; - if (mask & KADM5_LAST_SUCCESS) - entry->last_success = kdb.last_success; - if (mask & KADM5_LAST_FAILED) - entry->last_failed = kdb.last_failed; - if (mask & KADM5_FAIL_AUTH_COUNT) - entry->fail_auth_count = kdb.fail_auth_count; - if (mask & KADM5_TL_DATA) { - krb5_tl_data *tl, *tl2; + entry->tl_data = NULL; - entry->tl_data = NULL; + tl = kdb.tl_data; + while (tl) { + if (tl->tl_data_type > 255) { + if ((tl2 = dup_tl_data(tl)) == NULL) { + ret = ENOMEM; + goto done; + } + tl2->tl_data_next = entry->tl_data; + entry->tl_data = tl2; + entry->n_tl_data++; + } - tl = kdb.tl_data; - while (tl) { - if (tl->tl_data_type > 255) { - if ((tl2 = dup_tl_data(tl)) == NULL) { - ret = ENOMEM; - goto done; - } - tl2->tl_data_next = entry->tl_data; - entry->tl_data = tl2; - entry->n_tl_data++; - } - - tl = tl->tl_data_next; - } - } - if (mask & KADM5_KEY_DATA) { - entry->n_key_data = kdb.n_key_data; - if(entry->n_key_data) { - entry->key_data = (krb5_key_data *) - malloc(entry->n_key_data*sizeof(krb5_key_data)); - if (entry->key_data == NULL) { - ret = ENOMEM; - goto done; - } - } else - entry->key_data = NULL; - - for (i = 0; i < entry->n_key_data; i++) - ret = krb5_copy_key_data_contents(handle->context, - &kdb.key_data[i], - &entry->key_data[i]); - if (ret) - goto done; - } + tl = tl->tl_data_next; + } } + if (mask & KADM5_KEY_DATA) { + entry->n_key_data = kdb.n_key_data; + if(entry->n_key_data) { + entry->key_data = malloc(entry->n_key_data*sizeof(krb5_key_data)); + if (entry->key_data == NULL) { + ret = ENOMEM; + goto done; + } + } else + entry->key_data = NULL; - /* - * If KADM5_API_VERSION_1, we return an allocated structure, and - * we need to convert the new structure back into the format the - * caller is expecting. - */ - if (handle->api_version == KADM5_API_VERSION_1) { - kadm5_principal_ent_t_v1 newv1; - - newv1 = ((kadm5_principal_ent_t_v1) calloc(1, sizeof(*newv1))); - if (newv1 == NULL) { - ret = ENOMEM; - goto done; - } - - newv1->principal = entry->principal; - newv1->princ_expire_time = entry->princ_expire_time; - newv1->last_pwd_change = entry->last_pwd_change; - newv1->pw_expiration = entry->pw_expiration; - newv1->max_life = entry->max_life; - newv1->mod_name = entry->mod_name; - newv1->mod_date = entry->mod_date; - newv1->attributes = entry->attributes; - newv1->kvno = entry->kvno; - newv1->mkvno = entry->mkvno; - newv1->policy = entry->policy; - newv1->aux_attributes = entry->aux_attributes; - - *((kadm5_principal_ent_t_v1 *) entry_orig) = newv1; + for (i = 0; i < entry->n_key_data; i++) + ret = krb5_copy_key_data_contents(handle->context, + &kdb.key_data[i], + &entry->key_data[i]); + if (ret) + goto done; } ret = KADM5_OK; @@ -1625,25 +1567,11 @@ goto done; if (keyblocks) { - if (handle->api_version == KADM5_API_VERSION_1) { - /* Version 1 clients will expect to see a DES_CRC enctype. */ - ret = krb5_dbe_find_enctype(handle->context, &kdb, - ENCTYPE_DES_CBC_CRC, - -1, -1, &key_data); - if (ret) - goto done; - - ret = decrypt_key_data(handle->context, act_mkey, 1, key_data, - keyblocks, NULL); - if (ret) - goto done; - } else { - ret = decrypt_key_data(handle->context, act_mkey, - kdb.n_key_data, kdb.key_data, - keyblocks, n_keys); - if (ret) - goto done; - } + ret = decrypt_key_data(handle->context, act_mkey, + kdb.n_key_data, kdb.key_data, + keyblocks, n_keys); + if (ret) + goto done; } /* key data changed, let the database provider know */ @@ -2112,23 +2040,11 @@ } } - if (handle->api_version == KADM5_API_VERSION_1) { - /* Version 1 clients will expect to see a DES_CRC enctype. */ - if ((ret = krb5_dbe_find_enctype(handle->context, &kdb, - ENCTYPE_DES_CBC_CRC, - -1, -1, &key_data))) - goto done; - - if ((ret = decrypt_key_data(handle->context, mkey_ptr, 1, key_data, - keyblocks, NULL))) - goto done; - } else { - ret = decrypt_key_data(handle->context, mkey_ptr, - kdb.n_key_data, kdb.key_data, - keyblocks, n_keys); - if (ret) - goto done; - } + ret = decrypt_key_data(handle->context, mkey_ptr, + kdb.n_key_data, kdb.key_data, + keyblocks, n_keys); + if (ret) + goto done; } ret = KADM5_OK; Modified: trunk/src/lib/kadm5/unit-test/Makefile.in =================================================================== --- trunk/src/lib/kadm5/unit-test/Makefile.in 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/unit-test/Makefile.in 2009-08-13 21:25:54 UTC (rev 22521) @@ -2,7 +2,7 @@ myfulldir=lib/kadm5/unit-test mydir=lib/kadm5/unit-test BUILDTOP=$(REL)..$(S)..$(S).. -DEFINES = -DUSE_KADM5_API_VERSION=1 +DEFINES = PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS) @@ -55,9 +55,6 @@ $(CC_LINK) -o server-iter-test iter-test.o \ $(KADMSRV_LIBS) $(KDB_DEP_LIB) $(KRB5_BASE_LIBS) -setkey-test.o: $(SRCTOP)/lib/kadm5/unit-test/setkey-test.c - $(CC) $(ALL_CFLAGS) -UUSE_KADM5_API_VERSION -DUSE_KADM5_API_VERSION=2 -c $(SRCTOP)/lib/kadm5/unit-test/setkey-test.c - server-setkey-test: setkey-test.o $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o server-setkey-test setkey-test.o \ $(KADMSRV_LIBS) $(KDB_DEP_LIB) $(KRB5_BASE_LIBS) Deleted: trunk/src/lib/kadm5/unit-test/README.new-tests Deleted: trunk/src/lib/kadm5/unit-test/api.1/lock.exp Modified: trunk/src/lib/kadm5/unit-test/config/unix.exp =================================================================== --- trunk/src/lib/kadm5/unit-test/config/unix.exp 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/unit-test/config/unix.exp 2009-08-13 21:25:54 UTC (rev 22521) @@ -151,13 +151,13 @@ eof { error "EOF starting API" } timeout { error "Timeout starting API" } } - send "set current_struct_version \[expr \$OVSEC_KADM_STRUCT_VERSION &~ \$OVSEC_KADM_STRUCT_VERSION_MASK\]\n" + send "set current_struct_version \[expr \$KADM5_STRUCT_VERSION &~ \$KADM5_STRUCT_VERSION_MASK\]\n" expect { -re "$prompt$" {} eof { error "EOF setting API varibles"} timeout { error "timeout setting API varibles"} } - send "set current_api_version \[expr \$OVSEC_KADM_API_VERSION_1 &~ \$OVSEC_KADM_API_VERSION_MASK\]\n" + send "set current_api_version \[expr \$KADM5_API_VERSION_2 &~ \$KADM5_API_VERSION_MASK\]\n" expect { -re "$prompt$" {} eof { error "EOF setting API varibles"} @@ -187,25 +187,25 @@ eof { error "EOF setting API varibles"} timeout { error "timeout setting API varibles"} } - send "set old_api_version \[expr \$OVSEC_KADM_API_VERSION_MASK | 0x00\]\n" + send "set old_api_version \[expr \$KADM5_API_VERSION_MASK | 0x00\]\n" expect { -re "$prompt$" {} eof { error "EOF setting API varibles"} timeout { error "timeout setting API varibles"} } - send "set old_struct_version \[expr \$OVSEC_KADM_STRUCT_VERSION_MASK | 0x00\]\n" + send "set old_struct_version \[expr \$KADM5_STRUCT_VERSION_MASK | 0x00\]\n" expect { -re "$prompt$" {} eof { error "EOF setting API varibles"} timeout { error "timeout setting API varibles"} } - send "set new_api_version \[expr \$OVSEC_KADM_API_VERSION_MASK | 0xca\]\n" + send "set new_api_version \[expr \$KADM5_API_VERSION_MASK | 0xca\]\n" expect { -re "$prompt$" {} eof { error "EOF setting API varibles"} timeout { error "timeout setting API varibles"} } - send "set new_struct_version \[expr \$OVSEC_KADM_STRUCT_VERSION_MASK | 0xca\]\n" + send "set new_struct_version \[expr \$KADM5_STRUCT_VERSION_MASK | 0xca\]\n" expect { -re "$prompt$" {} eof { error "EOF setting API varibles"} Modified: trunk/src/lib/kadm5/unit-test/destroy-test.c =================================================================== --- trunk/src/lib/kadm5/unit-test/destroy-test.c 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/unit-test/destroy-test.c 2009-08-13 21:25:54 UTC (rev 22521) @@ -13,24 +13,23 @@ int main() { - ovsec_kadm_ret_t ret; + kadm5_ret_t ret; char *cp; int x; void *server_handle; kadm5_server_handle_t handle; for(x = 0; x < TEST_NUM; x++) { - ret = ovsec_kadm_init("admin", "admin", "ovsec_adm/admin", 0, - OVSEC_KADM_STRUCT_VERSION, - OVSEC_KADM_API_VERSION_1, NULL, - &server_handle); - if(ret != OVSEC_KADM_OK) { + ret = kadm5_init("admin", "admin", KADM5_ADMIN_SERVICE, 0, + KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, NULL, + &server_handle); + if(ret != KADM5_OK) { com_err("test", ret, "init"); exit(2); } handle = (kadm5_server_handle_t) server_handle; - cp = (char *) strdup(((char *) (strchr(handle->cache_name, ':')) + 1)); - ovsec_kadm_destroy(server_handle); + cp = strdup(strchr(handle->cache_name, ':') + 1); + kadm5_destroy(server_handle); if(access(cp, F_OK) == 0) { puts("ticket cache not destroyed"); exit(2); Modified: trunk/src/lib/kadm5/unit-test/handle-test.c =================================================================== --- trunk/src/lib/kadm5/unit-test/handle-test.c 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/unit-test/handle-test.c 2009-08-13 21:25:54 UTC (rev 22521) @@ -11,12 +11,12 @@ int main(int argc, char *argv[]) { - ovsec_kadm_ret_t ret; + kadm5_ret_t ret; void *server_handle; kadm5_server_handle_t handle; kadm5_server_handle_rec orig_handle; - ovsec_kadm_policy_ent_t pol; - ovsec_kadm_principal_ent_t princ; + kadm5_policy_ent_rec pol; + kadm5_principal_ent_t princ; krb5_keyblock *key; krb5_principal tprinc; krb5_context context; @@ -24,103 +24,104 @@ kadm5_init_krb5_context(&context); - ret = ovsec_kadm_init("admin/none", "admin", "ovsec_adm/admin", 0, - OVSEC_KADM_STRUCT_VERSION, OVSEC_KADM_API_VERSION_1, NULL, - &server_handle); - if(ret != OVSEC_KADM_OK) { + ret = kadm5_init("admin/none", "admin", KADM5_ADMIN_SERVICE, NULL, + KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, NULL, + &server_handle); + if(ret != KADM5_OK) { com_err("test", ret, "init"); exit(2); } handle = (kadm5_server_handle_t) server_handle; orig_handle = *handle; - handle->magic_number = OVSEC_KADM_STRUCT_VERSION; + handle->magic_number = KADM5_STRUCT_VERSION; krb5_parse_name(context, "testuser", &tprinc); - ret = ovsec_kadm_get_principal(server_handle, tprinc, &princ); - if(ret != OVSEC_KADM_BAD_SERVER_HANDLE) { + ret = kadm5_get_principal(server_handle, tprinc, &princ, + KADM5_PRINCIPAL_NORMAL_MASK); + if(ret != KADM5_BAD_SERVER_HANDLE) { fprintf(stderr, "%s -- returned -- %s\n", "get-principal", error_message(ret)); exit(1); } - ret = ovsec_kadm_get_policy(server_handle, "pol1", &pol); - if(ret != OVSEC_KADM_BAD_SERVER_HANDLE) { + ret = kadm5_get_policy(server_handle, "pol1", &pol); + if(ret != KADM5_BAD_SERVER_HANDLE) { fprintf(stderr, "%s -- returned -- %s\n", "get-policy", error_message(ret)); exit(1); } - ret = ovsec_kadm_create_principal(server_handle, princ, OVSEC_KADM_PRINCIPAL, "pass"); - if(ret != OVSEC_KADM_BAD_SERVER_HANDLE) { + ret = kadm5_create_principal(server_handle, princ, KADM5_PRINCIPAL, "pass"); + if(ret != KADM5_BAD_SERVER_HANDLE) { fprintf(stderr, "%s -- returned -- %s\n", "create-principal", error_message(ret)); exit(1); } - ret = ovsec_kadm_create_policy(server_handle, pol, OVSEC_KADM_POLICY); - if(ret != OVSEC_KADM_BAD_SERVER_HANDLE) { + ret = kadm5_create_policy(server_handle, &pol, KADM5_POLICY); + if(ret != KADM5_BAD_SERVER_HANDLE) { fprintf(stderr, "%s -- returned -- %s\n", "create-policy", error_message(ret)); exit(1); } - ret = ovsec_kadm_modify_principal(server_handle, princ, OVSEC_KADM_PW_EXPIRATION); - if(ret != OVSEC_KADM_BAD_SERVER_HANDLE) { + ret = kadm5_modify_principal(server_handle, princ, KADM5_PW_EXPIRATION); + if(ret != KADM5_BAD_SERVER_HANDLE) { fprintf(stderr, "%s -- returned -- %s\n", "modify-principal", error_message(ret)); exit(1); } - ret = ovsec_kadm_modify_policy(server_handle, pol, OVSEC_KADM_PW_MAX_LIFE); - if(ret != OVSEC_KADM_BAD_SERVER_HANDLE) { + ret = kadm5_modify_policy(server_handle, &pol, KADM5_PW_MAX_LIFE); + if(ret != KADM5_BAD_SERVER_HANDLE) { fprintf(stderr, "%s -- returned -- %s\n", "modify-policy", error_message(ret)); exit(1); } - ret = ovsec_kadm_delete_principal(server_handle, tprinc); - if(ret != OVSEC_KADM_BAD_SERVER_HANDLE) { + ret = kadm5_delete_principal(server_handle, tprinc); + if(ret != KADM5_BAD_SERVER_HANDLE) { fprintf(stderr, "%s -- returned -- %s\n", "delete-principal", error_message(ret)); exit(1); } - ret = ovsec_kadm_delete_policy(server_handle, "pol1"); - if(ret != OVSEC_KADM_BAD_SERVER_HANDLE) { + ret = kadm5_delete_policy(server_handle, "pol1"); + if(ret != KADM5_BAD_SERVER_HANDLE) { fprintf(stderr, "%s -- returned -- %s\n", "delete-policy", error_message(ret)); exit(1); } - ret = ovsec_kadm_chpass_principal(server_handle, tprinc, "FooBar"); - if(ret != OVSEC_KADM_BAD_SERVER_HANDLE) { + ret = kadm5_chpass_principal(server_handle, tprinc, "FooBar"); + if(ret != KADM5_BAD_SERVER_HANDLE) { fprintf(stderr, "%s -- returned -- %s\n", "chpass", error_message(ret)); exit(1); } - ret = ovsec_kadm_randkey_principal(server_handle, tprinc, &key); - if(ret != OVSEC_KADM_BAD_SERVER_HANDLE) { + ret = kadm5_randkey_principal(server_handle, tprinc, &key, NULL); + if(ret != KADM5_BAD_SERVER_HANDLE) { fprintf(stderr, "%s -- returned -- %s\n", "randkey", error_message(ret)); exit(1); } - ret = ovsec_kadm_rename_principal(server_handle, tprinc, tprinc); - if(ret != OVSEC_KADM_BAD_SERVER_HANDLE) { + ret = kadm5_rename_principal(server_handle, tprinc, tprinc); + if(ret != KADM5_BAD_SERVER_HANDLE) { fprintf(stderr, "%s -- returned -- %s\n", "rename", error_message(ret)); exit(1); } - ret = ovsec_kadm_destroy(server_handle); - if(ret != OVSEC_KADM_BAD_SERVER_HANDLE) { + ret = kadm5_destroy(server_handle); + if(ret != KADM5_BAD_SERVER_HANDLE) { fprintf(stderr, "%s -- returned -- %s\n", "destroy", error_message(ret)); exit(1); } *handle = orig_handle; - ret = ovsec_kadm_destroy(server_handle); - if (ret != OVSEC_KADM_OK) { + ret = kadm5_destroy(server_handle); + if (ret != KADM5_OK) { fprintf(stderr, "valid %s -- returned -- %s\n", "destroy", error_message(ret)); exit(1); Modified: trunk/src/lib/kadm5/unit-test/init-test.c =================================================================== --- trunk/src/lib/kadm5/unit-test/init-test.c 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/unit-test/init-test.c 2009-08-13 21:25:54 UTC (rev 22521) @@ -1,4 +1,3 @@ -#undef USE_KADM5_API_VERSION #include #include #include Modified: trunk/src/lib/kadm5/unit-test/iter-test.c =================================================================== --- trunk/src/lib/kadm5/unit-test/iter-test.c 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/unit-test/iter-test.c 2009-08-13 21:25:54 UTC (rev 22521) @@ -4,7 +4,7 @@ int main(int argc, char **argv) { - ovsec_kadm_ret_t ret; + kadm5_ret_t ret; void *server_handle; char **names; int count, princ, i; @@ -15,23 +15,20 @@ } princ = (strcmp(argv[1], "-princ") == 0); - ret = ovsec_kadm_init("admin", "admin", OVSEC_KADM_ADMIN_SERVICE, 0, - OVSEC_KADM_STRUCT_VERSION, - OVSEC_KADM_API_VERSION_1, NULL, - &server_handle); - if (ret != OVSEC_KADM_OK) { + ret = kadm5_init("admin", "admin", KADM5_ADMIN_SERVICE, 0, + KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, NULL, + &server_handle); + if (ret != KADM5_OK) { com_err("iter-test", ret, "while initializing"); exit(1); } if (princ) - ret = ovsec_kadm_get_principals(server_handle, argv[2], &names, - &count); + ret = kadm5_get_principals(server_handle, argv[2], &names, &count); else - ret = ovsec_kadm_get_policies(server_handle, argv[2], - &names, &count); - - if (ret != OVSEC_KADM_OK) { + ret = kadm5_get_policies(server_handle, argv[2], &names, &count); + + if (ret != KADM5_OK) { com_err("iter-test", ret, "while retrieving list"); exit(1); } @@ -39,9 +36,9 @@ for (i = 0; i < count; i++) printf("%d: %s\n", i, names[i]); - ovsec_kadm_free_name_list(server_handle, names, count); + kadm5_free_name_list(server_handle, names, count); - (void) ovsec_kadm_destroy(server_handle); + (void) kadm5_destroy(server_handle); return 0; } Modified: trunk/src/lib/kadm5/unit-test/lib/lib.t =================================================================== --- trunk/src/lib/kadm5/unit-test/lib/lib.t 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/unit-test/lib/lib.t 2009-08-13 21:25:54 UTC (rev 22521) @@ -18,8 +18,8 @@ api_exit set lib_pid [api_start] if {! [cmd { - ovsec_kadm_init admin admin $OVSEC_KADM_ADMIN_SERVICE null \ - $OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \ + kadm5_init admin admin $KADM5_ADMIN_SERVICE null \ + $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \ lib_handle }]} { error "$test: unexpected failure in init" @@ -120,8 +120,8 @@ lib_start_api set ret [cmd [format { - ovsec_kadm_create_principal $lib_handle [simple_principal \ - "%s"] {OVSEC_KADM_PRINCIPAL} "%s" + kadm5_create_principal $lib_handle [simple_principal \ + "%s"] {KADM5_PRINCIPAL} "%s" } $name $name]] return $ret @@ -131,8 +131,8 @@ lib_start_api set ret [cmd [format { - ovsec_kadm_create_policy $lib_handle [simple_policy "%s"] \ - {OVSEC_KADM_POLICY} + kadm5_create_policy $lib_handle [simple_policy "%s"] \ + {KADM5_POLICY} } $name $name]] return $ret @@ -142,8 +142,8 @@ lib_start_api set ret [cmd [format { - ovsec_kadm_create_principal $lib_handle [princ_w_pol "%s" \ - "%s"] {OVSEC_KADM_PRINCIPAL OVSEC_KADM_POLICY} "%s" + kadm5_create_principal $lib_handle [princ_w_pol "%s" \ + "%s"] {KADM5_PRINCIPAL KADM5_POLICY} "%s" } $name $policy $name]] return $ret @@ -153,7 +153,7 @@ lib_start_api set ret [cmd [format { - ovsec_kadm_delete_principal $lib_handle "%s" + kadm5_delete_principal $lib_handle "%s" } $name]] return $ret @@ -162,7 +162,7 @@ proc delete_policy {name} { lib_start_api - set ret [cmd [format {ovsec_kadm_delete_policy $lib_handle "%s"} $name]] + set ret [cmd [format {kadm5_delete_policy $lib_handle "%s"} $name]] return $ret } @@ -173,7 +173,7 @@ lib_start_api set ret [cmd [format { - ovsec_kadm_get_principal $lib_handle "%s" principal + kadm5_get_principal $lib_handle "%s" principal } $name]] # puts stdout "Finishing principal_exists." @@ -187,7 +187,7 @@ # puts stdout "Starting policy_exists." set ret [cmd [format { - ovsec_kadm_get_policy $lib_handle "%s" policy + kadm5_get_policy $lib_handle "%s" policy } $name]] # puts stdout "Finishing policy_exists." Modified: trunk/src/lib/kadm5/unit-test/lock-test.c =================================================================== --- trunk/src/lib/kadm5/unit-test/lock-test.c 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/unit-test/lock-test.c 2009-08-13 21:25:54 UTC (rev 22521) @@ -1,8 +1,3 @@ -#if USE_KADM5_API_VERSION == 1 -#undef USE_KADM5_API_VERSION -#define USE_KADM5_API_VERSION 2 -#endif - #include #include #include Modified: trunk/src/lib/kadm5/unit-test/randkey-test.c =================================================================== --- trunk/src/lib/kadm5/unit-test/randkey-test.c 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/unit-test/randkey-test.c 2009-08-13 21:25:54 UTC (rev 22521) @@ -10,7 +10,7 @@ int main() { - ovsec_kadm_ret_t ret; + kadm5_ret_t ret; krb5_keyblock *keys[TEST_NUM]; krb5_principal tprinc; krb5_keyblock *newkey; @@ -22,24 +22,21 @@ kadm5_init_krb5_context(&context); krb5_parse_name(context, "testuser", &tprinc); - ret = ovsec_kadm_init("admin", "admin", "ovsec_adm/admin", 0, - OVSEC_KADM_STRUCT_VERSION, - OVSEC_KADM_API_VERSION_1, NULL, - &server_handle); - if(ret != OVSEC_KADM_OK) { + ret = kadm5_init("admin", "admin", KADM5_ADMIN_SERVICE, NULL, + KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, NULL, + &server_handle); + if(ret != KADM5_OK) { com_err("test", ret, "init"); exit(2); } for(x = 0; x < TEST_NUM; x++) { - ovsec_kadm_randkey_principal(server_handle, tprinc, &newkey); + kadm5_randkey_principal(server_handle, tprinc, &keys[x], NULL); for(i = 0; i < x; i++) { if (!memcmp(newkey->contents, keys[i]->contents, newkey->length)) puts("match found"); } - krb5_copy_keyblock(context, newkey, &keys[x]); - krb5_free_keyblock(context, newkey); } - ovsec_kadm_destroy(server_handle); + kadm5_destroy(server_handle); exit(0); } Modified: trunk/src/lib/kadm5/unit-test/site.exp =================================================================== --- trunk/src/lib/kadm5/unit-test/site.exp 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/kadm5/unit-test/site.exp 2009-08-13 21:25:54 UTC (rev 22521) @@ -1,2 +1,2 @@ -set tool ovsec_kadm_srv_tcl +set tool kadm5_srv_tcl set prompt "% " Modified: trunk/src/lib/rpc/unit-test/lib/helpers.exp =================================================================== --- trunk/src/lib/rpc/unit-test/lib/helpers.exp 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/rpc/unit-test/lib/helpers.exp 2009-08-13 21:25:54 UTC (rev 22521) @@ -50,7 +50,7 @@ global kadmin_tcl_spawn_id expect { -i $kadmin_tcl_spawn_id - -re "^OK OVSEC_KADM_OK \[^\n\]*\n" {} + -re "^OK KADM5_OK \[^\n\]*\n" {} -re "^ERROR \[^\n\]*\n" { perror "kadmin tcl subprocess reported unexpected error" } -re "^marshall_new_creds: \[^\n\]*\n" { exp_continue } -re "^gssapi_\[^\n\]*\n" { exp_continue } @@ -68,7 +68,7 @@ send_user "TOP=$TOP\n" set_from_env TESTDIR $env(TOP)/testing - set_from_env CLNTTCL $TESTDIR/util/ovsec_kadm_clnt_tcl + set_from_env CLNTTCL $TESTDIR/util/kadm5_clnt_tcl set_from_env TCLUTIL $TESTDIR/tcl/util.t set env(TCLUTIL) $TCLUTIL set_from_env MAKE_KEYTAB $TESTDIR/scripts/make-host-keytab.pl @@ -96,22 +96,22 @@ } expect_tcl_prompt - send_tcl_cmd_await_echo {ovsec_kadm_init admin admin $OVSEC_KADM_ADMIN_SERVICE null $OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 server_handle} + send_tcl_cmd_await_echo {kadm5_init admin admin $KADM5_ADMIN_SERVICE null $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 server_handle} expect_kadm_ok expect "^% " - send_tcl_cmd_await_echo {ovsec_kadm_create_principal $server_handle [simple_principal server/$h] {OVSEC_KADM_PRINCIPAL} admin} + send_tcl_cmd_await_echo {kadm5_create_principal $server_handle [simple_principal server/$h] {KADM5_PRINCIPAL} admin} expect_kadm_ok expect "^% " - send_tcl_cmd_await_echo {ovsec_kadm_randkey_principal $server_handle server/$h key} + send_tcl_cmd_await_echo {kadm5_randkey_principal $server_handle server/$h key null} expect_kadm_ok expect "^% " - send_tcl_cmd_await_echo {ovsec_kadm_create_principal $server_handle [simple_principal notserver/$h] {OVSEC_KADM_PRINCIPAL} admin} + send_tcl_cmd_await_echo {kadm5_create_principal $server_handle [simple_principal notserver/$h] {KADM5_PRINCIPAL} admin} expect_kadm_ok expect "^% " - send_tcl_cmd_await_echo {ovsec_kadm_randkey_principal $server_handle notserver/$h key} + send_tcl_cmd_await_echo {kadm5_randkey_principal $server_handle notserver/$h key null} expect_kadm_ok expect "^% " - send_tcl_cmd_await_echo {ovsec_kadm_destroy $server_handle} + send_tcl_cmd_await_echo {kadm5_destroy $server_handle} expect_kadm_ok expect "^% " wait -nowait -i $spawn_id Modified: trunk/src/lib/rpc/unit-test/rpc_test_setup.sh =================================================================== --- trunk/src/lib/rpc/unit-test/rpc_test_setup.sh 2009-08-13 18:48:46 UTC (rev 22520) +++ trunk/src/lib/rpc/unit-test/rpc_test_setup.sh 2009-08-13 21:25:54 UTC (rev 22521) @@ -8,7 +8,7 @@ # $Source$ DUMMY=${TESTDIR=$TOP/testing} -DUMMY=${CLNTTCL=$TESTDIR/util/ovsec_kadm_clnt_tcl} +DUMMY=${CLNTTCL=$TESTDIR/util/kadm5_clnt_tcl} DUMMY=${TCLUTIL=$TESTDIR/tcl/util.t}; export TCLUTIL DUMMY=${MAKE_KEYTAB=$TESTDIR/scripts/make-host-keytab.pl} @@ -26,13 +26,13 @@ cat - > /tmp/rpc_test_setup$$ <<\EOF source $env(TCLUTIL) set h $env(CANON_HOST) -puts stdout [ovsec_kadm_init admin admin $OVSEC_KADM_ADMIN_SERVICE null $OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 server_handle] +puts stdout [kadm5_init admin admin $KADM5_ADMIN_SERVICE null $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 server_handle] if ![info exists server_handle] { exit 1 } -puts stdout [ovsec_kadm_create_principal $server_handle [simple_principal server/$h] {OVSEC_KADM_PRINCIPAL} admin] -puts stdout [ovsec_kadm_randkey_principal $server_handle server/$h key] -puts stdout [ovsec_kadm_create_principal $server_handle [simple_principal notserver/$h] {OVSEC_KADM_PRINCIPAL} admin] -puts stdout [ovsec_kadm_randkey_principal $server_handle notserver/$h key] -puts stdout [ovsec_kadm_destroy $server_handle] +puts stdout [kadm5_create_principal $server_handle [simple_principal server/$h] {KADM5_PRINCIPAL} admin] +puts stdout [kadm5_randkey_principal $server_handle server/$h key null] +puts stdout [kadm5_create_principal $server_handle [simple_principal notserver/$h] {KADM5_PRINCIPAL} admin] +puts stdout [kadm5_randkey_principal $server_handle notserver/$h key null] +puts stdout [kadm5_destroy $server_handle] EOF eval "$CLNTTCL $REDIRECT < /tmp/rpc_test_setup$$" if test $? != 0 ; then From ghudson at MIT.EDU Fri Aug 14 12:24:37 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Fri, 14 Aug 2009 12:24:37 -0400 Subject: svn rev #22522: trunk/doc/ Message-ID: <200908141624.n7EGObLr024394@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22522 Commit By: ghudson Log Message: ticket: 6544 In doc/Makefile, specify the new location of the kpasswd man page (the old one was removed in r22521. Changed Files: U trunk/doc/Makefile Modified: trunk/doc/Makefile =================================================================== --- trunk/doc/Makefile 2009-08-13 21:25:54 UTC (rev 22521) +++ trunk/doc/Makefile 2009-08-14 16:24:36 UTC (rev 22522) @@ -21,7 +21,7 @@ krb5conf.texinfo kdcconf.texinfo send-pr.texinfo INSTALL_DEPS=install.texinfo $(INSTALL_INCLUDES) -MANPAGES=$(SRCDIR)/appl/gssftp/ftp/ftp.M $(SRCDIR)/clients/kdestroy/kdestroy.M $(SRCDIR)/clients/kinit/kinit.M $(SRCDIR)/clients/klist/klist.M $(SRCDIR)/clients/ksu/ksu.M $(SRCDIR)/appl/bsd/rcp.M $(SRCDIR)/appl/bsd/rlogin.M $(SRCDIR)/appl/bsd/rsh.M $(SRCDIR)/appl/telnet/telnet/telnet.1 $(SRCDIR)/kadmin/passwd/kpasswd.M +MANPAGES=$(SRCDIR)/appl/gssftp/ftp/ftp.M $(SRCDIR)/clients/kdestroy/kdestroy.M $(SRCDIR)/clients/kinit/kinit.M $(SRCDIR)/clients/klist/klist.M $(SRCDIR)/clients/ksu/ksu.M $(SRCDIR)/appl/bsd/rcp.M $(SRCDIR)/appl/bsd/rlogin.M $(SRCDIR)/appl/bsd/rsh.M $(SRCDIR)/appl/telnet/telnet/telnet.1 $(SRCDIR)/clients/kpasswd/kpasswd.M USER_GUIDE_INCLUDES=definitions.texinfo copyright.texinfo glossary.texinfo USER_GUIDE_DEPS=user-guide.texinfo $(USER_GUIDE_INCLUDES) @@ -112,7 +112,7 @@ $(MANTXT) $(SRCDIR)/appl/bsd/rlogin.M | $(MANHTML) > rlogin.html $(MANTXT) $(SRCDIR)/appl/bsd/rsh.M | $(MANHTML) > rsh.html $(MANTXT) $(SRCDIR)/appl/telnet/telnet/telnet.1 | $(MANHTML) > telnet.html - $(MANTXT) $(SRCDIR)/kadmin/passwd/kpasswd.M | $(MANHTML) > kpasswd.html + $(MANTXT) $(SRCDIR)/clients/kpasswd/kpasswd.M | $(MANHTML) > kpasswd.html $(HTML) user-guide.texinfo .PHONY: implementor.ps implementor.pdf implementor.info From ghudson at MIT.EDU Mon Aug 17 10:39:45 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Mon, 17 Aug 2009 10:39:45 -0400 Subject: svn rev #22523: trunk/src/ kadmin/server/ lib/kadm5/ lib/kadm5/srv/ Message-ID: <200908171439.n7HEdjSk032319@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22523 Commit By: ghudson Log Message: ticket: 6544 Remove unused variables resulting from r22521, and also remove the unused file svr_misc_free.c. Changed Files: U trunk/src/kadmin/server/server_stubs.c U trunk/src/lib/kadm5/misc_free.c D trunk/src/lib/kadm5/srv/svr_misc_free.c U trunk/src/lib/kadm5/srv/svr_principal.c Modified: trunk/src/kadmin/server/server_stubs.c =================================================================== --- trunk/src/kadmin/server/server_stubs.c 2009-08-14 16:24:36 UTC (rev 22522) +++ trunk/src/kadmin/server/server_stubs.c 2009-08-17 14:39:44 UTC (rev 22523) @@ -1398,7 +1398,6 @@ gss_buffer_desc client_name, service_name; OM_uint32 minor_stat; - kadm5_policy_ent_t e; kadm5_principal_ent_rec caller_ent; kadm5_server_handle_t handle; const char *errmsg = NULL; Modified: trunk/src/lib/kadm5/misc_free.c =================================================================== --- trunk/src/lib/kadm5/misc_free.c 2009-08-14 16:24:36 UTC (rev 22522) +++ trunk/src/lib/kadm5/misc_free.c 2009-08-17 14:39:44 UTC (rev 22523) @@ -14,8 +14,6 @@ kadm5_ret_t kadm5_free_policy_ent(void *server_handle, kadm5_policy_ent_t val) { - kadm5_server_handle_t handle = server_handle; - _KADM5_CHECK_HANDLE(server_handle); if (val) Deleted: trunk/src/lib/kadm5/srv/svr_misc_free.c Modified: trunk/src/lib/kadm5/srv/svr_principal.c =================================================================== --- trunk/src/lib/kadm5/srv/svr_principal.c 2009-08-14 16:24:36 UTC (rev 22522) +++ trunk/src/lib/kadm5/srv/svr_principal.c 2009-08-17 14:39:44 UTC (rev 22523) @@ -1476,7 +1476,6 @@ osa_princ_ent_rec adb; krb5_int32 now; kadm5_policy_ent_rec pol; - krb5_key_data *key_data; int ret, last_pwd, have_pol = 0; kadm5_server_handle_t handle = server_handle; krb5_keyblock *act_mkey; @@ -2004,7 +2003,6 @@ { krb5_db_entry kdb; osa_princ_ent_rec adb; - krb5_key_data *key_data; kadm5_ret_t ret; kadm5_server_handle_t handle = server_handle; krb5_keyblock *mkey_ptr; From ghudson at MIT.EDU Mon Aug 17 15:40:49 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Mon, 17 Aug 2009 15:40:49 -0400 Subject: svn rev #22527: trunk/src/ kadmin/cli/ kadmin/dbutil/ kadmin/server/ kadmin/testing/util/ ... Message-ID: <200908171940.n7HJenpJ029273@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22527 Commit By: ghudson Log Message: ticket: 6547 subject: Modify kadm5 initializers to accept krb5 contexts Add krb5_context parameters to all kadm5 initialization functions. This allows extended error information to be retrieved by the caller when an error is returned. Changed Files: U trunk/src/kadmin/cli/kadmin.c U trunk/src/kadmin/dbutil/kadm5_create.c U trunk/src/kadmin/server/ovsec_kadmd.c U trunk/src/kadmin/testing/util/tcl_kadm5.c U trunk/src/lib/kadm5/admin.h U trunk/src/lib/kadm5/clnt/client_init.c U trunk/src/lib/kadm5/srv/server_init.c U trunk/src/lib/kadm5/unit-test/destroy-test.c U trunk/src/lib/kadm5/unit-test/handle-test.c U trunk/src/lib/kadm5/unit-test/init-test.c U trunk/src/lib/kadm5/unit-test/iter-test.c U trunk/src/lib/kadm5/unit-test/randkey-test.c U trunk/src/lib/kadm5/unit-test/setkey-test.c U trunk/src/slave/kpropd.c Modified: trunk/src/kadmin/cli/kadmin.c =================================================================== --- trunk/src/kadmin/cli/kadmin.c 2009-08-17 16:26:23 UTC (rev 22526) +++ trunk/src/kadmin/cli/kadmin.c 2009-08-17 19:40:48 UTC (rev 22527) @@ -479,7 +479,7 @@ if (ccache_name) { printf("Authenticating as principal %s with existing credentials.\n", princstr); - retval = kadm5_init_with_creds(princstr, cc, + retval = kadm5_init_with_creds(context, princstr, cc, svcname, ¶ms, KADM5_STRUCT_VERSION, @@ -493,7 +493,7 @@ else printf("Authenticating as principal %s with default keytab.\n", princstr); - retval = kadm5_init_with_skey(princstr, keytab_name, + retval = kadm5_init_with_skey(context, princstr, keytab_name, svcname, ¶ms, KADM5_STRUCT_VERSION, @@ -503,7 +503,7 @@ } else { printf("Authenticating as principal %s with password.\n", princstr); - retval = kadm5_init_with_password(princstr, password, + retval = kadm5_init_with_password(context, princstr, password, svcname, ¶ms, KADM5_STRUCT_VERSION, Modified: trunk/src/kadmin/dbutil/kadm5_create.c =================================================================== --- trunk/src/kadmin/dbutil/kadm5_create.c 2009-08-17 16:26:23 UTC (rev 22526) +++ trunk/src/kadmin/dbutil/kadm5_create.c 2009-08-17 19:40:48 UTC (rev 22527) @@ -106,7 +106,7 @@ retval = krb5_klog_init(context, "admin_server", progname, 0); if (retval) return retval; - if ((retval = kadm5_init(progname, NULL, NULL, params, + if ((retval = kadm5_init(context, progname, NULL, NULL, params, KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, db5util_db_args, Modified: trunk/src/kadmin/server/ovsec_kadmd.c =================================================================== --- trunk/src/kadmin/server/ovsec_kadmd.c 2009-08-17 16:26:23 UTC (rev 22526) +++ trunk/src/kadmin/server/ovsec_kadmd.c 2009-08-17 19:40:48 UTC (rev 22527) @@ -303,7 +303,7 @@ krb5_klog_init(context, "admin_server", whoami, 1); - if((ret = kadm5_init("kadmind", NULL, + if((ret = kadm5_init(context, "kadmind", NULL, NULL, ¶ms, KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, Modified: trunk/src/kadmin/testing/util/tcl_kadm5.c =================================================================== --- trunk/src/kadmin/testing/util/tcl_kadm5.c 2009-08-17 16:26:23 UTC (rev 22526) +++ trunk/src/kadmin/testing/util/tcl_kadm5.c 2009-08-17 19:40:48 UTC (rev 22527) @@ -1600,13 +1600,13 @@ } } - ret = kadm5_init_with_creds(client_name, cc, service_name, + ret = kadm5_init_with_creds(context, client_name, cc, service_name, ¶ms, struct_version, api_version, NULL, &server_handle); (void) krb5_cc_close(context, cc); } else - ret = kadm5_init(client_name, pass, service_name, ¶ms, + ret = kadm5_init(context, client_name, pass, service_name, ¶ms, struct_version, api_version, NULL, &server_handle); if (ret != KADM5_OK) { Modified: trunk/src/lib/kadm5/admin.h =================================================================== --- trunk/src/lib/kadm5/admin.h 2009-08-17 16:26:23 UTC (rev 22526) +++ trunk/src/lib/kadm5/admin.h 2009-08-17 19:40:48 UTC (rev 22527) @@ -314,14 +314,22 @@ krb5_error_code kadm5_get_admin_service_name(krb5_context, char *, char *, size_t); -kadm5_ret_t kadm5_init(char *client_name, char *pass, - char *service_name, +/* + * For all initialization functions, the caller must first initialize + * a context with kadm5_init_krb5_context which will survive as long + * as the resulting handle. The caller should free the context with + * krb5_free_context. + */ + +kadm5_ret_t kadm5_init(krb5_context context, char *client_name, + char *pass, char *service_name, kadm5_config_params *params, krb5_ui_4 struct_version, krb5_ui_4 api_version, char **db_args, void **server_handle); -kadm5_ret_t kadm5_init_with_password(char *client_name, +kadm5_ret_t kadm5_init_with_password(krb5_context context, + char *client_name, char *pass, char *service_name, kadm5_config_params *params, @@ -329,7 +337,8 @@ krb5_ui_4 api_version, char **db_args, void **server_handle); -kadm5_ret_t kadm5_init_with_skey(char *client_name, +kadm5_ret_t kadm5_init_with_skey(krb5_context context, + char *client_name, char *keytab, char *service_name, kadm5_config_params *params, @@ -337,7 +346,8 @@ krb5_ui_4 api_version, char **db_args, void **server_handle); -kadm5_ret_t kadm5_init_with_creds(char *client_name, +kadm5_ret_t kadm5_init_with_creds(krb5_context context, + char *client_name, krb5_ccache cc, char *service_name, kadm5_config_params *params, Modified: trunk/src/lib/kadm5/clnt/client_init.c =================================================================== --- trunk/src/lib/kadm5/clnt/client_init.c 2009-08-17 16:26:23 UTC (rev 22526) +++ trunk/src/lib/kadm5/clnt/client_init.c 2009-08-17 19:40:48 UTC (rev 22527) @@ -60,7 +60,8 @@ enum init_type { INIT_PASS, INIT_SKEY, INIT_CREDS }; -static kadm5_ret_t _kadm5_init_any(char *client_name, +static kadm5_ret_t _kadm5_init_any(krb5_context context, + char *client_name, enum init_type init_type, char *pass, krb5_ccache ccache_in, @@ -97,7 +98,8 @@ gss_cred_id_t gss_client_creds, gss_name_t gss_target); -kadm5_ret_t kadm5_init_with_creds(char *client_name, +kadm5_ret_t kadm5_init_with_creds(krb5_context context, + char *client_name, krb5_ccache ccache, char *service_name, kadm5_config_params *params, @@ -106,27 +108,27 @@ char **db_args, void **server_handle) { - return _kadm5_init_any(client_name, INIT_CREDS, NULL, ccache, + return _kadm5_init_any(context, client_name, INIT_CREDS, NULL, ccache, service_name, params, struct_version, api_version, db_args, server_handle); } -kadm5_ret_t kadm5_init_with_password(char *client_name, char *pass, - char *service_name, +kadm5_ret_t kadm5_init_with_password(krb5_context context, char *client_name, + char *pass, char *service_name, kadm5_config_params *params, krb5_ui_4 struct_version, krb5_ui_4 api_version, char **db_args, void **server_handle) { - return _kadm5_init_any(client_name, INIT_PASS, pass, NULL, + return _kadm5_init_any(context, client_name, INIT_PASS, pass, NULL, service_name, params, struct_version, api_version, db_args, server_handle); } -kadm5_ret_t kadm5_init(char *client_name, char *pass, +kadm5_ret_t kadm5_init(krb5_context context, char *client_name, char *pass, char *service_name, kadm5_config_params *params, krb5_ui_4 struct_version, @@ -134,25 +136,25 @@ char **db_args, void **server_handle) { - return _kadm5_init_any(client_name, INIT_PASS, pass, NULL, + return _kadm5_init_any(context, client_name, INIT_PASS, pass, NULL, service_name, params, struct_version, api_version, db_args, server_handle); } -kadm5_ret_t kadm5_init_with_skey(char *client_name, char *keytab, - char *service_name, +kadm5_ret_t kadm5_init_with_skey(krb5_context context, char *client_name, + char *keytab, char *service_name, kadm5_config_params *params, krb5_ui_4 struct_version, krb5_ui_4 api_version, char **db_args, void **server_handle) { - return _kadm5_init_any(client_name, INIT_SKEY, keytab, NULL, + return _kadm5_init_any(context, client_name, INIT_SKEY, keytab, NULL, service_name, params, struct_version, api_version, db_args, server_handle); } -static kadm5_ret_t _kadm5_init_any(char *client_name, +static kadm5_ret_t _kadm5_init_any(krb5_context context, char *client_name, enum init_type init_type, char *pass, krb5_ccache ccache_in, @@ -207,7 +209,7 @@ handle->lhandle->struct_version = KADM5_STRUCT_VERSION; handle->lhandle->lhandle = handle->lhandle; - krb5_init_context(&handle->context); + handle->context = context; if(client_name == NULL) { free(handle); @@ -258,7 +260,6 @@ if ((code = kadm5_get_config_params(handle->context, 0, params_in, &handle->params))) { - krb5_free_context(handle->context); free(handle); return(code); } @@ -268,7 +269,6 @@ KADM5_CONFIG_KADMIND_PORT) if ((handle->params.mask & REQUIRED_PARAMS) != REQUIRED_PARAMS) { - krb5_free_context(handle->context); free(handle); return KADM5_MISSING_KRB5_CONF_PARAMS; } @@ -792,7 +792,6 @@ free (handle->lhandle); kadm5_free_config_params(handle->context, &handle->params); - krb5_free_context(handle->context); handle->magic_number = 0; free(handle); Modified: trunk/src/lib/kadm5/srv/server_init.c =================================================================== --- trunk/src/lib/kadm5/srv/server_init.c 2009-08-17 16:26:23 UTC (rev 22526) +++ trunk/src/lib/kadm5/srv/server_init.c 2009-08-17 19:40:48 UTC (rev 22527) @@ -90,20 +90,21 @@ } } -kadm5_ret_t kadm5_init_with_password(char *client_name, char *pass, - char *service_name, +kadm5_ret_t kadm5_init_with_password(krb5_context context, char *client_name, + char *pass, char *service_name, kadm5_config_params *params, krb5_ui_4 struct_version, krb5_ui_4 api_version, char **db_args, void **server_handle) { - return kadm5_init(client_name, pass, service_name, params, + return kadm5_init(context, client_name, pass, service_name, params, struct_version, api_version, db_args, server_handle); } -kadm5_ret_t kadm5_init_with_creds(char *client_name, +kadm5_ret_t kadm5_init_with_creds(krb5_context context, + char *client_name, krb5_ccache ccache, char *service_name, kadm5_config_params *params, @@ -120,14 +121,14 @@ if (params && (params->mask & KADM5_CONFIG_MKEY_FROM_KBD) && params->mkey_from_kbd) return KADM5_BAD_SERVER_PARAMS; - return kadm5_init(client_name, NULL, service_name, params, + return kadm5_init(context, client_name, NULL, service_name, params, struct_version, api_version, db_args, server_handle); } -kadm5_ret_t kadm5_init_with_skey(char *client_name, char *keytab, - char *service_name, +kadm5_ret_t kadm5_init_with_skey(krb5_context context, char *client_name, + char *keytab, char *service_name, kadm5_config_params *params, krb5_ui_4 struct_version, krb5_ui_4 api_version, @@ -142,12 +143,12 @@ if (params && (params->mask & KADM5_CONFIG_MKEY_FROM_KBD) && params->mkey_from_kbd) return KADM5_BAD_SERVER_PARAMS; - return kadm5_init(client_name, NULL, service_name, params, + return kadm5_init(context, client_name, NULL, service_name, params, struct_version, api_version, db_args, server_handle); } -kadm5_ret_t kadm5_init(char *client_name, char *pass, +kadm5_ret_t kadm5_init(krb5_context context, char *client_name, char *pass, char *service_name, kadm5_config_params *params_in, krb5_ui_4 struct_version, @@ -175,12 +176,7 @@ return ret; } - ret = (int) krb5int_init_context_kdc(&(handle->context)); - if (ret) { - free_db_args(handle); - free(handle); - return(ret); - } + handle->context = context; initialize_ovk_error_table(); /* initialize_adb_error_table(); */ @@ -208,7 +204,6 @@ expect to see admin_server being set sometimes. */ #define ILLEGAL_PARAMS (KADM5_CONFIG_ADMIN_SERVER) if (params_in && (params_in->mask & ILLEGAL_PARAMS)) { - krb5_free_context(handle->context); free_db_args(handle); free(handle); return KADM5_BAD_SERVER_PARAMS; @@ -218,7 +213,6 @@ ret = kadm5_get_config_params(handle->context, 1, params_in, &handle->params); if (ret) { - krb5_free_context(handle->context); free_db_args(handle); free(handle); return(ret); @@ -236,7 +230,6 @@ KADM5_CONFIG_IPROP_PORT) if ((handle->params.mask & REQUIRED_PARAMS) != REQUIRED_PARAMS) { - krb5_free_context(handle->context); free_db_args(handle); free(handle); return KADM5_MISSING_CONF_PARAMS; @@ -244,7 +237,6 @@ if ((handle->params.mask & KADM5_CONFIG_IPROP_ENABLED) == KADM5_CONFIG_IPROP_ENABLED && handle->params.iprop_enabled) { if ((handle->params.mask & IPROP_REQUIRED_PARAMS) != IPROP_REQUIRED_PARAMS) { - krb5_free_context(handle->context); free_db_args(handle); free(handle); return KADM5_MISSING_CONF_PARAMS; @@ -253,7 +245,6 @@ ret = krb5_set_default_realm(handle->context, handle->params.realm); if (ret) { - krb5_free_context(handle->context); free_db_args(handle); free(handle); return ret; @@ -262,7 +253,6 @@ ret = krb5_db_open(handle->context, db_args, KRB5_KDB_OPEN_RW | KRB5_KDB_SRV_TYPE_ADMIN); if (ret) { - krb5_free_context(handle->context); free_db_args(handle); free(handle); return(ret); @@ -271,7 +261,6 @@ if ((ret = krb5_parse_name(handle->context, client_name, &handle->current_caller))) { krb5_db_fini(handle->context); - krb5_free_context(handle->context); free_db_args(handle); free(handle); return ret; @@ -279,7 +268,6 @@ if (! (handle->lhandle = malloc(sizeof(*handle)))) { krb5_db_fini(handle->context); - krb5_free_context(handle->context); free_db_args(handle); free(handle); return ENOMEM; @@ -302,7 +290,6 @@ && handle->params.mkey_from_kbd); if (ret) { krb5_db_fini(handle->context); - krb5_free_context(handle->context); free_db_args(handle); free(handle); return ret; @@ -311,7 +298,6 @@ ret = kdb_init_hist(handle, handle->params.realm); if (ret) { krb5_db_fini(handle->context); - krb5_free_context(handle->context); free_db_args(handle); free(handle); return ret; @@ -321,7 +307,6 @@ if (ret) { krb5_db_fini(handle->context); krb5_free_principal(handle->context, handle->current_caller); - krb5_free_context(handle->context); free_db_args(handle); free(handle); return ret; @@ -344,7 +329,6 @@ krb5_db_fini(handle->context); krb5_free_principal(handle->context, handle->current_caller); kadm5_free_config_params(handle->context, &handle->params); - krb5_free_context(handle->context); handle->magic_number = 0; free(handle->lhandle); free_db_args(handle); Modified: trunk/src/lib/kadm5/unit-test/destroy-test.c =================================================================== --- trunk/src/lib/kadm5/unit-test/destroy-test.c 2009-08-17 16:26:23 UTC (rev 22526) +++ trunk/src/lib/kadm5/unit-test/destroy-test.c 2009-08-17 19:40:48 UTC (rev 22527) @@ -18,9 +18,15 @@ int x; void *server_handle; kadm5_server_handle_t handle; + krb5_context context; + ret = kadm5_init_krb5_context(&context); + if (ret != 0) { + com_err("test", ret, "context init"); + exit(2); + } for(x = 0; x < TEST_NUM; x++) { - ret = kadm5_init("admin", "admin", KADM5_ADMIN_SERVICE, 0, + ret = kadm5_init(context, "admin", "admin", KADM5_ADMIN_SERVICE, 0, KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, NULL, &server_handle); if(ret != KADM5_OK) { Modified: trunk/src/lib/kadm5/unit-test/handle-test.c =================================================================== --- trunk/src/lib/kadm5/unit-test/handle-test.c 2009-08-17 16:26:23 UTC (rev 22526) +++ trunk/src/lib/kadm5/unit-test/handle-test.c 2009-08-17 19:40:48 UTC (rev 22527) @@ -24,7 +24,7 @@ kadm5_init_krb5_context(&context); - ret = kadm5_init("admin/none", "admin", KADM5_ADMIN_SERVICE, NULL, + ret = kadm5_init(context, "admin/none", "admin", KADM5_ADMIN_SERVICE, NULL, KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, NULL, &server_handle); if(ret != KADM5_OK) { Modified: trunk/src/lib/kadm5/unit-test/init-test.c =================================================================== --- trunk/src/lib/kadm5/unit-test/init-test.c 2009-08-17 16:26:23 UTC (rev 22526) +++ trunk/src/lib/kadm5/unit-test/init-test.c 2009-08-17 19:40:48 UTC (rev 22527) @@ -10,10 +10,16 @@ kadm5_ret_t ret; void *server_handle; kadm5_config_params params; + krb5_context context; memset(¶ms, 0, sizeof(params)); params.mask |= KADM5_CONFIG_NO_AUTH; - ret = kadm5_init("admin", "admin", NULL, ¶ms, + ret = kadm5_init_krb5_context(&context); + if (ret != 0) { + com_err("init-test", ret, "while initializing krb5 context"); + exit(1); + } + ret = kadm5_init(context, "admin", "admin", NULL, ¶ms, KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, NULL, &server_handle); if (ret == KADM5_RPC_ERROR) Modified: trunk/src/lib/kadm5/unit-test/iter-test.c =================================================================== --- trunk/src/lib/kadm5/unit-test/iter-test.c 2009-08-17 16:26:23 UTC (rev 22526) +++ trunk/src/lib/kadm5/unit-test/iter-test.c 2009-08-17 19:40:48 UTC (rev 22527) @@ -8,13 +8,19 @@ void *server_handle; char **names; int count, princ, i; + krb5_context context; if (argc != 3) { fprintf(stderr, "Usage: %s [-princ|-pol] exp\n", argv[0]); exit(1); } princ = (strcmp(argv[1], "-princ") == 0); - + + ret = kadm5_init_krb5_context(&context); + if (ret != KADM5_OK) { + com_err("iter-test", ret, "while initializing context"); + exit(1); + } ret = kadm5_init("admin", "admin", KADM5_ADMIN_SERVICE, 0, KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, NULL, &server_handle); Modified: trunk/src/lib/kadm5/unit-test/randkey-test.c =================================================================== --- trunk/src/lib/kadm5/unit-test/randkey-test.c 2009-08-17 16:26:23 UTC (rev 22526) +++ trunk/src/lib/kadm5/unit-test/randkey-test.c 2009-08-17 19:40:48 UTC (rev 22527) @@ -22,7 +22,7 @@ kadm5_init_krb5_context(&context); krb5_parse_name(context, "testuser", &tprinc); - ret = kadm5_init("admin", "admin", KADM5_ADMIN_SERVICE, NULL, + ret = kadm5_init(context, "admin", "admin", KADM5_ADMIN_SERVICE, NULL, KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, NULL, &server_handle); if(ret != KADM5_OK) { Modified: trunk/src/lib/kadm5/unit-test/setkey-test.c =================================================================== --- trunk/src/lib/kadm5/unit-test/setkey-test.c 2009-08-17 16:26:23 UTC (rev 22526) +++ trunk/src/lib/kadm5/unit-test/setkey-test.c 2009-08-17 19:40:48 UTC (rev 22527) @@ -118,7 +118,7 @@ exit(1); } - ret = kadm5_init(authprinc, NULL, KADM5_ADMIN_SERVICE, NULL, + ret = kadm5_init(context, authprinc, NULL, KADM5_ADMIN_SERVICE, NULL, KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, NULL, &handle); if (ret) { Modified: trunk/src/slave/kpropd.c =================================================================== --- trunk/src/slave/kpropd.c 2009-08-17 16:26:23 UTC (rev 22526) +++ trunk/src/slave/kpropd.c 2009-08-17 19:40:48 UTC (rev 22527) @@ -696,7 +696,8 @@ /* * Authentication, initialize rpcsec_gss handle etc. */ - retval = kadm5_init_with_skey(iprop_svc_princstr, srvtab, + retval = kadm5_init_with_skey(kpropd_context, iprop_svc_princstr, + srvtab, master_svc_princstr, ¶ms, KADM5_STRUCT_VERSION, @@ -1021,7 +1022,7 @@ (void) memset(¶ms, 0, sizeof (params)); - retval = krb5_init_context(&kpropd_context); + retval = kadm5_init_krb5_context(&kpropd_context); if (retval) { com_err(argv[0], retval, "while initializing krb5"); exit(1); From ghudson at MIT.EDU Mon Aug 17 16:07:21 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Mon, 17 Aug 2009 16:07:21 -0400 Subject: svn rev #22528: trunk/src/lib/kadm5/ clnt/ srv/ Message-ID: <200908172007.n7HK7LAh032549@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22528 Commit By: ghudson Log Message: ticket: 6547 Bump sonames of libkadm5 libraries, since r22527 changed their ABIs. Changed Files: U trunk/src/lib/kadm5/clnt/Makefile.in U trunk/src/lib/kadm5/srv/Makefile.in Modified: trunk/src/lib/kadm5/clnt/Makefile.in =================================================================== --- trunk/src/lib/kadm5/clnt/Makefile.in 2009-08-17 19:40:48 UTC (rev 22527) +++ trunk/src/lib/kadm5/clnt/Makefile.in 2009-08-17 20:07:21 UTC (rev 22528) @@ -6,7 +6,7 @@ DEFS= LIBBASE=kadm5clnt -LIBMAJOR=6 +LIBMAJOR=7 LIBMINOR=0 STOBJLISTS=../OBJS.ST OBJS.ST SHLIB_EXPDEPS=\ Modified: trunk/src/lib/kadm5/srv/Makefile.in =================================================================== --- trunk/src/lib/kadm5/srv/Makefile.in 2009-08-17 19:40:48 UTC (rev 22527) +++ trunk/src/lib/kadm5/srv/Makefile.in 2009-08-17 20:07:21 UTC (rev 22528) @@ -12,7 +12,7 @@ ##DOSLIBNAME = libkadm5srv.lib LIBBASE=kadm5srv -LIBMAJOR=6 +LIBMAJOR=7 LIBMINOR=0 STOBJLISTS=../OBJS.ST OBJS.ST From ghudson at MIT.EDU Mon Aug 17 23:05:17 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Mon, 17 Aug 2009 23:05:17 -0400 Subject: svn rev #22534: trunk/src/plugins/preauth/pkinit/ Message-ID: <200908180305.n7I35Hu8003016@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22534 Commit By: ghudson Log Message: Minor code cleanups in pkinit plugin, mostly around malloc/free invocations. No functional changes. Changed Files: U trunk/src/plugins/preauth/pkinit/pkinit.h U trunk/src/plugins/preauth/pkinit/pkinit_clnt.c U trunk/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c U trunk/src/plugins/preauth/pkinit/pkinit_identity.c U trunk/src/plugins/preauth/pkinit/pkinit_lib.c U trunk/src/plugins/preauth/pkinit/pkinit_matching.c U trunk/src/plugins/preauth/pkinit/pkinit_srv.c Modified: trunk/src/plugins/preauth/pkinit/pkinit.h =================================================================== --- trunk/src/plugins/preauth/pkinit/pkinit.h 2009-08-17 23:45:58 UTC (rev 22533) +++ trunk/src/plugins/preauth/pkinit/pkinit.h 2009-08-18 03:05:16 UTC (rev 22534) @@ -225,7 +225,7 @@ pkinit_identity_opts *idopts; krb5_preauthtype pa_type; }; -typedef struct _pkinit_kdc_context *pkinit_kdc_context; +typedef struct _pkinit_req_context *pkinit_req_context; /* * KDC's (per-realm) plugin context @@ -239,7 +239,7 @@ char *realmname; unsigned int realmname_len; }; -typedef struct _pkinit_req_context *pkinit_req_context; +typedef struct _pkinit_kdc_context *pkinit_kdc_context; /* * KDC's per-request context Modified: trunk/src/plugins/preauth/pkinit/pkinit_clnt.c =================================================================== --- trunk/src/plugins/preauth/pkinit/pkinit_clnt.c 2009-08-17 23:45:58 UTC (rev 22533) +++ trunk/src/plugins/preauth/pkinit/pkinit_clnt.c 2009-08-18 03:05:16 UTC (rev 22534) @@ -151,18 +151,18 @@ * The most we'll return is two pa_data, normally just one. * We need to make room for the NULL terminator. */ - return_pa_data = (krb5_pa_data **) malloc(3 * sizeof(krb5_pa_data *)); + return_pa_data = malloc(3 * sizeof(krb5_pa_data *)); if (return_pa_data == NULL) goto cleanup; return_pa_data[1] = NULL; /* in case of an early trip to cleanup */ return_pa_data[2] = NULL; /* Terminate the list */ - return_pa_data[0] = (krb5_pa_data *) malloc(sizeof(krb5_pa_data)); + return_pa_data[0] = malloc(sizeof(krb5_pa_data)); if (return_pa_data[0] == NULL) goto cleanup; - return_pa_data[1] = (krb5_pa_data *) malloc(sizeof(krb5_pa_data)); + return_pa_data[1] = malloc(sizeof(krb5_pa_data)); if (return_pa_data[1] == NULL) goto cleanup; @@ -200,16 +200,12 @@ cleanup: if (der_req != NULL) krb5_free_data(context, der_req); + free(out_data); - if (out_data != NULL) - free(out_data); - if (retval) { if (return_pa_data) { - if (return_pa_data[0] != NULL) - free(return_pa_data[0]); - if (return_pa_data[1] != NULL) - free(return_pa_data[1]); + free(return_pa_data[0]); + free(return_pa_data[1]); free(return_pa_data); } if (out_data) { @@ -859,23 +855,19 @@ retval = 0; cleanup: - if (dh_data.data != NULL) - free(dh_data.data); - if (client_key != NULL) - free(client_key); + free(dh_data.data); + free(client_key); free_krb5_kdc_dh_key_info(&kdc_dh); free_krb5_pa_pk_as_rep(&kdc_reply); if (key_pack != NULL) { free_krb5_reply_key_pack(&key_pack); - if (cksum.contents != NULL) - free(cksum.contents); + free(cksum.contents); } if (key_pack9 != NULL) free_krb5_reply_key_pack_draft9(&key_pack9); - if (kdc_hostname != NULL) - free(kdc_hostname); + free(kdc_hostname); pkiDebug("pkinit_as_rep_parse returning %d (%s)\n", retval, error_message(retval)); @@ -1191,12 +1183,12 @@ void **request_context) { krb5_error_code retval = ENOMEM; - struct _pkinit_req_context *reqctx = NULL; - struct _pkinit_context *plgctx = (struct _pkinit_context *)plugin_context; + pkinit_req_context reqctx = NULL; + pkinit_context plgctx = plugin_context; *request_context = NULL; - reqctx = (struct _pkinit_req_context *) malloc(sizeof(*reqctx)); + reqctx = malloc(sizeof(*reqctx)); if (reqctx == NULL) return; memset(reqctx, 0, sizeof(*reqctx)); @@ -1253,8 +1245,7 @@ void *plugin_context, void *request_context) { - struct _pkinit_req_context *reqctx = - (struct _pkinit_req_context *)request_context; + pkinit_req_context reqctx = request_context; pkiDebug("%s: received reqctx at %p\n", __FUNCTION__, reqctx); if (reqctx == NULL) @@ -1284,9 +1275,9 @@ pkinit_client_plugin_init(krb5_context context, void **blob) { krb5_error_code retval = ENOMEM; - struct _pkinit_context *ctx = NULL; + pkinit_context ctx = NULL; - ctx = (struct _pkinit_context *)calloc(1, sizeof(*ctx)); + ctx = calloc(1, sizeof(*ctx)); if (ctx == NULL) return ENOMEM; memset(ctx, 0, sizeof(*ctx)); @@ -1325,7 +1316,7 @@ static void pkinit_client_plugin_fini(krb5_context context, void *blob) { - struct _pkinit_context *ctx = (struct _pkinit_context *)blob; + pkinit_context ctx = blob; if (ctx == NULL || ctx->magic != PKINIT_CTX_MAGIC) { pkiDebug("pkinit_lib_fini: got bad plgctx (%p)!\n", ctx); @@ -1379,7 +1370,7 @@ } static krb5_error_code handle_gic_opt(krb5_context context, - struct _pkinit_context *plgctx, + pkinit_context plgctx, const char *attr, const char *value) { @@ -1418,7 +1409,7 @@ const char *value) { krb5_error_code retval; - struct _pkinit_context *plgctx = (struct _pkinit_context *)plugin_context; + pkinit_context plgctx = plugin_context; pkiDebug("(pkinit) received '%s' = '%s'\n", attr, value); retval = handle_gic_opt(context, plgctx, attr, value); Modified: trunk/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c =================================================================== --- trunk/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2009-08-17 23:45:58 UTC (rev 22533) +++ trunk/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2009-08-18 03:05:16 UTC (rev 22534) @@ -268,15 +268,15 @@ static int pkinit_oids_refs = 0; krb5_error_code -pkinit_init_plg_crypto(pkinit_plg_crypto_context *cryptoctx) { - +pkinit_init_plg_crypto(pkinit_plg_crypto_context *cryptoctx) +{ krb5_error_code retval = ENOMEM; pkinit_plg_crypto_context ctx = NULL; /* initialize openssl routines */ openssl_init(); - ctx = (pkinit_plg_crypto_context)malloc(sizeof(*ctx)); + ctx = malloc(sizeof(*ctx)); if (ctx == NULL) goto out; memset(ctx, 0, sizeof(*ctx)); @@ -318,7 +318,7 @@ krb5_error_code retval = ENOMEM; pkinit_identity_crypto_context ctx = NULL; - ctx = (pkinit_identity_crypto_context)malloc(sizeof(*ctx)); + ctx = malloc(sizeof(*ctx)); if (ctx == NULL) goto out; memset(ctx, 0, sizeof(*ctx)); @@ -358,11 +358,10 @@ krb5_error_code pkinit_init_req_crypto(pkinit_req_crypto_context *cryptoctx) { - krb5_error_code retval = ENOMEM; pkinit_req_crypto_context ctx = NULL; - ctx = (pkinit_req_crypto_context)malloc(sizeof(*ctx)); + ctx = malloc(sizeof(*ctx)); if (ctx == NULL) goto out; memset(ctx, 0, sizeof(*ctx)); @@ -684,14 +683,10 @@ pkinit_C_UnloadModule(ctx->p11_module); ctx->p11_module = NULL; } - if (ctx->p11_module_name != NULL) - free(ctx->p11_module_name); - if (ctx->token_label != NULL) - free(ctx->token_label); - if (ctx->cert_id != NULL) - free(ctx->cert_id); - if (ctx->cert_label != NULL) - free(ctx->cert_label); + free(ctx->p11_module_name); + free(ctx->token_label); + free(ctx->cert_id); + free(ctx->cert_label); #endif } @@ -894,7 +889,7 @@ alg->algorithm = OBJ_nid2obj(NID_sha1); alg->parameter = NULL; alg_len = i2d_X509_ALGOR(alg, NULL); - alg_buf = (unsigned char *)malloc(alg_len); + alg_buf = malloc(alg_len); if (alg_buf == NULL) goto cleanup2; @@ -903,13 +898,13 @@ goto cleanup2; ASN1_OCTET_STRING_set(digest, md_data2, (int)md_len2); digest_len = i2d_ASN1_OCTET_STRING(digest, NULL); - digest_buf = (unsigned char *)malloc(digest_len); + digest_buf = malloc(digest_len); if (digest_buf == NULL) goto cleanup2; digestInfo_len = ASN1_object_size(1, (int)(alg_len + digest_len), V_ASN1_SEQUENCE); - y = digestInfo_buf = (unsigned char *)malloc(digestInfo_len); + y = digestInfo_buf = malloc(digestInfo_len); if (digestInfo_buf == NULL) goto cleanup2; ASN1_put_object(&y, 1, (int)(alg_len + digest_len), V_ASN1_SEQUENCE, @@ -987,8 +982,7 @@ pkiDebug("failed to der encode pkcs7\n"); goto cleanup2; } - if ((p = *signed_data = - (unsigned char *) malloc((size_t)*signed_data_len)) == NULL) + if ((p = *signed_data = malloc(*signed_data_len)) == NULL) goto cleanup2; /* DER encode PKCS7 data */ @@ -1025,12 +1019,9 @@ if (id_cryptoctx->pkcs11_method == 1 && id_cryptoctx->mech == CKM_RSA_PKCS) { EVP_MD_CTX_cleanup(&ctx2); - if (digest_buf != NULL) - free(digest_buf); - if (digestInfo_buf != NULL) - free(digestInfo_buf); - if (alg_buf != NULL) - free(alg_buf); + free(digest_buf); + free(digestInfo_buf); + free(alg_buf); if (digest != NULL) ASN1_OCTET_STRING_free(digest); } @@ -1040,8 +1031,7 @@ cleanup: if (p7 != NULL) PKCS7_free(p7); - if (sig != NULL) - free(sig); + free(sig); return retval; } @@ -1340,7 +1330,7 @@ print_buffer_bin((unsigned char *)authz->data, authz->length, "/tmp/kdc_ad_initial_verified_cas"); #endif - *authz_data = (unsigned char *)malloc(authz->length); + *authz_data = malloc(authz->length); if (*authz_data == NULL) { retval = ENOMEM; goto cleanup; @@ -1471,7 +1461,7 @@ } *out_len = i2d_PKCS7(p7, NULL); - if (!*out_len || (p = *out = (unsigned char *)malloc(*out_len)) == NULL) { + if (!*out_len || (p = *out = malloc(*out_len)) == NULL) { retval = ENOMEM; goto cleanup; } @@ -1491,10 +1481,8 @@ PKCS7_free(p7); if (in != NULL) BIO_free(in); - if (signed_data != NULL) - free(signed_data); - if (enc_data != NULL) - free(enc_data); + free(signed_data); + free(enc_data); if (encerts != NULL) sk_X509_free(encerts); @@ -1656,10 +1644,8 @@ PKCS7_free(p7); if (out != NULL) BIO_free(out); - if (tmp_buf != NULL) - free(tmp_buf); - if (tmp_buf2 != NULL) - free(tmp_buf2); + free(tmp_buf); + free(tmp_buf2); return retval; } @@ -1949,8 +1935,7 @@ size_t keybytes, keylength, offset; krb5_data random_data; - - if ((buf = (unsigned char *) malloc(dh_key_len)) == NULL) { + if ((buf = malloc(dh_key_len)) == NULL) { retval = ENOMEM; goto cleanup; } @@ -1995,8 +1980,7 @@ retval = krb5_c_random_to_key(context, etype, &random_data, key_block); cleanup: - if (buf != NULL) - free(buf); + free(buf); if (retval && key_block->contents != NULL && key_block->length != 0) { memset(key_block->contents, 0, key_block->length); key_block->length = 0; @@ -2093,8 +2077,7 @@ if ((pub_key = BN_to_ASN1_INTEGER(cryptoctx->dh->pub_key, NULL)) == NULL) goto cleanup; *dh_pubkey_len = i2d_ASN1_INTEGER(pub_key, NULL); - if ((buf = *dh_pubkey = (unsigned char *) - malloc((size_t) *dh_pubkey_len)) == NULL) { + if ((buf = *dh_pubkey = malloc(*dh_pubkey_len)) == NULL) { retval = ENOMEM; goto cleanup; } @@ -2110,11 +2093,9 @@ if (cryptoctx->dh != NULL) DH_free(cryptoctx->dh); cryptoctx->dh = NULL; - if (*dh_params != NULL) - free(*dh_params); + free(*dh_params); *dh_params = NULL; - if (*dh_pubkey != NULL) - free(*dh_pubkey); + free(*dh_pubkey); *dh_pubkey = NULL; if (pub_key != NULL) ASN1_INTEGER_free(pub_key); @@ -2149,8 +2130,7 @@ } *client_key_len = DH_size(cryptoctx->dh); - if ((*client_key = (unsigned char *) - malloc((size_t) *client_key_len)) == NULL) { + if ((*client_key = malloc(*client_key_len)) == NULL) { retval = ENOMEM; goto cleanup; } @@ -2178,8 +2158,7 @@ return retval; cleanup: - if (*client_key != NULL) - free(*client_key); + free(*client_key); *client_key = NULL; if (pub_key != NULL) ASN1_INTEGER_free(pub_key); @@ -2294,7 +2273,7 @@ /* generate DH session key */ *server_key_len = DH_size(dh_server); - if ((*server_key = (unsigned char *) malloc((size_t)*server_key_len)) == NULL) + if ((*server_key = malloc(*server_key_len)) == NULL) goto cleanup; DH_compute_key(*server_key, dh->pub_key, dh_server); @@ -2316,7 +2295,7 @@ if ((pub_key = BN_to_ASN1_INTEGER(dh_server->pub_key, NULL)) == NULL) goto cleanup; *dh_pubkey_len = i2d_ASN1_INTEGER(pub_key, NULL); - if ((p = *dh_pubkey = (unsigned char *) malloc((size_t)*dh_pubkey_len)) == NULL) + if ((p = *dh_pubkey = malloc(*dh_pubkey_len)) == NULL) goto cleanup; i2d_ASN1_INTEGER(pub_key, &p); if (pub_key != NULL) @@ -2331,10 +2310,8 @@ cleanup: if (dh_server != NULL) DH_free(dh_server); - if (*dh_pubkey != NULL) - free(*dh_pubkey); - if (*server_key != NULL) - free(*server_key); + free(*dh_pubkey); + free(*server_key); return retval; } @@ -2374,7 +2351,7 @@ r = ASN1_object_size(1, bufsize, V_ASN1_SEQUENCE); - tmp = *buf = (unsigned char *)malloc((size_t) r); + tmp = *buf = malloc((size_t) r); if (tmp == NULL) goto cleanup; @@ -2503,7 +2480,7 @@ print_buffer_bin((unsigned char *)td_certifiers->data, td_certifiers->length, "/tmp/kdc_td_certifiers"); #endif - typed_data = malloc (2 * sizeof(krb5_typed_data *)); + typed_data = malloc(2 * sizeof(krb5_typed_data *)); if (typed_data == NULL) { retval = ENOMEM; goto cleanup; @@ -2527,9 +2504,9 @@ print_buffer_bin((unsigned char *)data->data, data->length, "/tmp/kdc_edata"); #endif - *out_data = (krb5_data *)malloc(sizeof(krb5_data)); + *out_data = malloc(sizeof(krb5_data)); (*out_data)->length = data->length; - (*out_data)->data = (char *)malloc(data->length); + (*out_data)->data = malloc(data->length); memcpy((*out_data)->data, data->data, data->length); retval = 0; @@ -2539,17 +2516,13 @@ free_krb5_external_principal_identifier(&krb5_trusted_certifiers); if (data != NULL) { - if (data->data != NULL) - free(data->data); + free(data->data); free(data); } - if (td_certifiers != NULL) - free(td_certifiers); + free(td_certifiers); + free_krb5_typed_data(&typed_data); - if (typed_data != NULL) - free_krb5_typed_data(&typed_data); - return retval; } @@ -2629,30 +2602,30 @@ if (algId == NULL) goto cleanup; algId[3] = NULL; - algId[0] = (krb5_algorithm_identifier *)malloc(sizeof(krb5_algorithm_identifier)); + algId[0] = malloc(sizeof(krb5_algorithm_identifier)); if (algId[0] == NULL) goto cleanup; - algId[0]->parameters.data = (unsigned char *)malloc(buf2_len); + algId[0]->parameters.data = malloc(buf2_len); if (algId[0]->parameters.data == NULL) goto cleanup; memcpy(algId[0]->parameters.data, buf2, buf2_len); algId[0]->parameters.length = buf2_len; algId[0]->algorithm = dh_oid; - algId[1] = (krb5_algorithm_identifier *)malloc(sizeof(krb5_algorithm_identifier)); + algId[1] = malloc(sizeof(krb5_algorithm_identifier)); if (algId[1] == NULL) goto cleanup; - algId[1]->parameters.data = (unsigned char *)malloc(buf3_len); + algId[1]->parameters.data = malloc(buf3_len); if (algId[1]->parameters.data == NULL) goto cleanup; memcpy(algId[1]->parameters.data, buf3, buf3_len); algId[1]->parameters.length = buf3_len; algId[1]->algorithm = dh_oid; - algId[2] = (krb5_algorithm_identifier *)malloc(sizeof(krb5_algorithm_identifier)); + algId[2] = malloc(sizeof(krb5_algorithm_identifier)); if (algId[2] == NULL) goto cleanup; - algId[2]->parameters.data = (unsigned char *)malloc(buf1_len); + algId[2]->parameters.data = malloc(buf1_len); if (algId[2]->parameters.data == NULL) goto cleanup; memcpy(algId[2]->parameters.data, buf1, buf1_len); @@ -2664,20 +2637,20 @@ if (algId == NULL) goto cleanup; algId[2] = NULL; - algId[0] = (krb5_algorithm_identifier *)malloc(sizeof(krb5_algorithm_identifier)); + algId[0] = malloc(sizeof(krb5_algorithm_identifier)); if (algId[0] == NULL) goto cleanup; - algId[0]->parameters.data = (unsigned char *)malloc(buf2_len); + algId[0]->parameters.data = malloc(buf2_len); if (algId[0]->parameters.data == NULL) goto cleanup; memcpy(algId[0]->parameters.data, buf2, buf2_len); algId[0]->parameters.length = buf2_len; algId[0]->algorithm = dh_oid; - algId[1] = (krb5_algorithm_identifier *)malloc(sizeof(krb5_algorithm_identifier)); + algId[1] = malloc(sizeof(krb5_algorithm_identifier)); if (algId[1] == NULL) goto cleanup; - algId[1]->parameters.data = (unsigned char *)malloc(buf3_len); + algId[1]->parameters.data = malloc(buf3_len); if (algId[1]->parameters.data == NULL) goto cleanup; memcpy(algId[1]->parameters.data, buf3, buf3_len); @@ -2689,10 +2662,10 @@ if (algId == NULL) goto cleanup; algId[1] = NULL; - algId[0] = (krb5_algorithm_identifier *)malloc(sizeof(krb5_algorithm_identifier)); + algId[0] = malloc(sizeof(krb5_algorithm_identifier)); if (algId[0] == NULL) goto cleanup; - algId[0]->parameters.data = (unsigned char *)malloc(buf3_len); + algId[0]->parameters.data = malloc(buf3_len); if (algId[0]->parameters.data == NULL) goto cleanup; memcpy(algId[0]->parameters.data, buf3, buf3_len); @@ -2707,7 +2680,7 @@ print_buffer_bin((unsigned char *)encoded_algId->data, encoded_algId->length, "/tmp/kdc_td_dh_params"); #endif - typed_data = malloc (2 * sizeof(krb5_typed_data *)); + typed_data = malloc(2 * sizeof(krb5_typed_data *)); if (typed_data == NULL) { retval = ENOMEM; goto cleanup; @@ -2731,11 +2704,11 @@ print_buffer_bin((unsigned char *)data->data, data->length, "/tmp/kdc_edata"); #endif - *out_data = (krb5_data *)malloc(sizeof(krb5_data)); + *out_data = malloc(sizeof(krb5_data)); if (*out_data == NULL) goto cleanup; (*out_data)->length = data->length; - (*out_data)->data = (char *)malloc(data->length); + (*out_data)->data = malloc(data->length); if ((*out_data)->data == NULL) { free(*out_data); *out_data = NULL; @@ -2746,26 +2719,19 @@ retval = 0; cleanup: - if (buf1 != NULL) - free(buf1); - if (buf2 != NULL) - free(buf2); - if (buf3 != NULL) - free(buf3); + free(buf1); + free(buf2); + free(buf3); if (data != NULL) { - if (data->data != NULL) - free(data->data); + free(data->data); free(data); } - if (typed_data != NULL) - free_krb5_typed_data(&typed_data); - if (encoded_algId != NULL) - free(encoded_algId); + free_krb5_typed_data(&typed_data); + free(encoded_algId); if (algId != NULL) { while(algId[i] != NULL) { - if (algId[i]->parameters.data != NULL) - free(algId[i]->parameters.data); + free(algId[i]->parameters.data); free(algId[i]); i++; } @@ -3021,7 +2987,7 @@ tot_len = ASN1_object_size(1, (int)(orig_len+oid_len), V_ASN1_SEQUENCE); } - p = *out = (unsigned char *)malloc(tot_len); + p = *out = malloc(tot_len); if (p == NULL) return -1; if (is_longhorn_server == 0) { @@ -3074,7 +3040,7 @@ tot_len = ASN1_object_size(1, (int)(oid_len), V_ASN1_SEQUENCE); - p = *out = (unsigned char *)malloc(tot_len); + p = *out = malloc(tot_len); if (p == NULL) return -1; @@ -3116,7 +3082,7 @@ tot_len = ASN1_object_size(1, (int)(orig_len+oid_len), V_ASN1_SEQUENCE); - p = *out = (unsigned char *)malloc(tot_len); + p = *out = malloc(tot_len); if (p == NULL) return -1; ASN1_put_object(&p, 1, (int)(orig_len+oid_len), @@ -3159,7 +3125,7 @@ asn1_const_Finish(&c); - *outdata = (unsigned char *)malloc((size_t)Tlen); + *outdata = malloc((size_t)Tlen); if (outdata == NULL) { retval = ENOMEM; goto cleanup; @@ -3230,7 +3196,7 @@ if (asprintf(&prompt, "%.*s PIN%s", (int) sizeof (tip->label), tip->label, warning) < 0) return ENOMEM; - rdat.data = (char *)malloc(tip->ulMaxPinLen + 2); + rdat.data = malloc(tip->ulMaxPinLen + 2); rdat.length = tip->ulMaxPinLen + 1; kprompt.prompt = prompt; @@ -3255,8 +3221,7 @@ r = KRB5KDC_ERR_PREAUTH_FAILED; } } - if (rdat.data) - free(rdat.data); + free(rdat.data); return r; } @@ -3290,14 +3255,14 @@ if (cctx->slotid != PK_NOSLOT) { /* A slot was specified, so that's the only one in the list */ count = 1; - slotlist = (CK_SLOT_ID_PTR) malloc(sizeof (CK_SLOT_ID)); + slotlist = malloc(sizeof(CK_SLOT_ID)); slotlist[0] = cctx->slotid; } else { if (cctx->p11->C_GetSlotList(TRUE, NULL, &count) != CKR_OK) return KRB5KDC_ERR_PREAUTH_FAILED; if (count == 0) return KRB5KDC_ERR_PREAUTH_FAILED; - slotlist = (CK_SLOT_ID_PTR) malloc(count * sizeof (CK_SLOT_ID)); + slotlist = malloc(count * sizeof (CK_SLOT_ID)); if (cctx->p11->C_GetSlotList(TRUE, slotlist, &count) != CKR_OK) return KRB5KDC_ERR_PREAUTH_FAILED; } @@ -3490,7 +3455,7 @@ return KRB5KDC_ERR_PREAUTH_FAILED; } pkiDebug("data_len = %d\n", data_len); - cp = (unsigned char *)malloc((size_t) data_len); + cp = malloc((size_t) data_len); if (cp == NULL) return ENOMEM; len = data_len; @@ -3592,7 +3557,7 @@ * get that. So guess, and if it's too small, re-malloc. */ len = PK_SIGLEN_GUESS; - cp = (unsigned char *)malloc((size_t) len); + cp = malloc((size_t) len); if (cp == NULL) return ENOMEM; @@ -3601,7 +3566,7 @@ if (r == CKR_BUFFER_TOO_SMALL || (r == CKR_OK && len >= PK_SIGLEN_GUESS)) { free(cp); pkiDebug("C_Sign realloc %d\n", (int) len); - cp = (unsigned char *)malloc((size_t) len); + cp = malloc((size_t) len); r = id_cryptoctx->p11->C_Sign(id_cryptoctx->session, data, (CK_ULONG) data_len, cp, &len); } @@ -3655,7 +3620,7 @@ } buf_len = EVP_PKEY_size(pkey); - buf = (unsigned char *)malloc((size_t) buf_len + 10); + buf = malloc((size_t) buf_len + 10); if (buf == NULL) goto cleanup; @@ -3687,7 +3652,7 @@ EVP_VerifyInit(&md_ctx, EVP_sha1()); EVP_SignUpdate(&md_ctx, data, data_len); *sig_len = EVP_PKEY_size(pkey); - if ((*sig = (unsigned char *) malloc((size_t) *sig_len)) == NULL) + if ((*sig = malloc(*sig_len)) == NULL) goto cleanup; EVP_SignFinal(&md_ctx, *sig, sig_len, pkey); @@ -4071,7 +4036,7 @@ pkiDebug("C_GetMechanismList: %s\n", pkinit_pkcs11_code_to_text(r)); return KRB5KDC_ERR_PREAUTH_FAILED; } - mechp = (CK_MECHANISM_TYPE_PTR) malloc(count * sizeof (CK_MECHANISM_TYPE)); + mechp = malloc(count * sizeof (CK_MECHANISM_TYPE)); if (mechp == NULL) return ENOMEM; if ((r = id_cryptoctx->p11->C_GetMechanismList(id_cryptoctx->slotid, @@ -4209,8 +4174,7 @@ if (cred->key != NULL) EVP_PKEY_free(cred->key); #ifndef WITHOUT_PKCS11 - if (cred->cert_id != NULL) - free(cred->cert_id); + free(cred->cert_id); #endif free(cred); } @@ -4981,7 +4945,7 @@ krb5_cas[sk_size] = NULL; for (i = 0; i < sk_size; i++) { - krb5_cas[i] = (krb5_external_principal_identifier *)malloc(sizeof(krb5_external_principal_identifier)); + krb5_cas[i] = malloc(sizeof(krb5_external_principal_identifier)); x = sk_X509_value(sk, i); @@ -4995,7 +4959,7 @@ xn = X509_get_subject_name(x); len = i2d_X509_NAME(xn, NULL); - if ((p = krb5_cas[i]->subjectName.data = (unsigned char *)malloc((size_t) len)) == NULL) + if ((p = krb5_cas[i]->subjectName.data = malloc((size_t) len)) == NULL) goto cleanup; i2d_X509_NAME(xn, &p); krb5_cas[i]->subjectName.length = len; @@ -5014,7 +4978,7 @@ is->serial = M_ASN1_INTEGER_dup(X509_get_serialNumber(x)); len = i2d_PKCS7_ISSUER_AND_SERIAL(is, NULL); if ((p = krb5_cas[i]->issuerAndSerialNumber.data = - (unsigned char *)malloc((size_t) len)) == NULL) + malloc((size_t) len)) == NULL) goto cleanup; i2d_PKCS7_ISSUER_AND_SERIAL(is, &p); krb5_cas[i]->issuerAndSerialNumber.length = len; @@ -5038,7 +5002,7 @@ NULL))) { len = i2d_ASN1_OCTET_STRING(ikeyid, NULL); if ((p = krb5_cas[i]->subjectKeyIdentifier.data = - (unsigned char *)malloc((size_t) len)) == NULL) + malloc((size_t) len)) == NULL) goto cleanup; i2d_ASN1_OCTET_STRING(ikeyid, &p); krb5_cas[i]->subjectKeyIdentifier.length = len; @@ -5113,7 +5077,7 @@ if (loids == NULL) goto cleanup; loids[1] = NULL; - loids[0] = (krb5_algorithm_identifier *)malloc(sizeof(krb5_algorithm_identifier)); + loids[0] = malloc(sizeof(krb5_algorithm_identifier)); if (loids[0] == NULL) { free(loids); goto cleanup; @@ -5182,7 +5146,7 @@ krb5_cas[sk_size] = NULL; for (i = 0; i < sk_size; i++) { - krb5_cas[i] = (krb5_trusted_ca *)malloc(sizeof(krb5_trusted_ca)); + krb5_cas[i] = malloc(sizeof(krb5_trusted_ca)); if (krb5_cas[i] == NULL) goto cleanup; x = sk_X509_value(sk, i); @@ -5201,7 +5165,7 @@ xn = X509_get_subject_name(x); len = i2d_X509_NAME(xn, NULL); if ((p = krb5_cas[i]->u.caName.data = - (unsigned char *)malloc((size_t) len)) == NULL) + malloc((size_t) len)) == NULL) goto cleanup; i2d_X509_NAME(xn, &p); krb5_cas[i]->u.caName.length = len; @@ -5216,7 +5180,7 @@ is->serial = M_ASN1_INTEGER_dup(X509_get_serialNumber(x)); len = i2d_PKCS7_ISSUER_AND_SERIAL(is, NULL); if ((p = krb5_cas[i]->u.issuerAndSerial.data = - (unsigned char *)malloc((size_t) len)) == NULL) + malloc((size_t) len)) == NULL) goto cleanup; i2d_PKCS7_ISSUER_AND_SERIAL(is, &p); krb5_cas[i]->u.issuerAndSerial.length = len; @@ -5264,7 +5228,7 @@ M_ASN1_INTEGER_free(is->serial); is->serial = M_ASN1_INTEGER_dup(X509_get_serialNumber(cert)); len = i2d_PKCS7_ISSUER_AND_SERIAL(is, NULL); - if ((p = *out = (unsigned char *)malloc((size_t) len)) == NULL) + if ((p = *out = malloc((size_t) len)) == NULL) goto cleanup; i2d_PKCS7_ISSUER_AND_SERIAL(is, &p); *out_len = len; @@ -5557,7 +5521,7 @@ if ((s = d2i_ASN1_BIT_STRING(NULL, &p, data_len)) == NULL) goto cleanup; *out_len = s->length; - if ((*out = (unsigned char *) malloc((size_t) *out_len + 1)) == NULL) { + if ((*out = malloc((size_t) *out_len + 1)) == NULL) { retval = ENOMEM; goto cleanup; } Modified: trunk/src/plugins/preauth/pkinit/pkinit_identity.c =================================================================== --- trunk/src/plugins/preauth/pkinit/pkinit_identity.c 2009-08-17 23:45:58 UTC (rev 22533) +++ trunk/src/plugins/preauth/pkinit/pkinit_identity.c 2009-08-18 03:05:16 UTC (rev 22534) @@ -113,7 +113,7 @@ pkinit_identity_opts *opts = NULL; *idopts = NULL; - opts = (pkinit_identity_opts *) calloc(1, sizeof(pkinit_identity_opts)); + opts = calloc(1, sizeof(pkinit_identity_opts)); if (opts == NULL) return ENOMEM; @@ -238,19 +238,13 @@ free_list(idopts->crls); free_list(idopts->identity_alt); - if (idopts->cert_filename != NULL) - free(idopts->cert_filename); - if (idopts->key_filename != NULL) - free(idopts->key_filename); + free(idopts->cert_filename); + free(idopts->key_filename); #ifndef WITHOUT_PKCS11 - if (idopts->p11_module_name != NULL) - free(idopts->p11_module_name); - if (idopts->token_label != NULL) - free(idopts->token_label); - if (idopts->cert_id_string != NULL) - free(idopts->cert_id_string); - if (idopts->cert_label != NULL) - free(idopts->cert_label); + free(idopts->p11_module_name); + free(idopts->token_label); + free(idopts->cert_id_string); + free(idopts->cert_label); #endif free(idopts); } @@ -277,8 +271,7 @@ /* If there is no "=", this is a pkcs11 module name */ if (vp == NULL) { - if (idopts->p11_module_name != NULL) - free(idopts->p11_module_name); + free(idopts->p11_module_name); idopts->p11_module_name = strdup(cp); if (idopts->p11_module_name == NULL) goto cleanup; @@ -286,8 +279,7 @@ } *vp++ = '\0'; if (!strcmp(cp, "module_name")) { - if (idopts->p11_module_name != NULL) - free(idopts->p11_module_name); + free(idopts->p11_module_name); idopts->p11_module_name = strdup(vp); if (idopts->p11_module_name == NULL) goto cleanup; @@ -303,20 +295,17 @@ } idopts->slotid = slotid; } else if (!strcmp(cp, "token")) { - if (idopts->token_label != NULL) - free(idopts->token_label); + free(idopts->token_label); idopts->token_label = strdup(vp); if (idopts->token_label == NULL) goto cleanup; } else if (!strcmp(cp, "certid")) { - if (idopts->cert_id_string != NULL) - free(idopts->cert_id_string); + free(idopts->cert_id_string); idopts->cert_id_string = strdup(vp); if (idopts->cert_id_string == NULL) goto cleanup; } else if (!strcmp(cp, "certlabel")) { - if (idopts->cert_label != NULL) - free(idopts->cert_label); + free(idopts->cert_label); idopts->cert_label = strdup(vp); if (idopts->cert_label == NULL) goto cleanup; @@ -357,8 +346,7 @@ retval = 0; cleanup: - if (certname != NULL) - free(certname); + free(certname); return retval; } Modified: trunk/src/plugins/preauth/pkinit/pkinit_lib.c =================================================================== --- trunk/src/plugins/preauth/pkinit/pkinit_lib.c 2009-08-17 23:45:58 UTC (rev 22533) +++ trunk/src/plugins/preauth/pkinit/pkinit_lib.c 2009-08-18 03:05:16 UTC (rev 22534) @@ -53,7 +53,7 @@ pkinit_req_opts *opts = NULL; *reqopts = NULL; - opts = (pkinit_req_opts *) calloc(1, sizeof(pkinit_req_opts)); + opts = calloc(1, sizeof(*opts)); if (opts == NULL) return retval; @@ -74,8 +74,7 @@ void pkinit_fini_req_opts(pkinit_req_opts *opts) { - if (opts != NULL) - free(opts); + free(opts); return; } @@ -86,7 +85,7 @@ pkinit_plg_opts *opts = NULL; *plgopts = NULL; - opts = (pkinit_plg_opts *) calloc(1, sizeof(pkinit_plg_opts)); + opts = calloc(1, sizeof(pkinit_plg_opts)); if (opts == NULL) return retval; @@ -106,8 +105,7 @@ void pkinit_fini_plg_opts(pkinit_plg_opts *opts) { - if (opts != NULL) - free(opts); + free(opts); return; } @@ -115,12 +113,10 @@ free_krb5_pa_pk_as_req(krb5_pa_pk_as_req **in) { if (*in == NULL) return; - if ((*in)->signedAuthPack.data != NULL) - free((*in)->signedAuthPack.data); + free((*in)->signedAuthPack.data); if ((*in)->trustedCertifiers != NULL) free_krb5_external_principal_identifier(&(*in)->trustedCertifiers); - if ((*in)->kdcPkId.data != NULL) - free((*in)->kdcPkId.data); + free((*in)->kdcPkId.data); free(*in); } @@ -128,12 +124,9 @@ free_krb5_pa_pk_as_req_draft9(krb5_pa_pk_as_req_draft9 **in) { if (*in == NULL) return; - if ((*in)->signedAuthPack.data != NULL) - free((*in)->signedAuthPack.data); - if ((*in)->kdcCert.data != NULL) - free((*in)->kdcCert.data); - if ((*in)->encryptionCert.data != NULL) - free((*in)->encryptionCert.data); + free((*in)->signedAuthPack.data); + free((*in)->kdcCert.data); + free((*in)->encryptionCert.data); if ((*in)->trustedCertifiers != NULL) free_krb5_trusted_ca(&(*in)->trustedCertifiers); free(*in); @@ -143,10 +136,8 @@ free_krb5_reply_key_pack(krb5_reply_key_pack **in) { if (*in == NULL) return; - if ((*in)->replyKey.contents != NULL) - free((*in)->replyKey.contents); - if ((*in)->asChecksum.contents != NULL) - free((*in)->asChecksum.contents); + free((*in)->replyKey.contents); + free((*in)->asChecksum.contents); free(*in); } @@ -154,8 +145,7 @@ free_krb5_reply_key_pack_draft9(krb5_reply_key_pack_draft9 **in) { if (*in == NULL) return; - if ((*in)->replyKey.contents != NULL) - free((*in)->replyKey.contents); + free((*in)->replyKey.contents); free(*in); } @@ -164,16 +154,12 @@ { if ((*in) == NULL) return; if ((*in)->clientPublicValue != NULL) { - if ((*in)->clientPublicValue->algorithm.algorithm.data != NULL) - free((*in)->clientPublicValue->algorithm.algorithm.data); - if ((*in)->clientPublicValue->algorithm.parameters.data != NULL) - free((*in)->clientPublicValue->algorithm.parameters.data); - if ((*in)->clientPublicValue->subjectPublicKey.data != NULL) - free((*in)->clientPublicValue->subjectPublicKey.data); + free((*in)->clientPublicValue->algorithm.algorithm.data); + free((*in)->clientPublicValue->algorithm.parameters.data); + free((*in)->clientPublicValue->subjectPublicKey.data); free((*in)->clientPublicValue); } - if ((*in)->pkAuthenticator.paChecksum.contents != NULL) - free((*in)->pkAuthenticator.paChecksum.contents); + free((*in)->pkAuthenticator.paChecksum.contents); if ((*in)->supportedCMSTypes != NULL) free_krb5_algorithm_identifiers(&((*in)->supportedCMSTypes)); free(*in); @@ -194,12 +180,10 @@ if (*in == NULL) return; switch ((*in)->choice) { case choice_pa_pk_as_rep_dhInfo: - if ((*in)->u.dh_Info.dhSignedData.data != NULL) - free((*in)->u.dh_Info.dhSignedData.data); + free((*in)->u.dh_Info.dhSignedData.data); break; case choice_pa_pk_as_rep_encKeyPack: - if ((*in)->u.encKeyPack.data != NULL) - free((*in)->u.encKeyPack.data); + free((*in)->u.encKeyPack.data); break; default: break; @@ -211,8 +195,7 @@ free_krb5_pa_pk_as_rep_draft9(krb5_pa_pk_as_rep_draft9 **in) { if (*in == NULL) return; - if ((*in)->u.encKeyPack.data != NULL) - free((*in)->u.encKeyPack.data); + free((*in)->u.encKeyPack.data); free(*in); } @@ -222,12 +205,9 @@ int i = 0; if (*in == NULL) return; while ((*in)[i] != NULL) { - if ((*in)[i]->subjectName.data != NULL) - free((*in)[i]->subjectName.data); - if ((*in)[i]->issuerAndSerialNumber.data != NULL) - free((*in)[i]->issuerAndSerialNumber.data); - if ((*in)[i]->subjectKeyIdentifier.data != NULL) - free((*in)[i]->subjectKeyIdentifier.data); + free((*in)[i]->subjectName.data); + free((*in)[i]->issuerAndSerialNumber.data); + free((*in)[i]->subjectKeyIdentifier.data); free((*in)[i]); i++; } @@ -244,12 +224,10 @@ case choice_trusted_cas_principalName: break; case choice_trusted_cas_caName: - if ((*in)[i]->u.caName.data != NULL) - free((*in)[i]->u.caName.data); + free((*in)[i]->u.caName.data); break; case choice_trusted_cas_issuerAndSerial: - if ((*in)[i]->u.issuerAndSerial.data != NULL) - free((*in)[i]->u.issuerAndSerial.data); + free((*in)[i]->u.issuerAndSerial.data); break; case choice_trusted_cas_UNKNOWN: break; @@ -266,8 +244,7 @@ int i = 0; if (*in == NULL) return; while ((*in)[i] != NULL) { - if ((*in)[i]->data != NULL) - free((*in)[i]->data); + free((*in)[i]->data); free((*in)[i]); i++; } @@ -279,10 +256,8 @@ { if (in == NULL) return; - if (in->algorithm.data != NULL) - free(in->algorithm.data); - if (in->parameters.data != NULL) - free(in->parameters.data); + free(in->algorithm.data); + free(in->parameters.data); free(in); } @@ -302,10 +277,8 @@ free_krb5_subject_pk_info(krb5_subject_pk_info **in) { if ((*in) == NULL) return; - if ((*in)->algorithm.parameters.data != NULL) - free((*in)->algorithm.parameters.data); - if ((*in)->subjectPublicKey.data != NULL) - free((*in)->subjectPublicKey.data); + free((*in)->algorithm.parameters.data); + free((*in)->subjectPublicKey.data); free(*in); } @@ -313,8 +286,7 @@ free_krb5_kdc_dh_key_info(krb5_kdc_dh_key_info **in) { if (*in == NULL) return; - if ((*in)->subjectPublicKey.data != NULL) - free((*in)->subjectPublicKey.data); + free((*in)->subjectPublicKey.data); free(*in); } Modified: trunk/src/plugins/preauth/pkinit/pkinit_matching.c =================================================================== --- trunk/src/plugins/preauth/pkinit/pkinit_matching.c 2009-08-17 23:45:58 UTC (rev 22533) +++ trunk/src/plugins/preauth/pkinit/pkinit_matching.c 2009-08-18 03:05:16 UTC (rev 22534) @@ -154,8 +154,7 @@ return 0; if (rc->kwval_type == kwvaltype_regexp) { - if (rc->regsrc) - free(rc->regsrc); + free(rc->regsrc); regfree(&rc->regexp); } free(rc); @@ -365,8 +364,7 @@ *ret_rule = rc; retval = 0; out: - if (value != NULL) - free(value); + free(value); if (retval && rc != NULL) free_rule_component(context, rc); pkiDebug("%s: returning %d\n", __FUNCTION__, retval); Modified: trunk/src/plugins/preauth/pkinit/pkinit_srv.c =================================================================== --- trunk/src/plugins/preauth/pkinit/pkinit_srv.c 2009-08-17 23:45:58 UTC (rev 22533) +++ trunk/src/plugins/preauth/pkinit/pkinit_srv.c 2009-08-18 03:05:16 UTC (rev 22534) @@ -610,8 +610,7 @@ switch ((int)data->pa_type) { case KRB5_PADATA_PK_AS_REQ: free_krb5_pa_pk_as_req(&reqp); - if (cksum.contents != NULL) - free(cksum.contents); + free(cksum.contents); if (der_req != NULL) krb5_free_data(context, der_req); break; @@ -621,10 +620,8 @@ } if (tmp_as_req != NULL) k5int_krb5_free_kdc_req(context, tmp_as_req); - if (authp_data.data != NULL) - free(authp_data.data); - if (krb5_authz.data != NULL) - free(krb5_authz.data); + free(authp_data.data); + free(krb5_authz.data); if (reqctx != NULL) pkinit_fini_kdc_req_context(context, reqctx); if (auth_pack != NULL) @@ -977,7 +974,7 @@ "/tmp/kdc_as_rep"); #endif - *send_pa = (krb5_pa_data *) malloc(sizeof(krb5_pa_data)); + *send_pa = malloc(sizeof(krb5_pa_data)); if (*send_pa == NULL) { retval = ENOMEM; free(out_data->data); @@ -1001,20 +998,15 @@ cleanup: pkinit_fini_kdc_req_context(context, reqctx); - if (scratch.data != NULL) - free(scratch.data); - if (out_data != NULL) - free(out_data); + free(scratch.data); + free(out_data); if (encoded_dhkey_info != NULL) krb5_free_data(context, encoded_dhkey_info); if (encoded_key_pack != NULL) krb5_free_data(context, encoded_key_pack); - if (dh_pubkey != NULL) - free(dh_pubkey); - if (server_key != NULL) - free(server_key); - if (cksum_types != NULL) - free(cksum_types); + free(dh_pubkey); + free(server_key); + free(cksum_types); switch ((int)padata->pa_type) { case KRB5_PADATA_PK_AS_REQ: @@ -1186,7 +1178,7 @@ *pplgctx = NULL; - plgctx = (pkinit_kdc_context) calloc(1, sizeof(*plgctx)); + plgctx = calloc(1, sizeof(*plgctx)); if (plgctx == NULL) goto errout; @@ -1254,8 +1246,7 @@ for (i = 0; realmnames[i] != NULL; i++) {}; numrealms = i; - realm_contexts = (pkinit_kdc_context *) - calloc(numrealms+1, sizeof(pkinit_kdc_context)); + realm_contexts = calloc(numrealms+1, sizeof(pkinit_kdc_context)); if (realm_contexts == NULL) return ENOMEM; @@ -1321,7 +1312,7 @@ krb5_error_code retval = ENOMEM; pkinit_kdc_req_context reqctx = NULL; - reqctx = (pkinit_kdc_req_context)malloc(sizeof(*reqctx)); + reqctx = malloc(sizeof(*reqctx)); if (reqctx == NULL) return retval; memset(reqctx, 0, sizeof(*reqctx)); From raeburn at MIT.EDU Fri Aug 21 14:32:46 2009 From: raeburn at MIT.EDU (raeburn@MIT.EDU) Date: Fri, 21 Aug 2009 14:32:46 -0400 Subject: svn rev #22568: trunk/src/lib/krb5/ccache/ Message-ID: <200908211832.n7LIWkDT021361@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22568 Commit By: raeburn Log Message: Use {load,store}_{16,32}_be for big-endian integers. Changed Files: U trunk/src/lib/krb5/ccache/cc_file.c Modified: trunk/src/lib/krb5/ccache/cc_file.c =================================================================== --- trunk/src/lib/krb5/ccache/cc_file.c 2009-08-21 17:52:51 UTC (rev 22567) +++ trunk/src/lib/krb5/ccache/cc_file.c 2009-08-21 18:32:46 UTC (rev 22568) @@ -725,7 +725,6 @@ krb5_fcc_data *data = (krb5_fcc_data *)id->data; krb5_error_code retval; unsigned char buf[4]; - krb5_int32 val; k5_cc_mutex_assert_locked(context, &((krb5_fcc_data *) id->data)->lock); @@ -736,11 +735,7 @@ retval = krb5_fcc_read(context, id, buf, 4); if (retval) return retval; - val = buf[0]; - val = (val << 8) | buf[1]; - val = (val << 8) | buf[2]; - val = (val << 8) | buf[3]; - *i = val; + *i = load_32_be (buf); return 0; } } @@ -761,7 +756,7 @@ retval = krb5_fcc_read(context, id, buf, 2); if (retval) return retval; - *i = (buf[0] << 8) + buf[1]; + *i = load_16_be (buf); return 0; } } @@ -1077,13 +1072,7 @@ (data->version == KRB5_FCC_FVNO_2)) return krb5_fcc_write(context, id, (char *) &i, sizeof(krb5_int32)); else { - buf[3] = (unsigned char) (i & 0xFF); - i >>= 8; - buf[2] = (unsigned char) (i & 0xFF); - i >>= 8; - buf[1] = (unsigned char) (i & 0xFF); - i >>= 8; - buf[0] = (unsigned char) (i & 0xFF); + store_32_be (i, buf); return krb5_fcc_write(context, id, buf, 4); } } @@ -1102,9 +1091,7 @@ ibuf = (krb5_ui_2) i; return krb5_fcc_write(context, id, (char *) &ibuf, sizeof(krb5_ui_2)); } else { - buf[1] = (unsigned char) (i & 0xFF); - i >>= 8; - buf[0] = (unsigned char) (i & 0xFF); + store_16_be (i, buf); return krb5_fcc_write(context, id, buf, 2); } } From raeburn at MIT.EDU Fri Aug 21 14:32:50 2009 From: raeburn at MIT.EDU (raeburn@MIT.EDU) Date: Fri, 21 Aug 2009 14:32:50 -0400 Subject: svn rev #22569: trunk/src/kdc/ Message-ID: <200908211832.n7LIWofM021408@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22569 Commit By: raeburn Log Message: Change "vague-errors" compile-time conditionals into run-time conditionals, based on a variable initialized based on the compile-time conditional (but probably eventually set from the config file or command line). Changed Files: U trunk/src/kdc/do_as_req.c U trunk/src/kdc/extern.h U trunk/src/kdc/kdc_util.c Modified: trunk/src/kdc/do_as_req.c =================================================================== --- trunk/src/kdc/do_as_req.c 2009-08-21 18:32:46 UTC (rev 22568) +++ trunk/src/kdc/do_as_req.c 2009-08-21 18:32:50 UTC (rev 22569) @@ -208,11 +208,10 @@ goto errout; } else if (c_nprincs != 1) { status = "CLIENT_NOT_FOUND"; -#ifdef KRBCONF_VAGUE_ERRORS - errcode = KRB5KRB_ERR_GENERIC; -#else - errcode = KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN; -#endif + if (vague_errors) + errcode = KRB5KRB_ERR_GENERIC; + else + errcode = KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN; goto errout; } @@ -409,9 +408,8 @@ } update_client = 1; status = "PREAUTH_FAILED"; -#ifdef KRBCONF_VAGUE_ERRORS - errcode = KRB5KRB_ERR_GENERIC; -#endif + if (vague_errors) + errcode = KRB5KRB_ERR_GENERIC; goto errout; } } Modified: trunk/src/kdc/extern.h =================================================================== --- trunk/src/kdc/extern.h 2009-08-21 18:32:46 UTC (rev 22568) +++ trunk/src/kdc/extern.h 2009-08-21 18:32:50 UTC (rev 22569) @@ -105,6 +105,8 @@ extern char **db_args; extern krb5_int32 max_dgram_reply_size; /* maximum datagram size */ +extern const int vague_errors; + extern volatile int signal_requests_exit; extern volatile int signal_requests_hup; #endif /* __KRB5_KDC_EXTERN__ */ Modified: trunk/src/kdc/kdc_util.c =================================================================== --- trunk/src/kdc/kdc_util.c 2009-08-21 18:32:46 UTC (rev 22568) +++ trunk/src/kdc/kdc_util.c 2009-08-21 18:32:50 UTC (rev 22569) @@ -69,6 +69,12 @@ krb5_deltat rc_lifetime; /* See kdc_initialize_rcache() */ #endif +#ifdef KRBCONF_VAGUE_ERRORS +const int vague_errors = 1; +#else +const int vague_errors = 0; +#endif + #ifdef USE_RCACHE /* * initialize the replay cache. @@ -939,11 +945,10 @@ /* The client must not be expired */ if (client.expiration && client.expiration < kdc_time) { *status = "CLIENT EXPIRED"; -#ifdef KRBCONF_VAGUE_ERRORS - return(KRB_ERR_GENERIC); -#else - return(KDC_ERR_NAME_EXP); -#endif + if (vague_errors) + return(KRB_ERR_GENERIC); + else + return(KDC_ERR_NAME_EXP); } /* The client's password must not be expired, unless the server is @@ -951,11 +956,10 @@ if (client.pw_expiration && client.pw_expiration < kdc_time && !isflagset(server.attributes, KRB5_KDB_PWCHANGE_SERVICE)) { *status = "CLIENT KEY EXPIRED"; -#ifdef KRBCONF_VAGUE_ERRORS - return(KRB_ERR_GENERIC); -#else - return(KDC_ERR_KEY_EXP); -#endif + if (vague_errors) + return(KRB_ERR_GENERIC); + else + return(KDC_ERR_KEY_EXP); } /* The server must not be expired */ From raeburn at MIT.EDU Fri Aug 21 14:32:53 2009 From: raeburn at MIT.EDU (raeburn@MIT.EDU) Date: Fri, 21 Aug 2009 14:32:53 -0400 Subject: svn rev #22570: trunk/src/lib/krb5/os/ Message-ID: <200908211832.n7LIWrdi021468@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22570 Commit By: raeburn Log Message: Use load_32_be processing length in TCP reply. Changed Files: U trunk/src/lib/krb5/os/sendto_kdc.c Modified: trunk/src/lib/krb5/os/sendto_kdc.c =================================================================== --- trunk/src/lib/krb5/os/sendto_kdc.c 2009-08-21 18:32:50 UTC (rev 22569) +++ trunk/src/lib/krb5/os/sendto_kdc.c 2009-08-21 18:32:53 UTC (rev 22570) @@ -1017,11 +1017,7 @@ } conn->x.in.bufsizebytes_read += nread; if (conn->x.in.bufsizebytes_read == 4) { - unsigned long len; - len = conn->x.in.bufsizebytes[0]; - len = (len << 8) + conn->x.in.bufsizebytes[1]; - len = (len << 8) + conn->x.in.bufsizebytes[2]; - len = (len << 8) + conn->x.in.bufsizebytes[3]; + unsigned long len = load_32_be (conn->x.in.bufsizebytes); dprint("received length on fd %d is %d\n", conn->fd, (int)len); /* Arbitrary 1M cap. */ if (len > 1 * 1024 * 1024) { From raeburn at MIT.EDU Fri Aug 21 18:30:44 2009 From: raeburn at MIT.EDU (raeburn@MIT.EDU) Date: Fri, 21 Aug 2009 18:30:44 -0400 Subject: svn rev #22571: trunk/src/ kadmin/cli/ kadmin/server/ lib/kadm5/ Message-ID: <200908212230.n7LMUi39018769@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22571 Commit By: raeburn Log Message: update dependencies Changed Files: U trunk/src/kadmin/cli/deps U trunk/src/kadmin/server/deps U trunk/src/lib/kadm5/deps Modified: trunk/src/kadmin/cli/deps =================================================================== --- trunk/src/kadmin/cli/deps 2009-08-21 18:32:53 UTC (rev 22570) +++ trunk/src/kadmin/cli/deps 2009-08-21 22:30:43 UTC (rev 22571) @@ -20,7 +20,7 @@ $(SS_DEPS) kadmin.h ss_wrapper.c $(OUTPRE)getdate.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/krb5.h \ - getdate.c kadmin.h + getdate.c $(OUTPRE)keytab.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/types.h \ $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ Modified: trunk/src/kadmin/server/deps =================================================================== --- trunk/src/kadmin/server/deps 2009-08-21 18:32:53 UTC (rev 22570) +++ trunk/src/kadmin/server/deps 2009-08-21 22:30:43 UTC (rev 22571) @@ -93,16 +93,6 @@ $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \ $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h misc.c misc.h -$(OUTPRE)server_glue_v1.$(OBJEXT): $(BUILDTOP)/include/gssapi/gssapi.h \ - $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/kadm5/admin.h \ - $(BUILDTOP)/include/kadm5/chpass_util_strings.h $(BUILDTOP)/include/kadm5/kadm_err.h \ - $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/gssrpc/auth.h \ - $(SRCTOP)/include/gssrpc/auth_gss.h $(SRCTOP)/include/gssrpc/auth_unix.h \ - $(SRCTOP)/include/gssrpc/clnt.h $(SRCTOP)/include/gssrpc/rename.h \ - $(SRCTOP)/include/gssrpc/rpc.h $(SRCTOP)/include/gssrpc/rpc_msg.h \ - $(SRCTOP)/include/gssrpc/svc.h $(SRCTOP)/include/gssrpc/svc_auth.h \ - $(SRCTOP)/include/gssrpc/xdr.h $(SRCTOP)/include/kdb.h \ - $(SRCTOP)/include/krb5.h misc.h server_glue_v1.c $(OUTPRE)ipropd_svc.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssapi/gssapi_ext.h \ $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/kadm5/admin.h \ Modified: trunk/src/lib/kadm5/deps =================================================================== --- trunk/src/lib/kadm5/deps 2009-08-21 18:32:53 UTC (rev 22570) +++ trunk/src/lib/kadm5/deps 2009-08-21 22:30:43 UTC (rev 22571) @@ -5,16 +5,6 @@ $(COM_ERR_DEPS) kadm_err.c chpass_util_strings.so chpass_util_strings.po $(OUTPRE)chpass_util_strings.$(OBJEXT): \ $(COM_ERR_DEPS) chpass_util_strings.c -ovsec_glue.so ovsec_glue.po $(OUTPRE)ovsec_glue.$(OBJEXT): \ - $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/types.h \ - $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ - $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/krb5/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/gssrpc/auth.h $(SRCTOP)/include/gssrpc/auth_gss.h \ - $(SRCTOP)/include/gssrpc/auth_unix.h $(SRCTOP)/include/gssrpc/clnt.h \ - $(SRCTOP)/include/gssrpc/rename.h $(SRCTOP)/include/gssrpc/rpc.h \ - $(SRCTOP)/include/gssrpc/rpc_msg.h $(SRCTOP)/include/gssrpc/svc.h \ - $(SRCTOP)/include/gssrpc/svc_auth.h $(SRCTOP)/include/gssrpc/xdr.h \ - $(SRCTOP)/include/kdb.h $(SRCTOP)/include/krb5.h ovsec_glue.c misc_free.so misc_free.po $(OUTPRE)misc_free.$(OBJEXT): \ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/kadm5/admin.h \ From raeburn at MIT.EDU Fri Aug 21 18:37:56 2009 From: raeburn at MIT.EDU (raeburn@MIT.EDU) Date: Fri, 21 Aug 2009 18:37:56 -0400 Subject: svn rev #22572: trunk/src/ plugins/kdb/db2/libdb2/ plugins/kdb/db2/libdb2/btree/ ... Message-ID: <200908212237.n7LMbunx019649@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22572 Commit By: raeburn Log Message: Rename db2 header files db.h and db-config.h in the source tree, so that there will always be only one version of each name in the include path (namely, the copy made in the build tree, or the generated db.h if not using the in-tree one). This should fix some minor problems with different dependency lists generated on different systems. Sort and uniquify dependency header names before doing substitutions, as well as after. Look for the db2 headers listed in sorted order. Don't copy db-ndbm.h into the build tree; let libdb2 find it from the source tree only. Update dependencies. Changed Files: U trunk/src/plugins/kdb/db2/libdb2/Makefile.in U trunk/src/plugins/kdb/db2/libdb2/btree/deps U trunk/src/plugins/kdb/db2/libdb2/db/deps U trunk/src/plugins/kdb/db2/libdb2/hash/deps D trunk/src/plugins/kdb/db2/libdb2/include/db-config.h A trunk/src/plugins/kdb/db2/libdb2/include/db-config.hin D trunk/src/plugins/kdb/db2/libdb2/include/db.h A trunk/src/plugins/kdb/db2/libdb2/include/db.hin U trunk/src/plugins/kdb/db2/libdb2/mpool/deps U trunk/src/plugins/kdb/db2/libdb2/recno/deps U trunk/src/util/depfix.pl Modified: trunk/src/plugins/kdb/db2/libdb2/Makefile.in =================================================================== --- trunk/src/plugins/kdb/db2/libdb2/Makefile.in 2009-08-21 22:30:43 UTC (rev 22571) +++ trunk/src/plugins/kdb/db2/libdb2/Makefile.in 2009-08-21 22:37:55 UTC (rev 22572) @@ -13,7 +13,7 @@ RELDIR=../plugins/kdb/db2/libdb2 HDRDIR=$(BUILDTOP)/include -HDRS = $(HDRDIR)/db.h $(HDRDIR)/db-config.h $(HDRDIR)/db-ndbm.h +HDRS = $(HDRDIR)/db.h $(HDRDIR)/db-config.h SHLIB_EXPDEPS=$(SUPPORT_DEPLIB) SHLIB_EXPLIBS=$(SUPPORT_LIB) @@ -26,12 +26,10 @@ includes:: $(HDRS) -$(HDRDIR)/db.h: $(srcdir)/include/db.h - $(CP) $(srcdir)/include/db.h $@ -$(HDRDIR)/db-config.h: include/db-config.h - $(CP) $(srcdir)/include/db-config.h $@ -$(HDRDIR)/db-ndbm.h: $(srcdir)/include/db-ndbm.h - $(CP) $(srcdir)/include/db-ndbm.h $@ +$(HDRDIR)/db.h: $(srcdir)/include/db.hin + $(CP) $(srcdir)/include/db.hin $@ +$(HDRDIR)/db-config.h: include/db-config.hin + $(CP) $(srcdir)/include/db-config.hin $@ clean-includes:: $(RM) $(HDRS) include/*.stmp Modified: trunk/src/plugins/kdb/db2/libdb2/btree/deps =================================================================== --- trunk/src/plugins/kdb/db2/libdb2/btree/deps 2009-08-21 22:30:43 UTC (rev 22571) +++ trunk/src/plugins/kdb/db2/libdb2/btree/deps 2009-08-21 22:37:55 UTC (rev 22572) @@ -2,75 +2,55 @@ # Generated makefile dependencies follow. # bt_close.so bt_close.po $(OUTPRE)bt_close.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \ - $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \ + $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \ $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \ - $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \ - bt_close.c btree.h extern.h + $(srcdir)/../mpool/mpool.h bt_close.c btree.h extern.h bt_conv.so bt_conv.po $(OUTPRE)bt_conv.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \ - $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \ - $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \ - $(srcdir)/../mpool/mpool.h bt_conv.c btree.h extern.h + $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \ + $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \ + bt_conv.c btree.h extern.h bt_debug.so bt_debug.po $(OUTPRE)bt_debug.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \ - $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \ + $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \ $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \ - $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \ - bt_debug.c btree.h extern.h + $(srcdir)/../mpool/mpool.h bt_debug.c btree.h extern.h bt_delete.so bt_delete.po $(OUTPRE)bt_delete.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \ - $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \ + $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \ $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \ - $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \ - bt_delete.c btree.h extern.h + $(srcdir)/../mpool/mpool.h bt_delete.c btree.h extern.h bt_get.so bt_get.po $(OUTPRE)bt_get.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \ - $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \ - $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \ - $(srcdir)/../mpool/mpool.h bt_get.c btree.h extern.h + $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \ + $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \ + bt_get.c btree.h extern.h bt_open.so bt_open.po $(OUTPRE)bt_open.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/db-config.h $(SRCTOP)/include/k5-platform.h \ - $(SRCTOP)/include/k5-thread.h $(srcdir)/../include/config.h \ - $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \ - $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \ - $(srcdir)/../mpool/mpool.h bt_open.c btree.h extern.h + $(DB_DEPS) $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ + $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \ + $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \ + bt_open.c btree.h extern.h bt_overflow.so bt_overflow.po $(OUTPRE)bt_overflow.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \ - $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \ + $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \ $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \ - $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \ - bt_overflow.c btree.h extern.h + $(srcdir)/../mpool/mpool.h bt_overflow.c btree.h extern.h bt_page.so bt_page.po $(OUTPRE)bt_page.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \ - $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \ - $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \ - $(srcdir)/../mpool/mpool.h bt_page.c btree.h extern.h + $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \ + $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \ + bt_page.c btree.h extern.h bt_put.so bt_put.po $(OUTPRE)bt_put.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \ - $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \ - $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \ - $(srcdir)/../mpool/mpool.h bt_put.c btree.h extern.h + $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \ + $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \ + bt_put.c btree.h extern.h bt_search.so bt_search.po $(OUTPRE)bt_search.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \ - $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \ + $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \ $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \ - $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \ - bt_search.c btree.h extern.h + $(srcdir)/../mpool/mpool.h bt_search.c btree.h extern.h bt_seq.so bt_seq.po $(OUTPRE)bt_seq.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \ - $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \ - $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \ - $(srcdir)/../mpool/mpool.h bt_seq.c btree.h extern.h + $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \ + $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \ + bt_seq.c btree.h extern.h bt_split.so bt_split.po $(OUTPRE)bt_split.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \ - $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \ + $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \ $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \ - $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \ - bt_split.c btree.h extern.h + $(srcdir)/../mpool/mpool.h bt_split.c btree.h extern.h bt_utils.so bt_utils.po $(OUTPRE)bt_utils.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \ - $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \ + $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \ $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \ - $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \ - bt_utils.c btree.h extern.h + $(srcdir)/../mpool/mpool.h bt_utils.c btree.h extern.h Modified: trunk/src/plugins/kdb/db2/libdb2/db/deps =================================================================== --- trunk/src/plugins/kdb/db2/libdb2/db/deps 2009-08-21 22:30:43 UTC (rev 22571) +++ trunk/src/plugins/kdb/db2/libdb2/db/deps 2009-08-21 22:37:55 UTC (rev 22572) @@ -2,6 +2,5 @@ # Generated makefile dependencies follow. # db.so db.po $(OUTPRE)db.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \ - $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \ - $(srcdir)/../include/db.h db.c + $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \ + db.c Modified: trunk/src/plugins/kdb/db2/libdb2/hash/deps =================================================================== --- trunk/src/plugins/kdb/db2/libdb2/hash/deps 2009-08-21 22:30:43 UTC (rev 22571) +++ trunk/src/plugins/kdb/db2/libdb2/hash/deps 2009-08-21 22:37:55 UTC (rev 22572) @@ -2,44 +2,36 @@ # Generated makefile dependencies follow. # hash.so hash.po $(OUTPRE)hash.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \ - $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \ - $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \ - $(srcdir)/../mpool/mpool.h extern.h hash.c hash.h page.h + $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \ + $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \ + extern.h hash.c hash.h page.h hash_bigkey.so hash_bigkey.po $(OUTPRE)hash_bigkey.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \ - $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \ + $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \ $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \ - $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \ - extern.h hash.h hash_bigkey.c page.h + $(srcdir)/../mpool/mpool.h extern.h hash.h hash_bigkey.c \ + page.h hash_debug.so hash_debug.po $(OUTPRE)hash_debug.$(OBJEXT): \ hash_debug.c hash_func.so hash_func.po $(OUTPRE)hash_func.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \ - $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \ + $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \ $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \ - $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \ - extern.h hash.h hash_func.c page.h + $(srcdir)/../mpool/mpool.h extern.h hash.h hash_func.c \ + page.h hash_log2.so hash_log2.po $(OUTPRE)hash_log2.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \ - $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \ + $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \ $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \ - $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \ - extern.h hash.h hash_log2.c page.h + $(srcdir)/../mpool/mpool.h extern.h hash.h hash_log2.c \ + page.h hash_page.so hash_page.po $(OUTPRE)hash_page.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \ - $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \ + $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../include/config.h \ $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \ - $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \ - extern.h hash.h hash_page.c page.h + $(srcdir)/../mpool/mpool.h extern.h hash.h hash_page.c \ + page.h hsearch.so hsearch.po $(OUTPRE)hsearch.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \ - $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \ - $(srcdir)/../include/db.h hsearch.c search.h + $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \ + hsearch.c search.h dbm.so dbm.po $(OUTPRE)dbm.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/db-config.h $(BUILDTOP)/include/db-ndbm.h \ - $(BUILDTOP)/include/db.h $(srcdir)/../include/config.h \ - $(srcdir)/../include/db-config.h $(srcdir)/../include/db-dbm.h \ - $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \ - $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \ + $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-dbm.h \ + $(srcdir)/../include/db-int.h $(srcdir)/../include/db-ndbm.h \ + $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \ dbm.c hash.h Deleted: trunk/src/plugins/kdb/db2/libdb2/include/db-config.h Copied: trunk/src/plugins/kdb/db2/libdb2/include/db-config.hin (from rev 22571, trunk/src/plugins/kdb/db2/libdb2/include/db-config.h) Deleted: trunk/src/plugins/kdb/db2/libdb2/include/db.h Copied: trunk/src/plugins/kdb/db2/libdb2/include/db.hin (from rev 22571, trunk/src/plugins/kdb/db2/libdb2/include/db.h) Modified: trunk/src/plugins/kdb/db2/libdb2/mpool/deps =================================================================== --- trunk/src/plugins/kdb/db2/libdb2/mpool/deps 2009-08-21 22:30:43 UTC (rev 22571) +++ trunk/src/plugins/kdb/db2/libdb2/mpool/deps 2009-08-21 22:37:55 UTC (rev 22572) @@ -2,7 +2,5 @@ # Generated makefile dependencies follow. # mpool.so mpool.po $(OUTPRE)mpool.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/db-config.h $(srcdir)/../include/config.h \ - $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \ - $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \ - mpool.c mpool.h + $(DB_DEPS) $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \ + $(srcdir)/../include/db-queue.h mpool.c mpool.h Modified: trunk/src/plugins/kdb/db2/libdb2/recno/deps =================================================================== --- trunk/src/plugins/kdb/db2/libdb2/recno/deps 2009-08-21 22:30:43 UTC (rev 22571) +++ trunk/src/plugins/kdb/db2/libdb2/recno/deps 2009-08-21 22:37:55 UTC (rev 22572) @@ -2,55 +2,42 @@ # Generated makefile dependencies follow. # rec_close.so rec_close.po $(OUTPRE)rec_close.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \ - $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \ - $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \ + $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../btree/btree.h \ + $(srcdir)/../btree/extern.h $(srcdir)/../include/config.h \ $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \ - $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \ - extern.h rec_close.c recno.h + $(srcdir)/../mpool/mpool.h extern.h rec_close.c recno.h rec_delete.so rec_delete.po $(OUTPRE)rec_delete.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \ - $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \ - $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \ + $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../btree/btree.h \ + $(srcdir)/../btree/extern.h $(srcdir)/../include/config.h \ $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \ - $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \ - extern.h rec_delete.c recno.h + $(srcdir)/../mpool/mpool.h extern.h rec_delete.c recno.h rec_get.so rec_get.po $(OUTPRE)rec_get.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/db-config.h $(srcdir)/../btree/btree.h \ - $(srcdir)/../btree/extern.h $(srcdir)/../include/config.h \ - $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \ - $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \ - $(srcdir)/../mpool/mpool.h extern.h rec_get.c recno.h + $(DB_DEPS) $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \ + $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \ + $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \ + extern.h rec_get.c recno.h rec_open.so rec_open.po $(OUTPRE)rec_open.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \ - $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \ - $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \ + $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../btree/btree.h \ + $(srcdir)/../btree/extern.h $(srcdir)/../include/config.h \ $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \ - $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \ - extern.h rec_open.c recno.h + $(srcdir)/../mpool/mpool.h extern.h rec_open.c recno.h rec_put.so rec_put.po $(OUTPRE)rec_put.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/db-config.h $(srcdir)/../btree/btree.h \ - $(srcdir)/../btree/extern.h $(srcdir)/../include/config.h \ - $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \ - $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \ - $(srcdir)/../mpool/mpool.h extern.h rec_put.c recno.h + $(DB_DEPS) $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \ + $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \ + $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \ + extern.h rec_put.c recno.h rec_search.so rec_search.po $(OUTPRE)rec_search.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \ - $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \ - $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \ + $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../btree/btree.h \ + $(srcdir)/../btree/extern.h $(srcdir)/../include/config.h \ $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \ - $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \ - extern.h rec_search.c recno.h + $(srcdir)/../mpool/mpool.h extern.h rec_search.c recno.h rec_seq.so rec_seq.po $(OUTPRE)rec_seq.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ - $(BUILDTOP)/include/db-config.h $(srcdir)/../btree/btree.h \ - $(srcdir)/../btree/extern.h $(srcdir)/../include/config.h \ - $(srcdir)/../include/db-config.h $(srcdir)/../include/db-int.h \ - $(srcdir)/../include/db-queue.h $(srcdir)/../include/db.h \ - $(srcdir)/../mpool/mpool.h extern.h rec_seq.c recno.h + $(DB_DEPS) $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \ + $(srcdir)/../include/config.h $(srcdir)/../include/db-int.h \ + $(srcdir)/../include/db-queue.h $(srcdir)/../mpool/mpool.h \ + extern.h rec_seq.c recno.h rec_utils.so rec_utils.po $(OUTPRE)rec_utils.$(OBJEXT): \ - $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/db-config.h \ - $(srcdir)/../btree/btree.h $(srcdir)/../btree/extern.h \ - $(srcdir)/../include/config.h $(srcdir)/../include/db-config.h \ + $(BUILDTOP)/include/autoconf.h $(DB_DEPS) $(srcdir)/../btree/btree.h \ + $(srcdir)/../btree/extern.h $(srcdir)/../include/config.h \ $(srcdir)/../include/db-int.h $(srcdir)/../include/db-queue.h \ - $(srcdir)/../include/db.h $(srcdir)/../mpool/mpool.h \ - extern.h rec_utils.c recno.h + $(srcdir)/../mpool/mpool.h extern.h rec_utils.c recno.h Modified: trunk/src/util/depfix.pl =================================================================== --- trunk/src/util/depfix.pl 2009-08-21 22:30:43 UTC (rev 22571) +++ trunk/src/util/depfix.pl 2009-08-21 22:37:55 UTC (rev 22572) @@ -155,10 +155,12 @@ # Use VPATH. s;\$\(srcdir\)/([^ /]* );$1;g; + $_ = &uniquify($_); + # Allow override of some util dependencies in case local tools are used. s;\$\(BUILDTOP\)/include/com_err.h ;\$(COM_ERR_DEPS) ;g; s;\$\(BUILDTOP\)/include/ss/ss.h \$\(BUILDTOP\)/include/ss/ss_err.h ;\$(SS_DEPS) ;g; - s;\$\(BUILDTOP\)/include/db.h \$\(BUILDTOP\)/include/db-config.h ;\$(DB_DEPS) ;g; + s;\$\(BUILDTOP\)/include/db-config.h \$\(BUILDTOP\)/include/db.h ;\$(DB_DEPS) ;g; $_ = &uniquify($_); From ghudson at MIT.EDU Thu Aug 27 09:40:51 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Thu, 27 Aug 2009 09:40:51 -0400 Subject: svn rev #22636: trunk/src/lib/gssapi/spnego/ Message-ID: <200908271340.n7RDepkL028612@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22636 Commit By: ghudson Log Message: ticket: 6551 subject: Memory leak in spnego accept_sec_context error path tags: pullup target_version: 1.7 If the underlying mechanism's accept_sec_context returns an error, the spnego accept_sec_context was leaving allocated data in *context_handle, which is incorrect for the first call according to RFC 2744. Fix this by mirroring some code from the spnego init_sec_context, which always cleans up the half-constructed context in case of error. This is allowed (though not encouraged) by RFC 2744 for second and subsequent calls; since we were already doing it in init_sec_context, it seems simpler to do that than keep track of whether this is a first call or not. Changed Files: U trunk/src/lib/gssapi/spnego/spnego_mech.c Modified: trunk/src/lib/gssapi/spnego/spnego_mech.c =================================================================== --- trunk/src/lib/gssapi/spnego/spnego_mech.c 2009-08-27 12:55:47 UTC (rev 22635) +++ trunk/src/lib/gssapi/spnego/spnego_mech.c 2009-08-27 13:40:50 UTC (rev 22636) @@ -1681,6 +1681,13 @@ *src_name = sc->internal_name; } release_spnego_ctx(&sc); + } else if (ret != GSS_S_CONTINUE_NEEDED) { + if (sc != NULL) { + gss_delete_sec_context(&tmpmin, &sc->ctx_handle, + GSS_C_NO_BUFFER); + release_spnego_ctx(&sc); + } + *context_handle = GSS_C_NO_CONTEXT; } gss_release_buffer(&tmpmin, &mechtok_out); if (mechtok_in != GSS_C_NO_BUFFER) { From ghudson at MIT.EDU Fri Aug 28 12:00:54 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Fri, 28 Aug 2009 12:00:54 -0400 Subject: svn rev #22643: trunk/src/util/support/ Message-ID: <200908281600.n7SG0s4F009745@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22643 Commit By: ghudson Log Message: ticket: 6534 Disable the COPY_FIRST_CANONNAME workaround on Linux glibc 2.4 and later, since it leaks memory on fixed glibc versions. We will still leak memory on glibc 2.3.4 through 2.3.6 (e.g. RHEL 4) but that's harder to detect. Changed Files: U trunk/src/util/support/fake-addrinfo.c Modified: trunk/src/util/support/fake-addrinfo.c =================================================================== --- trunk/src/util/support/fake-addrinfo.c 2009-08-28 15:08:33 UTC (rev 22642) +++ trunk/src/util/support/fake-addrinfo.c 2009-08-28 16:00:54 UTC (rev 22643) @@ -140,7 +140,15 @@ #endif #if defined (__linux__) && defined(HAVE_GETADDRINFO) -# define COPY_FIRST_CANONNAME +/* Define COPY_FIRST_CANONNAME for glibc 2.3 and prior. */ +#include +# ifdef __GLIBC_PREREQ +# if ! __GLIBC_PREREQ(2, 4) +# define COPY_FIRST_CANONNAME +# endif +# else +# define COPY_FIRST_CANONNAME +# endif #endif #ifdef _AIX @@ -1157,7 +1165,7 @@ return aierr; } - /* Linux libc version 6 (libc-2.2.4.so on Debian) is broken. + /* Linux libc version 6 prior to 2.3.4 is broken. RFC 2553 says that when AI_CANONNAME is set, the ai_canonname flag of the first returned structure has the canonical name of @@ -1188,9 +1196,12 @@ Ref: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=133668 . Since it's dependent on the target hostname, it's hard to check - for at configure time. Always do it on Linux for now. When - they get around to fixing it, add a compile-time or run-time - check for the glibc version in use. + for at configure time. The bug was fixed in glibc 2.3.4. + After the fix, the ai_canonname field is allocated, so our + workaround leaks memory. We disable the workaround for glibc + >= 2.4, but there is no easy way to test for glibc patch + versions, so we still leak memory under glibc 2.3.4 through + 2.3.6. Some Windows documentation says that even when AI_CANONNAME is set, the returned ai_canonname field can be null. The NetBSD From ghudson at MIT.EDU Fri Aug 28 13:23:20 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Fri, 28 Aug 2009 13:23:20 -0400 Subject: svn rev #22644: trunk/src/clients/kinit/ Message-ID: <200908281723.n7SHNKnS018220@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22644 Commit By: ghudson Log Message: ticket: 6552 subject: Document kinit -C and -E options target_version: 1.7.1 tags: pullup kinit -C (canonicalize name) and -E (enterprise principal name) weren't documented in the man page. Changed Files: U trunk/src/clients/kinit/kinit.M Modified: trunk/src/clients/kinit/kinit.M =================================================================== --- trunk/src/clients/kinit/kinit.M 2009-08-28 16:00:54 UTC (rev 22643) +++ trunk/src/clients/kinit/kinit.M 2009-08-28 17:23:20 UTC (rev 22644) @@ -35,9 +35,11 @@ [\fB\-f\fP | \fB\-F\fP] [\fB\-a\fP] [\fB\-A\fP] +[\fB\-C\fP] +[\fB\-E\fP] [\fB\-v\fP] [\fB\-R\fP] [\fB\-k\fP [\fB\-t\fP \fIkeytab_file\fP]] [\fB\-c\fP \fIcache_name\fP] -[\fB\-S\fP \fIservice_name\fP][\fB\-T\fP \fIarmor_ccache\fP] +[\fB\-S\fP \fIservice_name\fP][\fB\-T\fP \fIarmor_ccache\fP] [\fB\-X\fP \fIattribute\fP[=\fIvalue\fP]] [\fIprincipal\fP] .ad b @@ -109,6 +111,12 @@ .B \-A request address-less tickets. .TP +.B \-C +requests canonicalization of the principal name. +.TP +.B \-E +treats the principal name as an enterprise name. +.TP .B \-v requests that the ticket granting ticket in the cache (with the .I invalid From tlyu at MIT.EDU Fri Aug 28 16:29:24 2009 From: tlyu at MIT.EDU (tlyu@MIT.EDU) Date: Fri, 28 Aug 2009 16:29:24 -0400 Subject: svn rev #22645: trunk/src/kadmin/testing/util/ Message-ID: <200908282029.n7SKTOBB002421@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22645 Commit By: tlyu Log Message: ticket: 6544 Remove bogus conditional from tcl_kadm5_randkey_principal(), which was causing unparse_keyblocks() to get stack garbage as num_keys when num_var was "null", thus overrunning the end of the array. Changed Files: U trunk/src/kadmin/testing/util/tcl_kadm5.c Modified: trunk/src/kadmin/testing/util/tcl_kadm5.c =================================================================== --- trunk/src/kadmin/testing/util/tcl_kadm5.c 2009-08-28 17:23:20 UTC (rev 22644) +++ trunk/src/kadmin/testing/util/tcl_kadm5.c 2009-08-28 20:29:24 UTC (rev 22645) @@ -2033,7 +2033,7 @@ ret = kadm5_randkey_principal(server_handle, princ, keyblock_var ? &keyblocks : 0, - num_var ? &num_keys : 0); + &num_keys); if (ret == KADM5_OK) { if (keyblock_var) { From ghudson at MIT.EDU Fri Aug 28 17:02:51 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Fri, 28 Aug 2009 17:02:51 -0400 Subject: svn rev #22646: trunk/src/lib/kadm5/unit-test/lib/ Message-ID: <200908282102.n7SL2pfE005499@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22646 Commit By: ghudson Log Message: ticket: 6544 Update a kadm5 testing library function which was calling kadm5_get_principal without a mask argment. This was causing many lib/kadm5 tests to fail, but the failures weren't being recorded properly, so "make check" was still exiting successfully. Changed Files: U trunk/src/lib/kadm5/unit-test/lib/lib.t Modified: trunk/src/lib/kadm5/unit-test/lib/lib.t =================================================================== --- trunk/src/lib/kadm5/unit-test/lib/lib.t 2009-08-28 20:29:24 UTC (rev 22645) +++ trunk/src/lib/kadm5/unit-test/lib/lib.t 2009-08-28 21:02:51 UTC (rev 22646) @@ -173,7 +173,8 @@ lib_start_api set ret [cmd [format { - kadm5_get_principal $lib_handle "%s" principal + kadm5_get_principal $lib_handle "%s" principal \ + KADM5_PRINCIPAL_NORMAL_MASK } $name]] # puts stdout "Finishing principal_exists." From ghudson at MIT.EDU Fri Aug 28 17:22:10 2009 From: ghudson at MIT.EDU (ghudson@MIT.EDU) Date: Fri, 28 Aug 2009 17:22:10 -0400 Subject: svn rev #22647: trunk/src/kadmin/testing/scripts/ Message-ID: <200908282122.n7SLMA8a006928@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22647 Commit By: ghudson Log Message: Clean up a little bit of test suite spew in env-setup: first, when using BSD options with ps, they should not be prefixed with a '-'; second, the Linux ps supports both BSD and System V options, so change the structure of the tests not to warn when both forms work. Changed Files: U trunk/src/kadmin/testing/scripts/env-setup.shin Modified: trunk/src/kadmin/testing/scripts/env-setup.shin =================================================================== --- trunk/src/kadmin/testing/scripts/env-setup.shin 2009-08-28 21:02:51 UTC (rev 22646) +++ trunk/src/kadmin/testing/scripts/env-setup.shin 2009-08-28 21:22:10 UTC (rev 22647) @@ -90,21 +90,15 @@ fi if [ "x$PS_ALL" = "x" ]; then - ps -axwwu >/dev/null 2>&1 - ps_bsd=$? - - ps -ef >/dev/null 2>&1 - ps_sysv=$? - - if [ $ps_bsd = 0 -a $ps_sysv = 1 ]; then - PS_ALL="ps -auxww" - PS_PID="ps -auxww" - elif [ $ps_bsd = 1 -a $ps_sysv = 0 ]; then + if ps auxww >/dev/null 2>&1; then + PS_ALL="ps auxww" + PS_PID="ps auxww" + elif ps -ef >/dev/null 2>&1; then PS_ALL="ps -ef" PS_PID="ps -fp" else - PS_ALL="ps -auxww" - PS_PID="ps -auxww" + PS_ALL="ps auxww" + PS_PID="ps auxww" echo "WARNING! Cannot auto-detect ps type, assuming BSD." fi From tlyu at MIT.EDU Fri Aug 28 17:36:29 2009 From: tlyu at MIT.EDU (tlyu@MIT.EDU) Date: Fri, 28 Aug 2009 17:36:29 -0400 Subject: svn rev #22648: trunk/src/lib/kadm5/unit-test/ config/ lib/ Message-ID: <200908282136.n7SLaTNs008132@drugstore.mit.edu> http://src.mit.edu/fisheye/changelog/krb5/?cs=22648 Commit By: tlyu Log Message: ticket: 6553 subject: use perror instead of error in kadm5 test suite target_version: 1.7.1 tags: pullup Use "perror" instead of "error" to ensure that framework error conditions actually cause "make check" to report failure. Changed Files: U trunk/src/lib/kadm5/unit-test/config/unix.exp U trunk/src/lib/kadm5/unit-test/lib/lib.t Modified: trunk/src/lib/kadm5/unit-test/config/unix.exp =================================================================== --- trunk/src/lib/kadm5/unit-test/config/unix.exp 2009-08-28 21:22:10 UTC (rev 22647) +++ trunk/src/lib/kadm5/unit-test/config/unix.exp 2009-08-28 21:36:28 UTC (rev 22648) @@ -131,85 +131,85 @@ set pid [spawn $API] expect { -re "$prompt$" {} - eof { error "EOF starting API" } - timeout { error "Timeout starting API" } + eof { perror "EOF starting API" } + timeout { perror "Timeout starting API" } } if {! [info exists env(TCLUTIL)]} { - error "TCLUTIL environment variable isn't set" + perror "TCLUTIL environment variable isn't set" } # tcl 8.4 for some reason screws up autodetection of output # EOL translation. Work around it for now. send "if { \[info commands fconfigure\] ne \"\" } { fconfigure stdout -translation lf }\n" expect { -re "$prompt$" {} - eof { error "EOF starting API" } - timeout { error "Timeout starting API" } + eof { perror "EOF starting API" } + timeout { perror "Timeout starting API" } } send "source $env(TCLUTIL)\n" expect { -re "$prompt$" {} - eof { error "EOF starting API" } - timeout { error "Timeout starting API" } + eof { perror "EOF starting API" } + timeout { perror "Timeout starting API" } } send "set current_struct_version \[expr \$KADM5_STRUCT_VERSION &~ \$KADM5_STRUCT_VERSION_MASK\]\n" expect { -re "$prompt$" {} - eof { error "EOF setting API varibles"} - timeout { error "timeout setting API varibles"} + eof { perror "EOF setting API varibles"} + timeout { perror "timeout setting API varibles"} } send "set current_api_version \[expr \$KADM5_API_VERSION_2 &~ \$KADM5_API_VERSION_MASK\]\n" expect { -re "$prompt$" {} - eof { error "EOF setting API varibles"} - timeout { error "timeout setting API varibles"} + eof { perror "EOF setting API varibles"} + timeout { perror "timeout setting API varibles"} } send "set bad_struct_version_mask \[expr 0x65432100 | \$current_struct_version\]\n" expect { -re "$prompt$" {} - eof { error "EOF setting API varibles"} - timeout { error "timeout setting API varibles"} + eof { perror "EOF setting API varibles"} + timeout { perror "timeout setting API varibles"} } send "set bad_api_version_mask \[expr 0x65432100 | \$current_api_version\]\n" expect { -re "$prompt$" {} - eof { error "EOF setting API varibles"} - timeout { error "timeout setting API varibles"} + eof { perror "EOF setting API varibles"} + timeout { perror "timeout setting API varibles"} } send "set no_api_version_mask \$current_api_version\n" expect { -re "$prompt$" {} - eof { error "EOF setting API varibles"} - timeout { error "timeout setting API varibles"} + eof { perror "EOF setting API varibles"} + timeout { perror "timeout setting API varibles"} } send "set no_struct_version_mask \$current_struct_version\n" expect { -re "$prompt$" {} - eof { error "EOF setting API varibles"} - timeout { error "timeout setting API varibles"} + eof { perror "EOF setting API varibles"} + timeout { perror "timeout setting API varibles"} } send "set old_api_version \[expr \$KADM5_API_VERSION_MASK | 0x00\]\n" expect { -re "$prompt$" {} - eof { error "EOF setting API varibles"} - timeout { error "timeout setting API varibles"} + eof { perror "EOF setting API varibles"} + timeout { perror "timeout setting API varibles"} } send "set old_struct_version \[expr \$KADM5_STRUCT_VERSION_MASK | 0x00\]\n" expect { -re "$prompt$" {} - eof { error "EOF setting API varibles"} - timeout { error "timeout setting API varibles"} + eof { perror "EOF setting API varibles"} + timeout { perror "timeout setting API varibles"} } send "set new_api_version \[expr \$KADM5_API_VERSION_MASK | 0xca\]\n" expect { -re "$prompt$" {} - eof { error "EOF setting API varibles"} - timeout { error "timeout setting API varibles"} + eof { perror "EOF setting API varibles"} + timeout { perror "timeout setting API varibles"} } send "set new_struct_version \[expr \$KADM5_STRUCT_VERSION_MASK | 0xca\]\n" expect { -re "$prompt$" {} - eof { error "EOF setting API varibles"} - timeout { error "timeout setting API varibles"} + eof { perror "EOF setting API varibles"} + timeout { perror "timeout setting API varibles"} } set api_pid $pid Modified: trunk/src/lib/kadm5/unit-test/lib/lib.t =================================================================== --- trunk/src/lib/kadm5/unit-test/lib/lib.t 2009-08-28 21:22:10 UTC (rev 22647) +++ trunk/src/lib/kadm5/unit-test/lib/lib.t 2009-08-28 21:36:28 UTC (rev 22648) @@ -22,7 +22,7 @@ $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \ lib_handle }]} { - error "$test: unexpected failure in init" + perror "$test: unexpected failure in init" return } verbose "+++ restarted api ($lib_pid) for lib" @@ -40,7 +40,7 @@ expect { -re "OK .*$prompt$" { return 1 } -re "ERROR .*$prompt$" { return 0 } - "wrong # args" { error "$test: wrong number args"; return 0 } + "wrong # args" { perror "$test: wrong number args"; return 0 } timeout { fail "$test: timeout"; return 0 } eof { fail "$test: eof"; api_exit; lib_start_api; return 0 } } @@ -52,7 +52,7 @@ send "[string trim $command]\n" expect { -re "$prompt$" { return 1} - "wrong # args" { error "$test: wrong number args"; return 0 } + "wrong # args" { perror "$test: wrong number args"; return 0 } timeout { error_and_restart "timeout" } eof { api_exit; lib_start_api; return 0 } } @@ -69,7 +69,7 @@ -re "ERROR .*$prompt$" { fail "$test: $expect_out(buffer)"; return 0 } - "wrong # args" { error "$test: wrong number args"; return 0 } + "wrong # args" { perror "$test: wrong number args"; return 0 } timeout { fail "$test: timeout"; return 0 } eof { fail "$test: eof"; api_exit; lib_start_api; return 0 } } @@ -85,7 +85,7 @@ -re "ERROR .*$code.*$prompt$" { pass "$test"; return 1 } -re "ERROR .*$prompt$" { fail "$test: bad failure"; return 0 } -re "OK .*$prompt$" { fail "$test: bad success"; return 0 } - "wrong # args" { error "$test: wrong number args"; return 0 } + "wrong # args" { perror "$test: wrong number args"; return 0 } timeout { fail "$test: timeout"; return 0 } eof { fail "$test: eof"; api_exit; lib_start_api; return 0 } } @@ -100,7 +100,7 @@ expect { -re "ERROR .*$prompt$" { pass "$test:"; return 1 } -re "OK .*$prompt$" { fail "$test: bad success"; return 0 } - "wrong # args" { error "$test: wrong number args"; return 0 } + "wrong # args" { perror "$test: wrong number args"; return 0 } timeout { fail "$test: timeout"; return 0 } eof { fail "$test: eof"; api_exit; lib_start_api; return 0 } } @@ -111,7 +111,7 @@ expect { -re "$prompt$" {} - "wrong # args" { error "$test: wrong number args"; return 0 } + "wrong # args" { perror "$test: wrong number args"; return 0 } eof { api_exit; lib_start_api } } } @@ -247,7 +247,7 @@ # the parent, which is us, to read pending data. expect { - "when initializing cache" { error "kinit failed: $expect_out(buffer)" } + "when initializing cache" { perror "kinit failed: $expect_out(buffer)" } eof {} } wait @@ -283,20 +283,20 @@ spawn $kadmin_local -e "$keysalts" expect { "kadmin.local:" {} - default { error "waiting for kadmin.local prompt"; return 1} + default { perror "waiting for kadmin.local prompt"; return 1} } send "ank -pw \"$name\" \"$name\"\n" expect { -re "Principal \"$name.*\" created." {} "kadmin.local:" { - error "expecting principal created message"; + perror "expecting principal created message"; return 1 } - default { error "waiting for principal created message"; return 1 } + default { perror "waiting for principal created message"; return 1 } } expect { "kadmin.local:" {} - default { error "waiting for kadmin.local prompt"; return 1 } + default { perror "waiting for kadmin.local prompt"; return 1 } } close wait