svn rev #24669: trunk/src/ include/ lib/crypto/ lib/crypto/builtin/enc_provider/ ...
ghudson@MIT.EDU
ghudson at MIT.EDU
Sun Feb 27 14:08:14 EST 2011
http://src.mit.edu/fisheye/changelog/krb5/?cs=24669
Commit By: ghudson
Log Message:
Reference random-to-key handlers through the enctype instead of the
enc_provider, for consistency with string-to-key and the place of
implementation (other enc_provider functions are implemented in the
back end, but random-to-key handlers are in krb). Use a single
handler for non-DES/DES3 enctypes since it's always just directly
copying the bits. Collapse the three implementations (des, des3, and
direct) into random_to_key.c, as they're very short, and eliminate the
lib/crypto/krb/rand2key directory.
Changed Files:
U trunk/src/Makefile.in
U trunk/src/configure.in
U trunk/src/include/k5-int.h
U trunk/src/lib/crypto/Makefile.in
U trunk/src/lib/crypto/builtin/enc_provider/Makefile.in
U trunk/src/lib/crypto/builtin/enc_provider/aes.c
U trunk/src/lib/crypto/builtin/enc_provider/camellia.c
U trunk/src/lib/crypto/builtin/enc_provider/deps
U trunk/src/lib/crypto/builtin/enc_provider/des.c
U trunk/src/lib/crypto/builtin/enc_provider/des3.c
U trunk/src/lib/crypto/builtin/enc_provider/rc4.c
U trunk/src/lib/crypto/crypto_tests/deps
U trunk/src/lib/crypto/krb/Makefile.in
U trunk/src/lib/crypto/krb/arcfour/deps
U trunk/src/lib/crypto/krb/cf2.c
U trunk/src/lib/crypto/krb/combine_keys.c
U trunk/src/lib/crypto/krb/deps
U trunk/src/lib/crypto/krb/dk/derive.c
U trunk/src/lib/crypto/krb/dk/stringtokey.c
U trunk/src/lib/crypto/krb/etypes.c
U trunk/src/lib/crypto/krb/etypes.h
U trunk/src/lib/crypto/krb/make_random_key.c
U trunk/src/lib/crypto/krb/old/deps
U trunk/src/lib/crypto/krb/prf/deps
D trunk/src/lib/crypto/krb/rand2key/
U trunk/src/lib/crypto/krb/random_to_key.c
U trunk/src/lib/crypto/nss/camellia/deps
U trunk/src/lib/crypto/nss/deps
U trunk/src/lib/crypto/nss/des/deps
U trunk/src/lib/crypto/nss/enc_provider/aes.c
U trunk/src/lib/crypto/nss/enc_provider/camellia.c
U trunk/src/lib/crypto/nss/enc_provider/deps
U trunk/src/lib/crypto/nss/enc_provider/des.c
U trunk/src/lib/crypto/nss/enc_provider/des3.c
U trunk/src/lib/crypto/nss/enc_provider/enc_gen.c
U trunk/src/lib/crypto/nss/enc_provider/rc4.c
U trunk/src/lib/crypto/nss/hash_provider/deps
U trunk/src/lib/crypto/nss/md4/deps
U trunk/src/lib/crypto/nss/md5/deps
U trunk/src/lib/crypto/nss/sha1/deps
U trunk/src/lib/crypto/nss/sha2/deps
U trunk/src/lib/crypto/openssl/deps
U trunk/src/lib/crypto/openssl/des/deps
U trunk/src/lib/crypto/openssl/enc_provider/aes.c
U trunk/src/lib/crypto/openssl/enc_provider/camellia.c
U trunk/src/lib/crypto/openssl/enc_provider/deps
U trunk/src/lib/crypto/openssl/enc_provider/des.c
U trunk/src/lib/crypto/openssl/enc_provider/des3.c
U trunk/src/lib/crypto/openssl/enc_provider/rc4.c
U trunk/src/lib/crypto/openssl/hash_provider/deps
U trunk/src/lib/crypto/openssl/md4/deps
U trunk/src/lib/crypto/openssl/md5/deps
U trunk/src/lib/crypto/openssl/sha1/deps
U trunk/src/lib/crypto/openssl/sha2/deps
Modified: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/Makefile.in 2011-02-27 19:08:14 UTC (rev 24669)
@@ -169,7 +169,7 @@
clients\kcpytkt\Makefile clients\kdeltkt\Makefile \
include\Makefile \
lib\Makefile lib\crypto\Makefile lib\crypto\krb\Makefile \
- lib\crypto\krb\crc32\Makefile lib\crypto\krb\rand2key\Makefile \
+ lib\crypto\krb\crc32\Makefile \
lib\crypto\krb\prng\Makefile lib\crypto\krb\prng\fortuna\Makefile \
lib\crypto\krb\prf\Makefile lib\crypto\krb\checksum\Makefile \
lib\crypto\krb\old\Makefile lib\crypto\krb\raw\Makefile \
@@ -242,8 +242,6 @@
##DOS## $(WCONFIG) config < $@.in > $@
##DOS##lib\crypto\krb\crc32\Makefile: lib\crypto\krb\crc32\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
-##DOS##lib\crypto\krb\rand2key\Makefile: lib\crypto\krb\rand2key\Makefile.in $(MKFDEP)
-##DOS## $(WCONFIG) config < $@.in > $@
##DOS##lib\crypto\krb\prng\fortuna\Makefile: lib\crypto\krb\prng\fortuna\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
##DOS##lib\crypto\krb\prng\Makefile: lib\crypto\krb\prng\Makefile.in $(MKFDEP)
@@ -361,7 +359,7 @@
clients/kpasswd/* clients/kvno/* clients/kcpytkt/* clients/kdeltkt/* \
config/* include/* \
include/krb5/* lib/* lib/crypto/* lib/crypto/krb/* \
- lib/crypto/krb/crc32/* lib/crypto/krb/rand2key/* \
+ lib/crypto/krb/crc32/* \
lib/crypto/krb/prng/fortuna/* lib/crypto/krb/prng/nss/* \
lib/crypto/krb/prng/* \
lib/crypto/krb/prf/* lib/crypto/krb/checksum/* lib/crypto/krb/old/* \
Modified: trunk/src/configure.in
===================================================================
--- trunk/src/configure.in 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/configure.in 2011-02-27 19:08:14 UTC (rev 24669)
@@ -1118,8 +1118,8 @@
lib/crypto lib/crypto/krb lib/crypto/krb/crc32 lib/crypto/$CRYPTO_IMPL/des
lib/crypto/krb/dk lib/crypto/$CRYPTO_IMPL/enc_provider
lib/crypto/$CRYPTO_IMPL/hash_provider lib/crypto/krb/checksum
- lib/crypto/krb/prf lib/crypto/krb/rand2key
- lib/crypto/$CRYPTO_IMPL lib/crypto/$CRYPTO_IMPL/md4 lib/crypto/$CRYPTO_IMPL/md5
+ lib/crypto/krb/prf lib/crypto/$CRYPTO_IMPL
+ lib/crypto/$CRYPTO_IMPL/md4 lib/crypto/$CRYPTO_IMPL/md5
lib/crypto/krb/old lib/crypto/krb/raw
lib/crypto/$CRYPTO_IMPL/sha1
lib/crypto/$CRYPTO_IMPL/sha2
Modified: trunk/src/include/k5-int.h
===================================================================
--- trunk/src/include/k5-int.h 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/include/k5-int.h 2011-02-27 19:08:14 UTC (rev 24669)
@@ -661,9 +661,6 @@
size_t num_data, const krb5_data *ivec,
krb5_data *output);
- krb5_error_code (*make_key)(const krb5_data *randombits,
- krb5_keyblock *key);
-
krb5_error_code (*init_state)(const krb5_keyblock *key,
krb5_keyusage keyusage,
krb5_data *out_state);
Modified: trunk/src/lib/crypto/Makefile.in
===================================================================
--- trunk/src/lib/crypto/Makefile.in 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/Makefile.in 2011-02-27 19:08:14 UTC (rev 24669)
@@ -21,7 +21,7 @@
STOBJLISTS=krb/crc32/OBJS.ST krb/dk/OBJS.ST \
$(CRYPTO_IMPL)/enc_provider/OBJS.ST \
$(CRYPTO_IMPL)/hash_provider/OBJS.ST \
- krb/checksum/OBJS.ST krb/prf/OBJS.ST krb/rand2key/OBJS.ST \
+ krb/checksum/OBJS.ST krb/prf/OBJS.ST \
krb/old/OBJS.ST krb/raw/OBJS.ST \
$(CRYPTO_IMPL)/md4/OBJS.ST $(CRYPTO_IMPL)/md5/OBJS.ST \
$(CRYPTO_IMPL)/sha1/OBJS.ST \
@@ -34,7 +34,7 @@
SUBDIROBJLISTS=krb/crc32/OBJS.ST krb/dk/OBJS.ST \
$(CRYPTO_IMPL)/enc_provider/OBJS.ST \
$(CRYPTO_IMPL)/hash_provider/OBJS.ST \
- krb/checksum/OBJS.ST krb/prf/OBJS.ST krb/rand2key/OBJS.ST \
+ krb/checksum/OBJS.ST krb/prf/OBJS.ST \
krb/old/OBJS.ST krb/raw/OBJS.ST \
$(CRYPTO_IMPL)/md4/OBJS.ST $(CRYPTO_IMPL)/md5/OBJS.ST \
$(CRYPTO_IMPL)/sha1/OBJS.ST \
@@ -57,8 +57,8 @@
SHLIB_RDIRS=$(KRB5_LIBDIR)
##DOS##LIBNAME=$(OUTPRE)crypto.lib
-##DOS##OBJFILEDEP=$(OUTPRE)crc32.lst $(OUTPRE)rand2key.lst $(OUTPRE)prf.lst $(OUTPRE)checksum.lst $(OUTPRE)krb.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)arcfour.lst $(OUTPRE)dk.lst $(OUTPRE)aes.lst $(OUTPRE)enc_provider.lst $(OUTPRE)des.lst $(OUTPRE)md5.lst $(OUTPRE)camellia.lst $(OUTPRE)md4.lst $(OUTPRE)hash_provider.lst $(OUTPRE)sha2.lst $(OUTPRE)sha1.lst $(OUTPRE)builtin.lst
-##DOS##OBJFILELIST=@$(OUTPRE)crc32.lst @$(OUTPRE)rand2key.lst @$(OUTPRE)prf.lst @$(OUTPRE)checksum.lst @$(OUTPRE)krb.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)arcfour.lst @$(OUTPRE)dk.lst @$(OUTPRE)aes.lst @$(OUTPRE)enc_provider.lst @$(OUTPRE)des.lst @$(OUTPRE)md5.lst @$(OUTPRE)camellia.lst @$(OUTPRE)md4.lst @$(OUTPRE)hash_provider.lst @$(OUTPRE)sha2.lst @$(OUTPRE)sha1.lst @$(OUTPRE)builtin.lst
+##DOS##OBJFILEDEP=$(OUTPRE)crc32.lst $(OUTPRE)prf.lst $(OUTPRE)checksum.lst $(OUTPRE)krb.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)arcfour.lst $(OUTPRE)dk.lst $(OUTPRE)aes.lst $(OUTPRE)enc_provider.lst $(OUTPRE)des.lst $(OUTPRE)md5.lst $(OUTPRE)camellia.lst $(OUTPRE)md4.lst $(OUTPRE)hash_provider.lst $(OUTPRE)sha2.lst $(OUTPRE)sha1.lst $(OUTPRE)builtin.lst
+##DOS##OBJFILELIST=@$(OUTPRE)crc32.lst @$(OUTPRE)prf.lst @$(OUTPRE)checksum.lst @$(OUTPRE)krb.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)arcfour.lst @$(OUTPRE)dk.lst @$(OUTPRE)aes.lst @$(OUTPRE)enc_provider.lst @$(OUTPRE)des.lst @$(OUTPRE)md5.lst @$(OUTPRE)camellia.lst @$(OUTPRE)md4.lst @$(OUTPRE)hash_provider.lst @$(OUTPRE)sha2.lst @$(OUTPRE)sha1.lst @$(OUTPRE)builtin.lst
all-unix:: all-liblinks
install-unix:: install-libs
Modified: trunk/src/lib/crypto/builtin/enc_provider/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/enc_provider/Makefile.in 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/builtin/enc_provider/Makefile.in 2011-02-27 19:08:14 UTC (rev 24669)
@@ -5,7 +5,6 @@
-I$(srcdir)/../aes \
-I$(srcdir)/../camellia \
-I$(srcdir)/../../krb \
- -I$(srcdir)/../../krb/rand2key \
-I$(srcdir)/.. -I$(srcdir)/.
DEFS=
Modified: trunk/src/lib/crypto/builtin/enc_provider/aes.c
===================================================================
--- trunk/src/lib/crypto/builtin/enc_provider/aes.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/builtin/enc_provider/aes.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -29,7 +29,6 @@
#include "enc_provider.h"
#include "aes.h"
#include <aead.h>
-#include <rand2key.h>
#define CHECK_SIZES 0
@@ -300,7 +299,6 @@
krb5int_aes_encrypt,
krb5int_aes_decrypt,
NULL,
- krb5int_aes_make_key,
aes_init_state,
krb5int_default_free_state,
aes_key_cleanup
@@ -312,7 +310,6 @@
krb5int_aes_encrypt,
krb5int_aes_decrypt,
NULL,
- krb5int_aes_make_key,
aes_init_state,
krb5int_default_free_state,
aes_key_cleanup
Modified: trunk/src/lib/crypto/builtin/enc_provider/camellia.c
===================================================================
--- trunk/src/lib/crypto/builtin/enc_provider/camellia.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/builtin/enc_provider/camellia.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -28,7 +28,6 @@
#include "enc_provider.h"
#include "camellia.h"
#include <aead.h>
-#include <rand2key.h>
#ifdef CAMELLIA
@@ -329,7 +328,6 @@
krb5int_camellia_encrypt,
krb5int_camellia_decrypt,
krb5int_camellia_cbc_mac,
- krb5int_camellia_make_key,
camellia_init_state,
krb5int_default_free_state,
};
@@ -340,7 +338,6 @@
krb5int_camellia_encrypt,
krb5int_camellia_decrypt,
krb5int_camellia_cbc_mac,
- krb5int_camellia_make_key,
camellia_init_state,
krb5int_default_free_state
};
Modified: trunk/src/lib/crypto/builtin/enc_provider/deps
===================================================================
--- trunk/src/lib/crypto/builtin/enc_provider/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/builtin/enc_provider/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -5,34 +5,33 @@
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
$(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../krb/aead.h \
$(srcdir)/../../krb/cksumtypes.h $(srcdir)/../../krb/etypes.h \
- $(srcdir)/../../krb/rand2key/rand2key.h $(srcdir)/../des/des_int.h \
- $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
- $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
- $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
- $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
- $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
- $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
- $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
- $(top_srcdir)/include/socket-utils.h des.c enc_provider.h
+ $(srcdir)/../des/des_int.h $(top_srcdir)/include/k5-buf.h \
+ $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+ $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+ $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.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) $(srcdir)/../../krb/aead.h \
$(srcdir)/../../krb/cksumtypes.h $(srcdir)/../../krb/etypes.h \
- $(srcdir)/../../krb/rand2key/rand2key.h $(srcdir)/../des/des_int.h \
- $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
- $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
- $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
- $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
- $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
- $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
- $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
- $(top_srcdir)/include/socket-utils.h des3.c
+ $(srcdir)/../des/des_int.h $(top_srcdir)/include/k5-buf.h \
+ $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+ $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+ $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.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) $(srcdir)/../../krb/aead.h \
$(srcdir)/../../krb/cksumtypes.h $(srcdir)/../../krb/etypes.h \
- $(srcdir)/../../krb/rand2key/rand2key.h $(srcdir)/../aes/aes.h \
- $(srcdir)/../aes/uitypes.h $(top_srcdir)/include/k5-buf.h \
+ $(srcdir)/../aes/aes.h $(srcdir)/../aes/uitypes.h $(top_srcdir)/include/k5-buf.h \
$(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
$(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
$(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
@@ -45,21 +44,8 @@
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
$(COM_ERR_DEPS) $(srcdir)/../../krb/aead.h $(srcdir)/../../krb/cksumtypes.h \
- $(srcdir)/../../krb/etypes.h $(srcdir)/../../krb/rand2key/rand2key.h \
- $(srcdir)/../aes/uitypes.h $(srcdir)/../camellia/camellia.h \
- $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
- $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
- $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
- $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
- $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
- $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
- $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
- $(top_srcdir)/include/socket-utils.h camellia.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) $(srcdir)/../../krb/aead.h \
- $(srcdir)/../../krb/cksumtypes.h $(srcdir)/../../krb/etypes.h \
- $(srcdir)/../../krb/rand2key/rand2key.h $(top_srcdir)/include/k5-buf.h \
+ $(srcdir)/../../krb/etypes.h $(srcdir)/../aes/uitypes.h \
+ $(srcdir)/../camellia/camellia.h $(top_srcdir)/include/k5-buf.h \
$(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
$(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
$(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
@@ -67,4 +53,17 @@
$(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
$(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
$(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- enc_provider.h rc4.c
+ camellia.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) $(srcdir)/../../krb/aead.h \
+ $(srcdir)/../../krb/cksumtypes.h $(srcdir)/../../krb/etypes.h \
+ $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+ $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+ $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+ $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.h enc_provider.h \
+ rc4.c
Modified: trunk/src/lib/crypto/builtin/enc_provider/des.c
===================================================================
--- trunk/src/lib/crypto/builtin/enc_provider/des.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/builtin/enc_provider/des.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -29,7 +29,6 @@
#include "des_int.h"
#include "enc_provider.h"
#include <aead.h>
-#include <rand2key.h>
static krb5_error_code
validate_and_schedule(krb5_key key, const krb5_data *ivec,
@@ -125,7 +124,6 @@
des_encrypt,
des_decrypt,
des_cbc_mac,
- krb5int_des_make_key,
krb5int_des_init_state,
krb5int_default_free_state
};
Modified: trunk/src/lib/crypto/builtin/enc_provider/des3.c
===================================================================
--- trunk/src/lib/crypto/builtin/enc_provider/des3.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/builtin/enc_provider/des3.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -28,7 +28,6 @@
#include "k5-int.h"
#include "des_int.h"
#include <aead.h>
-#include <rand2key.h>
static krb5_error_code
validate_and_schedule(krb5_key key, const krb5_data *ivec,
@@ -111,7 +110,6 @@
k5_des3_encrypt,
k5_des3_decrypt,
NULL,
- krb5int_des3_make_key,
krb5int_des_init_state,
krb5int_default_free_state
};
Modified: trunk/src/lib/crypto/builtin/enc_provider/rc4.c
===================================================================
--- trunk/src/lib/crypto/builtin/enc_provider/rc4.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/builtin/enc_provider/rc4.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -10,7 +10,6 @@
#include "k5-int.h"
#include "enc_provider.h"
#include <aead.h>
-#include <rand2key.h>
typedef struct
{
@@ -207,7 +206,6 @@
k5_arcfour_docrypt,
k5_arcfour_docrypt,
NULL,
- krb5int_arcfour_make_key,
k5_arcfour_init_state, /*xxx not implemented yet*/
krb5int_default_free_state
};
Modified: trunk/src/lib/crypto/crypto_tests/deps
===================================================================
--- trunk/src/lib/crypto/crypto_tests/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/crypto_tests/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -58,8 +58,8 @@
t_prng.c
$(OUTPRE)t_cmac.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
- $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../builtin/enc_provider/enc_provider.h \
- $(srcdir)/../krb/cksumtypes.h $(srcdir)/../krb/etypes.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../krb/cksumtypes.h \
+ $(srcdir)/../krb/etypes.h $(srcdir)/../openssl/enc_provider/enc_provider.h \
$(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
@@ -70,7 +70,7 @@
$(top_srcdir)/include/socket-utils.h t_cmac.c
$(OUTPRE)t_hmac.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
- $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../builtin/hash_provider/hash_provider.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../openssl/hash_provider/hash_provider.h \
$(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
@@ -92,7 +92,7 @@
t_pkcs5.c
$(OUTPRE)t_cts.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
- $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../builtin/hash_provider/hash_provider.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../openssl/hash_provider/hash_provider.h \
$(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
@@ -103,7 +103,7 @@
$(top_srcdir)/include/socket-utils.h t_cts.c
$(OUTPRE)vectors.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
- $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../builtin/hash_provider/hash_provider.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../openssl/hash_provider/hash_provider.h \
$(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
@@ -169,7 +169,7 @@
$(top_srcdir)/include/socket-utils.h t_crc.c
$(OUTPRE)t_mddriver.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
- $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../builtin/md5/rsa-md5.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../openssl/md5/rsa-md5.h \
$(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
@@ -213,9 +213,9 @@
t_str2key.c
$(OUTPRE)t_derive.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
- $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../builtin/enc_provider/enc_provider.h \
- $(srcdir)/../krb/cksumtypes.h $(srcdir)/../krb/dk/dk.h \
- $(srcdir)/../krb/etypes.h $(top_srcdir)/include/k5-buf.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../krb/cksumtypes.h \
+ $(srcdir)/../krb/dk/dk.h $(srcdir)/../krb/etypes.h \
+ $(srcdir)/../openssl/enc_provider/enc_provider.h $(top_srcdir)/include/k5-buf.h \
$(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
$(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
$(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
Modified: trunk/src/lib/crypto/krb/Makefile.in
===================================================================
--- trunk/src/lib/crypto/krb/Makefile.in 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/krb/Makefile.in 2011-02-27 19:08:14 UTC (rev 24669)
@@ -1,10 +1,9 @@
mydir=lib$(S)crypto$(S)krb
BUILDTOP=$(REL)..$(S)..$(S)..
-SUBDIRS= arcfour checksum crc32 dk prf rand2key old raw
+SUBDIRS= arcfour checksum crc32 dk prf old raw
LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../$(CRYPTO_IMPL)/enc_provider \
-I$(srcdir)/dk -I$(srcdir)/../$(CRYPTO_IMPL)/hash_provider \
- -I$(srcdir)/prf -I$(srcdir)/rand2key \
- -I$(srcdir)/old -I$(srcdir)/raw \
+ -I$(srcdir)/prf -I$(srcdir)/old -I$(srcdir)/raw \
-I$(srcdir)/../$(CRYPTO_IMPL) \
-I$(srcdir)/../$(CRYPTO_IMPL)/des \
-I$(srcdir)/../$(CRYPTO_IMPL)/aes -I$(srcdir)/arcfour \
@@ -149,12 +148,10 @@
$(srcdir)/verify_checksum_iov.c
STOBJLISTS=arcfour/OBJS.ST checksum/OBJS.ST crc32/OBJS.ST \
- dk/OBJS.ST prf/OBJS.ST rand2key/OBJS.ST \
- old/OBJS.ST raw/OBJS.ST OBJS.ST
+ dk/OBJS.ST prf/OBJS.ST old/OBJS.ST raw/OBJS.ST OBJS.ST
SUBDIROBJLISTS=arcfour/OBJS.ST checksum/OBJS.ST crc32/OBJS.ST \
- dk/OBJS.ST prf/OBJS.ST rand2key/OBJS.ST \
- old/OBJS.ST raw/OBJS.ST
+ dk/OBJS.ST prf/OBJS.ST old/OBJS.ST raw/OBJS.ST
##DOS##LIBOBJS = $(OBJS)
Modified: trunk/src/lib/crypto/krb/arcfour/deps
===================================================================
--- trunk/src/lib/crypto/krb/arcfour/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/krb/arcfour/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -3,7 +3,7 @@
#
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) $(srcdir)/../../builtin/hash_provider/hash_provider.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../openssl/hash_provider/hash_provider.h \
$(srcdir)/../etypes.h $(top_srcdir)/include/k5-buf.h \
$(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
$(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
@@ -16,7 +16,7 @@
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) $(srcdir)/../../builtin/hash_provider/hash_provider.h \
+ $(COM_ERR_DEPS) $(srcdir)/../../openssl/hash_provider/hash_provider.h \
$(srcdir)/../aead.h $(srcdir)/../cksumtypes.h $(srcdir)/../etypes.h \
$(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
@@ -30,7 +30,7 @@
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) $(srcdir)/../../builtin/md4/rsa-md4.h \
+ $(COM_ERR_DEPS) $(srcdir)/../../openssl/md4/rsa-md4.h \
$(srcdir)/../etypes.h $(top_srcdir)/include/k5-buf.h \
$(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
$(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
Modified: trunk/src/lib/crypto/krb/cf2.c
===================================================================
--- trunk/src/lib/crypto/krb/cf2.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/krb/cf2.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -136,7 +136,7 @@
goto cleanup;
keydata.data = prf1;
keydata.length = keybytes;
- retval = (*out_enctype->enc->make_key)(&keydata, out_key);
+ retval = (*out_enctype->rand2key)(&keydata, out_key);
if (retval)
goto cleanup;
Modified: trunk/src/lib/crypto/krb/combine_keys.c
===================================================================
--- trunk/src/lib/crypto/krb/combine_keys.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/krb/combine_keys.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -157,7 +157,7 @@
tkeyblock.length = keylength;
tkeyblock.contents = output;
- ret = (*enc->make_key)(&randbits, &tkeyblock);
+ ret = (*ktp->rand2key)(&randbits, &tkeyblock);
if (ret)
goto cleanup;
Modified: trunk/src/lib/crypto/krb/deps
===================================================================
--- trunk/src/lib/crypto/krb/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/krb/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -51,8 +51,8 @@
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) $(srcdir)/../builtin/enc_provider/enc_provider.h \
- $(srcdir)/../builtin/hash_provider/hash_provider.h \
+ $(COM_ERR_DEPS) $(srcdir)/../openssl/enc_provider/enc_provider.h \
+ $(srcdir)/../openssl/hash_provider/hash_provider.h \
$(srcdir)/dk/dk.h $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
@@ -193,8 +193,8 @@
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) $(srcdir)/../builtin/des/des_int.h \
- $(srcdir)/../builtin/enc_provider/enc_provider.h $(srcdir)/../builtin/hash_provider/hash_provider.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../openssl/des/des_int.h \
+ $(srcdir)/../openssl/enc_provider/enc_provider.h $(srcdir)/../openssl/hash_provider/hash_provider.h \
$(srcdir)/arcfour/arcfour.h $(srcdir)/dk/dk.h $(srcdir)/old/old.h \
$(srcdir)/prf/prf_int.h $(srcdir)/raw/raw.h $(top_srcdir)/include/k5-buf.h \
$(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
@@ -355,16 +355,15 @@
prng_fortuna.so prng_fortuna.po $(OUTPRE)prng_fortuna.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
- $(COM_ERR_DEPS) $(srcdir)/../builtin/aes/aes.h $(srcdir)/../builtin/aes/uitypes.h \
- $(srcdir)/../builtin/sha2/sha2.h $(top_srcdir)/include/k5-buf.h \
- $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
- $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
- $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
- $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
- $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
- $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- prng.h prng_fortuna.c
+ $(COM_ERR_DEPS) $(srcdir)/../openssl/aes/aes.h $(srcdir)/../openssl/sha2/sha2.h \
+ $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+ $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+ $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+ $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.h prng.h prng_fortuna.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) $(top_srcdir)/include/k5-buf.h \
@@ -379,7 +378,8 @@
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) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+ $(COM_ERR_DEPS) $(srcdir)/../openssl/des/des_int.h \
+ $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
@@ -424,16 +424,16 @@
t_fortuna.so t_fortuna.po $(OUTPRE)t_fortuna.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
- $(COM_ERR_DEPS) $(srcdir)/../builtin/aes/aes.h $(srcdir)/../builtin/aes/uitypes.h \
- $(srcdir)/../builtin/sha2/sha2.h $(top_srcdir)/include/k5-buf.h \
- $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
- $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
- $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
- $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
- $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
- $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- prng.h prng_fortuna.c t_fortuna.c
+ $(COM_ERR_DEPS) $(srcdir)/../openssl/aes/aes.h $(srcdir)/../openssl/sha2/sha2.h \
+ $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+ $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+ $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+ $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.h prng.h prng_fortuna.c \
+ t_fortuna.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 \
Modified: trunk/src/lib/crypto/krb/dk/derive.c
===================================================================
--- trunk/src/lib/crypto/krb/dk/derive.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/krb/dk/derive.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -252,7 +252,7 @@
goto cleanup;
/* Postprocess the key. */
- ret = enc->make_key(&rawkey, outkey);
+ ret = krb5_c_random_to_key(NULL, inkey->keyblock.enctype, &rawkey, outkey);
cleanup:
zapfree(rawkey.data, enc->keybytes);
Modified: trunk/src/lib/crypto/krb/dk/stringtokey.c
===================================================================
--- trunk/src/lib/crypto/krb/dk/stringtokey.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/krb/dk/stringtokey.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -35,7 +35,6 @@
const krb5_data *string, const krb5_data *salt,
const krb5_data *parms, krb5_keyblock *keyblock)
{
- const struct krb5_enc_provider *enc = ktp->enc;
krb5_error_code ret;
size_t keybytes, keylength, concatlen;
unsigned char *concat = NULL, *foldstring = NULL, *foldkeydata = NULL;
@@ -45,8 +44,8 @@
/* keyblock->length is checked by krb5int_derive_key. */
- keybytes = enc->keybytes;
- keylength = enc->keylength;
+ keybytes = ktp->enc->keybytes;
+ keylength = ktp->enc->keylength;
concatlen = string->length + (salt ? salt->length : 0);
@@ -74,7 +73,7 @@
foldkeyblock.contents = foldkeydata;
foldkeyblock.enctype = ktp->etype;
- ret = enc->make_key(&indata, &foldkeyblock);
+ ret = ktp->rand2key(&indata, &foldkeyblock);
if (ret != 0)
goto cleanup;
@@ -87,7 +86,7 @@
indata.length = kerberos_len;
indata.data = (char *) kerberos;
- ret = krb5int_derive_keyblock(enc, foldkey, keyblock, &indata,
+ ret = krb5int_derive_keyblock(ktp->enc, foldkey, keyblock, &indata,
DERIVE_RFC3961);
if (ret != 0)
memset(keyblock->contents, 0, keyblock->length);
Modified: trunk/src/lib/crypto/krb/etypes.c
===================================================================
--- trunk/src/lib/crypto/krb/etypes.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/krb/etypes.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -48,7 +48,7 @@
&krb5int_enc_des, &krb5int_hash_crc32,
16,
krb5int_old_crypto_length, krb5int_old_encrypt, krb5int_old_decrypt,
- krb5int_des_string_to_key,
+ krb5int_des_string_to_key, k5_rand2key_des,
krb5int_des_prf,
krb5int_init_state_enc, krb5int_free_state_enc,
CKSUMTYPE_RSA_MD5_DES,
@@ -58,7 +58,7 @@
&krb5int_enc_des, &krb5int_hash_md4,
16,
krb5int_old_crypto_length, krb5int_old_encrypt, krb5int_old_decrypt,
- krb5int_des_string_to_key,
+ krb5int_des_string_to_key, k5_rand2key_des,
krb5int_des_prf,
krb5int_init_state_enc, krb5int_free_state_enc,
CKSUMTYPE_RSA_MD4_DES,
@@ -68,7 +68,7 @@
&krb5int_enc_des, &krb5int_hash_md5,
16,
krb5int_old_crypto_length, krb5int_old_encrypt, krb5int_old_decrypt,
- krb5int_des_string_to_key,
+ krb5int_des_string_to_key, k5_rand2key_des,
krb5int_des_prf,
krb5int_init_state_enc, krb5int_free_state_enc,
CKSUMTYPE_RSA_MD5_DES,
@@ -78,7 +78,7 @@
&krb5int_enc_des, NULL,
16,
krb5int_raw_crypto_length, krb5int_raw_encrypt, krb5int_raw_decrypt,
- krb5int_des_string_to_key,
+ krb5int_des_string_to_key, k5_rand2key_des,
krb5int_des_prf,
krb5int_init_state_enc, krb5int_free_state_enc,
0,
@@ -88,7 +88,7 @@
&krb5int_enc_des3, NULL,
16,
krb5int_raw_crypto_length, krb5int_raw_encrypt, krb5int_raw_decrypt,
- krb5int_dk_string_to_key,
+ krb5int_dk_string_to_key, k5_rand2key_des3,
NULL, /*PRF*/
krb5int_init_state_enc, krb5int_free_state_enc,
0,
@@ -100,7 +100,7 @@
&krb5int_enc_des3, &krb5int_hash_sha1,
16,
krb5int_dk_crypto_length, krb5int_dk_encrypt, krb5int_dk_decrypt,
- krb5int_dk_string_to_key,
+ krb5int_dk_string_to_key, k5_rand2key_des3,
krb5int_dk_prf,
krb5int_init_state_enc, krb5int_free_state_enc,
CKSUMTYPE_HMAC_SHA1_DES3,
@@ -111,7 +111,7 @@
&krb5int_enc_des, &krb5int_hash_sha1,
8,
krb5int_dk_crypto_length, krb5int_dk_encrypt, krb5int_dk_decrypt,
- krb5int_dk_string_to_key,
+ krb5int_dk_string_to_key, k5_rand2key_des,
NULL, /*PRF*/
krb5int_init_state_enc, krb5int_free_state_enc,
0,
@@ -124,7 +124,7 @@
20,
krb5int_arcfour_crypto_length, krb5int_arcfour_encrypt,
krb5int_arcfour_decrypt, krb5int_arcfour_string_to_key,
- krb5int_arcfour_prf, /*PRF*/
+ k5_rand2key_direct, krb5int_arcfour_prf,
krb5int_init_state_enc, krb5int_free_state_enc,
CKSUMTYPE_HMAC_MD5_ARCFOUR,
0 /*flags*/ },
@@ -136,7 +136,7 @@
20,
krb5int_arcfour_crypto_length, krb5int_arcfour_encrypt,
krb5int_arcfour_decrypt, krb5int_arcfour_string_to_key,
- krb5int_arcfour_prf, /*PRF*/
+ k5_rand2key_direct, krb5int_arcfour_prf,
krb5int_init_state_enc, krb5int_free_state_enc,
CKSUMTYPE_HMAC_MD5_ARCFOUR,
ETYPE_WEAK
@@ -148,7 +148,7 @@
&krb5int_enc_aes128, &krb5int_hash_sha1,
16,
krb5int_aes_crypto_length, krb5int_dk_encrypt, krb5int_dk_decrypt,
- krb5int_aes_string_to_key,
+ krb5int_aes_string_to_key, k5_rand2key_direct,
krb5int_dk_prf,
krb5int_init_state_enc, krb5int_free_state_enc,
CKSUMTYPE_HMAC_SHA1_96_AES128,
@@ -159,7 +159,7 @@
&krb5int_enc_aes256, &krb5int_hash_sha1,
16,
krb5int_aes_crypto_length, krb5int_dk_encrypt, krb5int_dk_decrypt,
- krb5int_aes_string_to_key,
+ krb5int_aes_string_to_key, k5_rand2key_direct,
krb5int_dk_prf,
krb5int_init_state_enc, krb5int_free_state_enc,
CKSUMTYPE_HMAC_SHA1_96_AES256,
@@ -172,7 +172,7 @@
16,
krb5int_camellia_crypto_length,
krb5int_dk_cmac_encrypt, krb5int_dk_cmac_decrypt,
- krb5int_camellia_string_to_key,
+ krb5int_camellia_string_to_key, k5_rand2key_direct,
krb5int_dk_cmac_prf,
krb5int_init_state_enc, krb5int_free_state_enc,
CKSUMTYPE_CMAC_CAMELLIA128,
@@ -184,7 +184,7 @@
16,
krb5int_camellia_crypto_length,
krb5int_dk_cmac_encrypt, krb5int_dk_cmac_decrypt,
- krb5int_camellia_string_to_key,
+ krb5int_camellia_string_to_key, k5_rand2key_direct,
krb5int_dk_cmac_prf,
krb5int_init_state_enc, krb5int_free_state_enc,
CKSUMTYPE_CMAC_CAMELLIA256,
Modified: trunk/src/lib/crypto/krb/etypes.h
===================================================================
--- trunk/src/lib/crypto/krb/etypes.h 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/krb/etypes.h 2011-02-27 19:08:14 UTC (rev 24669)
@@ -48,6 +48,9 @@
const krb5_data *parm,
krb5_keyblock *key);
+typedef krb5_error_code (*rand2key_func)(const krb5_data *randombits,
+ krb5_keyblock *key);
+
typedef krb5_error_code (*prf_func)(const struct krb5_keytypes *ktp,
krb5_key key,
const krb5_data *in, krb5_data *out);
@@ -72,6 +75,7 @@
crypt_func encrypt;
crypt_func decrypt;
str2key_func str2key;
+ rand2key_func rand2key;
prf_func prf;
init_state_func init_state;
free_state_func free_state;
@@ -127,4 +131,13 @@
void
krb5int_free_state_enc(const struct krb5_keytypes *ktp, krb5_data *state);
+krb5_error_code
+k5_rand2key_direct(const krb5_data *randombits, krb5_keyblock *keyblock);
+
+krb5_error_code
+k5_rand2key_des(const krb5_data *randombits, krb5_keyblock *keyblock);
+
+krb5_error_code
+k5_rand2key_des3(const krb5_data *randombits, krb5_keyblock *keyblock);
+
#endif
Modified: trunk/src/lib/crypto/krb/make_random_key.c
===================================================================
--- trunk/src/lib/crypto/krb/make_random_key.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/krb/make_random_key.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -65,7 +65,7 @@
random_key->enctype = enctype;
random_key->length = keylength;
- ret = (*enc->make_key)(&random_data, random_key);
+ ret = (*ktp->rand2key)(&random_data, random_key);
cleanup:
if (ret) {
Modified: trunk/src/lib/crypto/krb/old/deps
===================================================================
--- trunk/src/lib/crypto/krb/old/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/krb/old/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -4,7 +4,7 @@
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) $(srcdir)/../../builtin/des/des_int.h \
+ $(COM_ERR_DEPS) $(srcdir)/../../openssl/des/des_int.h \
$(srcdir)/../etypes.h $(top_srcdir)/include/k5-buf.h \
$(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
$(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
Modified: trunk/src/lib/crypto/krb/prf/deps
===================================================================
--- trunk/src/lib/crypto/krb/prf/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/krb/prf/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -3,7 +3,7 @@
#
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) $(srcdir)/../../builtin/hash_provider/hash_provider.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../openssl/hash_provider/hash_provider.h \
$(srcdir)/../etypes.h $(top_srcdir)/include/k5-buf.h \
$(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
$(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
@@ -27,7 +27,7 @@
dk_prf.c prf_int.h
rc4_prf.so rc4_prf.po $(OUTPRE)rc4_prf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
- $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../builtin/hash_provider/hash_provider.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../openssl/hash_provider/hash_provider.h \
$(srcdir)/../etypes.h $(top_srcdir)/include/k5-buf.h \
$(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
$(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
Modified: trunk/src/lib/crypto/krb/random_to_key.c
===================================================================
--- trunk/src/lib/crypto/krb/random_to_key.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/krb/random_to_key.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -36,6 +36,7 @@
*/
#include "k5-int.h"
#include "etypes.h"
+#include "des_int.h"
krb5_error_code KRB5_CALLCONV
krb5_c_random_to_key(krb5_context context, krb5_enctype enctype,
@@ -43,7 +44,6 @@
{
krb5_error_code ret;
const struct krb5_keytypes *ktp;
- const struct krb5_enc_provider *enc;
if (random_data == NULL || random_key == NULL ||
random_key->contents == NULL)
@@ -52,14 +52,69 @@
ktp = find_enctype(enctype);
if (ktp == NULL)
return KRB5_BAD_ENCTYPE;
- enc = ktp->enc;
- if (random_key->length != enc->keylength)
+ if (random_key->length != ktp->enc->keylength)
return KRB5_BAD_KEYSIZE;
- ret = (*enc->make_key)(random_data, random_key);
+ ret = ktp->rand2key(random_data, random_key);
if (ret)
- memset(random_key->contents, 0, random_key->length);
+ zap(random_key->contents, random_key->length);
return ret;
}
+
+krb5_error_code
+k5_rand2key_direct(const krb5_data *randombits, krb5_keyblock *keyblock)
+{
+ if (randombits->length != keyblock->length)
+ return KRB5_CRYPTO_INTERNAL;
+
+ keyblock->magic = KV5M_KEYBLOCK;
+ memcpy(keyblock->contents, randombits->data, randombits->length);
+ return 0;
+}
+
+static inline void
+eighth_byte(unsigned char *b)
+{
+ b[7] = (((b[0] & 1) << 1) | ((b[1] & 1) << 2) | ((b[2] & 1) << 3) |
+ ((b[3] & 1) << 4) | ((b[4] & 1) << 5) | ((b[5] & 1) << 6) |
+ ((b[6] & 1) << 7));
+}
+
+krb5_error_code
+k5_rand2key_des(const krb5_data *randombits, krb5_keyblock *keyblock)
+{
+ if (randombits->length != 7)
+ return(KRB5_CRYPTO_INTERNAL);
+
+ keyblock->magic = KV5M_KEYBLOCK;
+
+ /* Take the seven bytes, move them around into the top 7 bits of the
+ * 8 key bytes, then compute the parity bits. */
+ memcpy(keyblock->contents, randombits->data, randombits->length);
+ eighth_byte(keyblock->contents);
+ mit_des_fixup_key_parity(keyblock->contents);
+
+ return 0;
+}
+
+krb5_error_code
+k5_rand2key_des3(const krb5_data *randombits, krb5_keyblock *keyblock)
+{
+ int i;
+
+ if (randombits->length != 21)
+ return KRB5_CRYPTO_INTERNAL;
+
+ keyblock->magic = KV5M_KEYBLOCK;
+
+ /* Take the seven bytes, move them around into the top 7 bits of the
+ * 8 key bytes, then compute the parity bits. Do this three times. */
+ for (i = 0; i < 3; i++) {
+ memcpy(&keyblock->contents[i * 8], &randombits->data[i * 7], 7);
+ eighth_byte(&keyblock->contents[i * 8]);
+ mit_des_fixup_key_parity(&keyblock->contents[i * 8]);
+ }
+ return 0;
+}
Modified: trunk/src/lib/crypto/nss/camellia/deps
===================================================================
--- trunk/src/lib/crypto/nss/camellia/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/nss/camellia/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -0,0 +1 @@
+# No dependencies here.
Modified: trunk/src/lib/crypto/nss/deps
===================================================================
--- trunk/src/lib/crypto/nss/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/nss/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -3,23 +3,46 @@
#
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) $(srcdir)/../krb/aead.h \
+ $(srcdir)/../krb/cksumtypes.h $(srcdir)/../krb/etypes.h \
+ $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+ $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+ $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+ $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.h hmac.c nss_gen.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) $(srcdir)/hash_provider/hash_provider.h \
+ $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+ $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+ $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+ $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.h nss_gen.h pbkdf2.c
+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) $(top_srcdir)/include/k5-buf.h \
$(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
$(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
$(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
- $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/krb5.h \
- $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/locate_plugin.h \
- $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
- $(top_srcdir)/include/socket-utils.h $(srcdir)/hmac.c \
- $(srcdir)/../krb/aead.h $(srcdir)/../krb/cksumtypes.h
-pbkdf2.so pbkdf2.po $(OUTPRE)pbkdf2.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+ $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+ nss_gen.h nss_prng.h prng.c
+stubs.so stubs.po $(OUTPRE)stubs.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
$(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
$(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
$(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
$(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
- $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/krb5.h \
- $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/locate_plugin.h \
- $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
- $(top_srcdir)/include/socket-utils.h $(srcdir)/hash_provider/hash_provider.h \
- $(srcdir)/pbkdf2.c
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+ $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+ stubs.c
Modified: trunk/src/lib/crypto/nss/des/deps
===================================================================
--- trunk/src/lib/crypto/nss/des/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/nss/des/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -8,40 +8,41 @@
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
- $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
- $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- $(srcdir)/des_int.h $(srcdir)/f_parity.c
-des_oldapis.so des_oldapis.po $(OUTPRE)des_oldapis.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
- $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
- $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
- $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
- $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
- $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/krb5.h \
- $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/locate_plugin.h \
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
$(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
- $(top_srcdir)/include/socket-utils.h $(srcdir)/des_int.h \
- $(srcdir)/des_oldapis.c
-weak_key.so weak_key.po $(OUTPRE)weak_key.$(OBJEXT): \
+ $(top_srcdir)/include/socket-utils.h des_int.h f_parity.c
+des_oldapis.so des_oldapis.po $(OUTPRE)des_oldapis.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
$(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
- $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
- $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- $(srcdir)/des_int.h $(srcdir)/weak_key.c
-string2key.so string2key.po $(OUTPRE)string2key.$(OBJEXT): \
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.h des_int.h des_oldapis.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) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/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) $(srcdir)/../nss_gen.h $(top_srcdir)/include/k5-buf.h \
+ $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+ $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
$(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
$(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- $(srcdir)/des_int.h $(srcdir)/string2key.c
+ des_int.h string2key.c
Modified: trunk/src/lib/crypto/nss/enc_provider/aes.c
===================================================================
--- trunk/src/lib/crypto/nss/enc_provider/aes.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/nss/enc_provider/aes.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -35,7 +35,6 @@
#include "k5-int.h"
#include "enc_provider.h"
-#include "rand2key.h"
#include "aead.h"
#include "nss_gen.h"
@@ -87,7 +86,6 @@
krb5int_aes_encrypt,
krb5int_aes_decrypt,
NULL,
- krb5int_aes_make_key,
aes_init_state,
krb5int_default_free_state,
};
@@ -98,7 +96,6 @@
krb5int_aes_encrypt,
krb5int_aes_decrypt,
NULL,
- krb5int_aes_make_key,
aes_init_state,
krb5int_default_free_state,
k5_nss_gen_cleanup
Modified: trunk/src/lib/crypto/nss/enc_provider/camellia.c
===================================================================
--- trunk/src/lib/crypto/nss/enc_provider/camellia.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/nss/enc_provider/camellia.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -35,7 +35,6 @@
#include "k5-int.h"
#include "enc_provider.h"
-#include "rand2key.h"
#include "aead.h"
#include "nss_gen.h"
@@ -102,7 +101,6 @@
krb5int_camellia_encrypt,
krb5int_camellia_decrypt,
krb5int_camellia_cbc_mac,
- krb5int_camellia_make_key,
camellia_init_state,
krb5int_default_free_state,
};
@@ -113,7 +111,6 @@
krb5int_camellia_encrypt,
krb5int_camellia_decrypt,
krb5int_camellia_cbc_mac,
- krb5int_camellia_make_key,
camellia_init_state,
krb5int_default_free_state,
k5_nss_gen_cleanup
Modified: trunk/src/lib/crypto/nss/enc_provider/deps
===================================================================
--- trunk/src/lib/crypto/nss/enc_provider/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/nss/enc_provider/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -0,0 +1,81 @@
+#
+# Generated makefile dependencies follow.
+#
+enc_gen.so enc_gen.po $(OUTPRE)enc_gen.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../krb/aead.h \
+ $(srcdir)/../../krb/cksumtypes.h $(srcdir)/../../krb/etypes.h \
+ $(srcdir)/../nss_gen.h $(top_srcdir)/include/k5-buf.h \
+ $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+ $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+ $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+ enc_gen.c enc_provider.h
+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) $(srcdir)/../../krb/aead.h \
+ $(srcdir)/../../krb/cksumtypes.h $(srcdir)/../../krb/etypes.h \
+ $(srcdir)/../des/des_int.h $(srcdir)/../nss_gen.h $(top_srcdir)/include/k5-buf.h \
+ $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+ $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+ $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+ des.c
+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) $(srcdir)/../../krb/aead.h \
+ $(srcdir)/../../krb/cksumtypes.h $(srcdir)/../../krb/etypes.h \
+ $(srcdir)/../des/des_int.h $(srcdir)/../nss_gen.h $(top_srcdir)/include/k5-buf.h \
+ $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+ $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+ $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.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) $(srcdir)/../../krb/aead.h \
+ $(srcdir)/../../krb/cksumtypes.h $(srcdir)/../../krb/etypes.h \
+ $(srcdir)/../nss_gen.h $(top_srcdir)/include/k5-buf.h \
+ $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+ $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+ $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+ aes.c enc_provider.h
+camellia.so camellia.po $(OUTPRE)camellia.$(OBJEXT): \
+ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
+ $(COM_ERR_DEPS) $(srcdir)/../../krb/aead.h $(srcdir)/../../krb/cksumtypes.h \
+ $(srcdir)/../../krb/etypes.h $(srcdir)/../nss_gen.h \
+ $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+ $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+ $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+ $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.h camellia.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) $(srcdir)/../../krb/aead.h \
+ $(srcdir)/../../krb/cksumtypes.h $(srcdir)/../../krb/etypes.h \
+ $(srcdir)/../nss_gen.h $(top_srcdir)/include/k5-buf.h \
+ $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+ $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+ $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+ rc4.c
Modified: trunk/src/lib/crypto/nss/enc_provider/des.c
===================================================================
--- trunk/src/lib/crypto/nss/enc_provider/des.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/nss/enc_provider/des.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -36,7 +36,6 @@
#include "k5-int.h"
#include "nss_gen.h"
#include <aead.h>
-#include <rand2key.h>
#include "des_int.h"
@@ -74,7 +73,6 @@
k5_des_encrypt_iov,
k5_des_decrypt_iov,
NULL,
- krb5int_des_make_key,
krb5int_des_init_state,
krb5int_default_free_state,
k5_nss_gen_cleanup
Modified: trunk/src/lib/crypto/nss/enc_provider/des3.c
===================================================================
--- trunk/src/lib/crypto/nss/enc_provider/des3.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/nss/enc_provider/des3.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -36,7 +36,6 @@
#include "k5-int.h"
#include "nss_gen.h"
#include <aead.h>
-#include <rand2key.h>
#include "des_int.h"
@@ -72,7 +71,6 @@
k5_des3_encrypt_iov,
k5_des3_decrypt_iov,
NULL,
- krb5int_des3_make_key,
krb5int_des_init_state,
krb5int_default_free_state,
k5_nss_gen_cleanup
Modified: trunk/src/lib/crypto/nss/enc_provider/enc_gen.c
===================================================================
--- trunk/src/lib/crypto/nss/enc_provider/enc_gen.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/nss/enc_provider/enc_gen.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -36,7 +36,6 @@
#include "k5-int.h"
#include "nss_gen.h"
#include "enc_provider.h"
-#include "rand2key.h"
#include "aead.h"
#include "seccomon.h"
#include "secmod.h"
Modified: trunk/src/lib/crypto/nss/enc_provider/rc4.c
===================================================================
--- trunk/src/lib/crypto/nss/enc_provider/rc4.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/nss/enc_provider/rc4.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -35,7 +35,6 @@
#include "k5-int.h"
#include <aead.h>
-#include <rand2key.h>
#include "nss_gen.h"
#define RC4_KEY_SIZE 16
@@ -95,7 +94,6 @@
k5_arcfour_encrypt_iov,
k5_arcfour_decrypt_iov,
NULL,
- krb5int_arcfour_make_key,
k5_arcfour_init_state,
k5_arcfour_free_state,
k5_nss_gen_cleanup
Modified: trunk/src/lib/crypto/nss/hash_provider/deps
===================================================================
--- trunk/src/lib/crypto/nss/hash_provider/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/nss/hash_provider/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -1,52 +1,66 @@
#
# Generated makefile dependencies follow.
#
+hash_gen.so hash_gen.po $(OUTPRE)hash_gen.$(OBJEXT): \
+ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
+ $(COM_ERR_DEPS) $(srcdir)/../../krb/aead.h $(srcdir)/../../krb/cksumtypes.h \
+ $(srcdir)/../../krb/etypes.h $(srcdir)/../nss_gen.h \
+ $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+ $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+ $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+ $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.h hash_gen.c
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) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+ $(COM_ERR_DEPS) $(srcdir)/../../krb/aead.h $(srcdir)/../../krb/cksumtypes.h \
+ $(srcdir)/../../krb/crc32/crc-32.h $(srcdir)/../../krb/etypes.h \
+ $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
- $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
- $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- $(srcdir)/hash_crc32.c \
- $(srcdir)/hash_provider.h \
- $(srcdir)/../../krb/crc32/crc-32.h
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.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) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+ $(COM_ERR_DEPS) $(srcdir)/../../krb/aead.h $(srcdir)/../../krb/cksumtypes.h \
+ $(srcdir)/../../krb/etypes.h $(srcdir)/../md4/rsa-md4.h \
+ $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
- $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
- $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- $(srcdir)/hash_md4.c $(srcdir)/hash_provider.h \
- $(srcdir)/../md4/rsa-md4.h
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.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) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
- $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
- $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
- $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+ $(COM_ERR_DEPS) $(srcdir)/../nss_gen.h $(top_srcdir)/include/k5-buf.h \
+ $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+ $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
$(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
$(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- $(srcdir)/hash_md5.c $(srcdir)/hash_provider.h \
- $(srcdir)/../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) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
- $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
- $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
- $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+ $(COM_ERR_DEPS) $(srcdir)/../nss_gen.h $(top_srcdir)/include/k5-buf.h \
+ $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+ $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
$(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
$(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- $(srcdir)/hash_provider.h \
- $(srcdir)/hash_sha1.c $(srcdir)/../sha1/shs.h
+ hash_provider.h hash_sha1.c
Modified: trunk/src/lib/crypto/nss/md4/deps
===================================================================
--- trunk/src/lib/crypto/nss/md4/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/nss/md4/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -7,7 +7,8 @@
$(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
$(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
$(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
- $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/krb5.h \
- $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/locate_plugin.h \
- $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
- $(top_srcdir)/include/socket-utils.h md4.c rsa-md4.h
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+ $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+ md4.c rsa-md4.h
Modified: trunk/src/lib/crypto/nss/md5/deps
===================================================================
--- trunk/src/lib/crypto/nss/md5/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/nss/md5/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -3,12 +3,12 @@
#
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) $(top_srcdir)/include/k5-buf.h \
- $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
- $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
- $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
- $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/krb5.h \
- $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/locate_plugin.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../nss_gen.h \
+ $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+ $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+ $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+ $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
$(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
- $(top_srcdir)/include/socket-utils.h $(srcdir)/md5.c \
- $(srcdir)/rsa-md5.h
+ $(top_srcdir)/include/socket-utils.h md5.c rsa-md5.h
Modified: trunk/src/lib/crypto/nss/sha1/deps
===================================================================
--- trunk/src/lib/crypto/nss/sha1/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/nss/sha1/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -3,12 +3,12 @@
#
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) $(top_srcdir)/include/k5-buf.h \
- $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
- $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
- $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
- $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/krb5.h \
- $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/locate_plugin.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../nss_gen.h \
+ $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+ $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+ $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+ $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
$(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
- $(top_srcdir)/include/socket-utils.h $(srcdir)/shs.c \
- $(srcdir)/shs.h
+ $(top_srcdir)/include/socket-utils.h shs.c shs.h
Modified: trunk/src/lib/crypto/nss/sha2/deps
===================================================================
--- trunk/src/lib/crypto/nss/sha2/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/nss/sha2/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -1,14 +1 @@
-#
-# 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) $(top_srcdir)/include/k5-buf.h \
- $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
- $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
- $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
- $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/krb5.h \
- $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/locate_plugin.h \
- $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
- $(top_srcdir)/include/socket-utils.h $(srcdir)/shs.c \
- $(srcdir)/shs.h
+# No dependencies here.
Modified: trunk/src/lib/crypto/openssl/deps
===================================================================
--- trunk/src/lib/crypto/openssl/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/openssl/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -9,10 +9,11 @@
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
- $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
- $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- hmac.c
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.h hmac.c
+init.so init.po $(OUTPRE)init.$(OBJEXT): init.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) $(srcdir)/hash_provider/hash_provider.h \
@@ -20,7 +21,18 @@
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.h pbkdf2.c
+stubs.so stubs.po $(OUTPRE)stubs.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
+ $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+ $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
$(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
$(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- pbkdf2.c
+ stubs.c
Modified: trunk/src/lib/crypto/openssl/des/deps
===================================================================
--- trunk/src/lib/crypto/openssl/des/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/openssl/des/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -8,10 +8,10 @@
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
- $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
- $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- des_int.h f_parity.c
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.h des_int.h f_parity.c
des_oldapis.so des_oldapis.po $(OUTPRE)des_oldapis.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -19,10 +19,10 @@
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
- $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
- $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- des_int.h des_oldapis.c
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.h des_int.h des_oldapis.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 \
@@ -30,10 +30,10 @@
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
- $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
- $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- des_int.h weak_key.c
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/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 \
@@ -41,7 +41,7 @@
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
- $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
- $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- des_int.h string2key.c
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.h des_int.h string2key.c
Modified: trunk/src/lib/crypto/openssl/enc_provider/aes.c
===================================================================
--- trunk/src/lib/crypto/openssl/enc_provider/aes.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/openssl/enc_provider/aes.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -27,7 +27,6 @@
#include "k5-int.h"
#include "enc_provider.h"
-#include "rand2key.h"
#include "aead.h"
#include "hash_provider/hash_provider.h"
#include <openssl/evp.h>
@@ -310,7 +309,6 @@
krb5int_aes_encrypt,
krb5int_aes_decrypt,
NULL,
- krb5int_aes_make_key,
krb5int_aes_init_state,
krb5int_default_free_state
};
@@ -321,7 +319,6 @@
krb5int_aes_encrypt,
krb5int_aes_decrypt,
NULL,
- krb5int_aes_make_key,
krb5int_aes_init_state,
krb5int_default_free_state
};
Modified: trunk/src/lib/crypto/openssl/enc_provider/camellia.c
===================================================================
--- trunk/src/lib/crypto/openssl/enc_provider/camellia.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/openssl/enc_provider/camellia.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -27,7 +27,6 @@
#include "k5-int.h"
#include "enc_provider.h"
-#include "rand2key.h"
#include "aead.h"
#include "hash_provider/hash_provider.h"
#include <openssl/evp.h>
@@ -376,7 +375,6 @@
krb5int_camellia_encrypt,
krb5int_camellia_decrypt,
krb5int_camellia_cbc_mac,
- krb5int_camellia_make_key,
krb5int_camellia_init_state,
krb5int_default_free_state
};
@@ -387,7 +385,6 @@
krb5int_camellia_encrypt,
krb5int_camellia_decrypt,
krb5int_camellia_cbc_mac,
- krb5int_camellia_make_key,
krb5int_camellia_init_state,
krb5int_default_free_state
};
Modified: trunk/src/lib/crypto/openssl/enc_provider/deps
===================================================================
--- trunk/src/lib/crypto/openssl/enc_provider/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/openssl/enc_provider/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -5,50 +5,63 @@
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
$(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../krb/aead.h \
$(srcdir)/../../krb/cksumtypes.h $(srcdir)/../../krb/etypes.h \
- $(srcdir)/../../krb/rand2key/rand2key.h $(srcdir)/../des/des_int.h \
- $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
- $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
- $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
- $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+ $(srcdir)/../des/des_int.h $(top_srcdir)/include/k5-buf.h \
+ $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+ $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
$(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
$(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
des.c
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) $(srcdir)/../../krb/aead.h \
$(srcdir)/../../krb/cksumtypes.h $(srcdir)/../../krb/etypes.h \
- $(srcdir)/../../krb/rand2key/rand2key.h $(srcdir)/../des/des_int.h \
- $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
- $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
- $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
- $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+ $(srcdir)/../des/des_int.h $(top_srcdir)/include/k5-buf.h \
+ $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+ $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
$(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
$(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.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) $(srcdir)/../../krb/aead.h \
$(srcdir)/../../krb/cksumtypes.h $(srcdir)/../../krb/etypes.h \
- $(srcdir)/../../krb/rand2key/rand2key.h $(srcdir)/../hash_provider/hash_provider.h \
+ $(srcdir)/../hash_provider/hash_provider.h $(top_srcdir)/include/k5-buf.h \
+ $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+ $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+ $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+ aes.c enc_provider.h
+camellia.so camellia.po $(OUTPRE)camellia.$(OBJEXT): \
+ $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+ $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
+ $(COM_ERR_DEPS) $(srcdir)/../../krb/aead.h $(srcdir)/../../krb/cksumtypes.h \
+ $(srcdir)/../../krb/etypes.h $(srcdir)/../hash_provider/hash_provider.h \
$(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
- $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
- $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- aes.c enc_provider.h
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.h camellia.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) $(srcdir)/../../krb/aead.h \
$(srcdir)/../../krb/cksumtypes.h $(srcdir)/../../krb/etypes.h \
- $(srcdir)/../../krb/rand2key/rand2key.h $(top_srcdir)/include/k5-buf.h \
- $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
- $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
- $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
- $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/krb5.h \
- $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/locate_plugin.h \
+ $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+ $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+ $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+ $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
$(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
$(top_srcdir)/include/socket-utils.h rc4.c
Modified: trunk/src/lib/crypto/openssl/enc_provider/des.c
===================================================================
--- trunk/src/lib/crypto/openssl/enc_provider/des.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/openssl/enc_provider/des.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -52,7 +52,6 @@
#include "k5-int.h"
#include <aead.h>
-#include <rand2key.h>
#include <openssl/evp.h>
#include "des_int.h"
@@ -196,7 +195,6 @@
k5_des_encrypt,
k5_des_decrypt,
NULL,
- krb5int_des_make_key,
krb5int_des_init_state,
krb5int_default_free_state
};
Modified: trunk/src/lib/crypto/openssl/enc_provider/des3.c
===================================================================
--- trunk/src/lib/crypto/openssl/enc_provider/des3.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/openssl/enc_provider/des3.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -52,7 +52,6 @@
#include "k5-int.h"
#include "des_int.h"
#include <aead.h>
-#include <rand2key.h>
#include <openssl/evp.h>
@@ -197,7 +196,6 @@
k5_des3_encrypt,
k5_des3_decrypt,
NULL,
- krb5int_des3_make_key,
krb5int_des_init_state,
krb5int_default_free_state
};
Modified: trunk/src/lib/crypto/openssl/enc_provider/rc4.c
===================================================================
--- trunk/src/lib/crypto/openssl/enc_provider/rc4.c 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/openssl/enc_provider/rc4.c 2011-02-27 19:08:14 UTC (rev 24669)
@@ -37,7 +37,6 @@
#include "k5-int.h"
#include <aead.h>
-#include <rand2key.h>
#include <openssl/evp.h>
/*
@@ -164,7 +163,6 @@
k5_arcfour_docrypt,
k5_arcfour_docrypt,
NULL,
- krb5int_arcfour_make_key,
k5_arcfour_init_state,
k5_arcfour_free_state
};
Modified: trunk/src/lib/crypto/openssl/hash_provider/deps
===================================================================
--- trunk/src/lib/crypto/openssl/hash_provider/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/openssl/hash_provider/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -10,10 +10,10 @@
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
- $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
- $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- hash_crc32.c hash_provider.h
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.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 \
@@ -23,10 +23,10 @@
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
- $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
- $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- hash_md4.c hash_provider.h
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.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 \
@@ -36,10 +36,10 @@
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
- $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
- $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- hash_md5.c hash_provider.h
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.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 \
@@ -49,7 +49,8 @@
$(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
$(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
- $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
- $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
- $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
- hash_provider.h hash_sha1.c
+ $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+ $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+ $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+ $(top_srcdir)/include/socket-utils.h hash_provider.h \
+ hash_sha1.c
Modified: trunk/src/lib/crypto/openssl/md4/deps
===================================================================
--- trunk/src/lib/crypto/openssl/md4/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/openssl/md4/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -7,7 +7,8 @@
$(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
$(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
$(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
- $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/krb5.h \
- $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/locate_plugin.h \
- $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
- $(top_srcdir)/include/socket-utils.h md4.c rsa-md4.h
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+ $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+ md4.c rsa-md4.h
Modified: trunk/src/lib/crypto/openssl/md5/deps
===================================================================
--- trunk/src/lib/crypto/openssl/md5/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/openssl/md5/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -7,7 +7,8 @@
$(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
$(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
$(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
- $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/krb5.h \
- $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/locate_plugin.h \
- $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
- $(top_srcdir)/include/socket-utils.h md5.c rsa-md5.h
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+ $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+ md5.c rsa-md5.h
Modified: trunk/src/lib/crypto/openssl/sha1/deps
===================================================================
--- trunk/src/lib/crypto/openssl/sha1/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/openssl/sha1/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -7,7 +7,8 @@
$(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
$(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
$(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
- $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/krb5.h \
- $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/locate_plugin.h \
- $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
- $(top_srcdir)/include/socket-utils.h shs.c shs.h
+ $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+ $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+ $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+ $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+ shs.c shs.h
Modified: trunk/src/lib/crypto/openssl/sha2/deps
===================================================================
--- trunk/src/lib/crypto/openssl/sha2/deps 2011-02-27 18:57:14 UTC (rev 24668)
+++ trunk/src/lib/crypto/openssl/sha2/deps 2011-02-27 19:08:14 UTC (rev 24669)
@@ -1,13 +1 @@
-#
-# Generated makefile dependencies follow.
-#
-sha256.so sha256.po $(OUTPRE)sha256.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
- $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
- $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
- $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
- $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
- $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/krb5.h \
- $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/locate_plugin.h \
- $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
- $(top_srcdir)/include/socket-utils.h sha256.c sha2.h
+# No dependencies here.
More information about the cvs-krb5
mailing list