Merge branches/nss to trunk
authorGreg Hudson <ghudson@mit.edu>
Sat, 2 Oct 2010 17:21:54 +0000 (17:21 +0000)
committerGreg Hudson <ghudson@mit.edu>
Sat, 2 Oct 2010 17:21:54 +0000 (17:21 +0000)
commit23f90e6bf3c7888ffbd59935ced87156d0be5a53
treefefdfab6da9cc964de26d5915140aefe53103529
parent1827e342c54b79566e6270f764e14e01990633ab
Merge branches/nss to trunk

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24416 dc483132-0cff-0310-8789-dd5450dbe970
59 files changed:
NOTICE
src/configure.in
src/include/k5-int.h
src/lib/crypto/Makefile.in
src/lib/crypto/builtin/Makefile.in
src/lib/crypto/builtin/init.c [new file with mode: 0644]
src/lib/crypto/crypto_tests/Makefile.in
src/lib/crypto/krb/Makefile.in
src/lib/crypto/krb/crypto_libinit.c
src/lib/crypto/krb/prng.c
src/lib/crypto/nss/Makefile.in [new file with mode: 0644]
src/lib/crypto/nss/aes/Makefile.in [new file with mode: 0644]
src/lib/crypto/nss/aes/deps [new file with mode: 0644]
src/lib/crypto/nss/camellia/Makefile.in [new file with mode: 0644]
src/lib/crypto/nss/camellia/deps [new file with mode: 0644]
src/lib/crypto/nss/deps [new file with mode: 0644]
src/lib/crypto/nss/des/Makefile.in [new file with mode: 0644]
src/lib/crypto/nss/des/deps [new file with mode: 0644]
src/lib/crypto/nss/des/des_int.h [new file with mode: 0644]
src/lib/crypto/nss/des/des_oldapis.c [new file with mode: 0644]
src/lib/crypto/nss/des/f_parity.c [new file with mode: 0644]
src/lib/crypto/nss/des/string2key.c [new file with mode: 0644]
src/lib/crypto/nss/des/weak_key.c [new file with mode: 0644]
src/lib/crypto/nss/enc_provider/Makefile.in [new file with mode: 0644]
src/lib/crypto/nss/enc_provider/aes.c [new file with mode: 0644]
src/lib/crypto/nss/enc_provider/camellia.c [new file with mode: 0644]
src/lib/crypto/nss/enc_provider/deps [new file with mode: 0644]
src/lib/crypto/nss/enc_provider/des.c [new file with mode: 0644]
src/lib/crypto/nss/enc_provider/des3.c [new file with mode: 0644]
src/lib/crypto/nss/enc_provider/enc_gen.c [new file with mode: 0644]
src/lib/crypto/nss/enc_provider/enc_provider.h [new file with mode: 0644]
src/lib/crypto/nss/enc_provider/rc4.c [new file with mode: 0644]
src/lib/crypto/nss/hash_provider/Makefile.in [new file with mode: 0644]
src/lib/crypto/nss/hash_provider/deps [new file with mode: 0644]
src/lib/crypto/nss/hash_provider/hash_crc32.c [new file with mode: 0644]
src/lib/crypto/nss/hash_provider/hash_gen.c [new file with mode: 0644]
src/lib/crypto/nss/hash_provider/hash_gen.h [new file with mode: 0644]
src/lib/crypto/nss/hash_provider/hash_md4.c [new file with mode: 0644]
src/lib/crypto/nss/hash_provider/hash_md5.c [new file with mode: 0644]
src/lib/crypto/nss/hash_provider/hash_provider.h [new file with mode: 0644]
src/lib/crypto/nss/hash_provider/hash_sha1.c [new file with mode: 0644]
src/lib/crypto/nss/hmac.c [new file with mode: 0644]
src/lib/crypto/nss/md4/Makefile.in [new file with mode: 0644]
src/lib/crypto/nss/md4/deps [new file with mode: 0644]
src/lib/crypto/nss/md4/md4.c [new file with mode: 0644]
src/lib/crypto/nss/md4/rsa-md4.h [new file with mode: 0644]
src/lib/crypto/nss/md5/Makefile.in [new file with mode: 0644]
src/lib/crypto/nss/md5/deps [new file with mode: 0644]
src/lib/crypto/nss/md5/md5.c [new file with mode: 0644]
src/lib/crypto/nss/md5/rsa-md5.h [new file with mode: 0644]
src/lib/crypto/nss/nss_gen.h [new file with mode: 0644]
src/lib/crypto/nss/pbkdf2.c [new file with mode: 0644]
src/lib/crypto/nss/sha1/Makefile.in [new file with mode: 0644]
src/lib/crypto/nss/sha1/deps [new file with mode: 0644]
src/lib/crypto/nss/sha1/shs.c [new file with mode: 0644]
src/lib/crypto/nss/sha1/shs.h [new file with mode: 0644]
src/lib/crypto/nss/yhash.h [new file with mode: 0644]
src/lib/crypto/openssl/Makefile.in
src/lib/crypto/openssl/init.c [new file with mode: 0644]