svn rev #22995: trunk/src/ lib/crypto/ lib/crypto/builtin/ lib/crypto/builtin/aes/ ...
tsitkova@MIT.EDU
tsitkova at MIT.EDU
Fri Oct 23 15:45:49 EDT 2009
http://src.mit.edu/fisheye/changelog/krb5/?cs=22995
Commit By: tsitkova
Log Message:
Changed the crypto make system to add build flexibility. The update cancels the requirement for the dir structures to be identical in all crypto implementation and supports impl. dependent tests. Also, minor libk5crypto.exports list reduction ( from f_tables).
Changed Files:
U trunk/src/Makefile.in
U trunk/src/configure.in
U trunk/src/lib/crypto/Makefile.in
U trunk/src/lib/crypto/builtin/Makefile.in
U trunk/src/lib/crypto/builtin/aes/Makefile.in
U trunk/src/lib/crypto/builtin/aes/deps
U trunk/src/lib/crypto/builtin/arcfour/Makefile.in
U trunk/src/lib/crypto/builtin/arcfour/deps
U trunk/src/lib/crypto/builtin/deps
U trunk/src/lib/crypto/builtin/des/Makefile.in
U trunk/src/lib/crypto/builtin/des/deps
A trunk/src/lib/crypto/builtin/des/t_afss2k.c
A trunk/src/lib/crypto/builtin/des/t_verify.c
U trunk/src/lib/crypto/builtin/enc_provider/Makefile.in
U trunk/src/lib/crypto/builtin/enc_provider/deps
U trunk/src/lib/crypto/builtin/hash_provider/Makefile.in
U trunk/src/lib/crypto/builtin/hash_provider/deps
U trunk/src/lib/crypto/builtin/md4/Makefile.in
U trunk/src/lib/crypto/builtin/md4/deps
U trunk/src/lib/crypto/builtin/md5/Makefile.in
U trunk/src/lib/crypto/builtin/md5/deps
U trunk/src/lib/crypto/builtin/sha1/Makefile.in
U trunk/src/lib/crypto/builtin/sha1/deps
A trunk/src/lib/crypto/builtin/t_cf2.c
A trunk/src/lib/crypto/builtin/t_cf2.comments
A trunk/src/lib/crypto/builtin/t_cf2.expected
A trunk/src/lib/crypto/builtin/t_cf2.in
U trunk/src/lib/crypto/crypto_tests/Makefile.in
D trunk/src/lib/crypto/crypto_tests/t_afss2k.c
D trunk/src/lib/crypto/crypto_tests/t_cf2.c
D trunk/src/lib/crypto/crypto_tests/t_cf2.comments
D trunk/src/lib/crypto/crypto_tests/t_cf2.expected
D trunk/src/lib/crypto/crypto_tests/t_cf2.in
D trunk/src/lib/crypto/crypto_tests/t_shs.c
D trunk/src/lib/crypto/crypto_tests/t_shs3.c
D trunk/src/lib/crypto/crypto_tests/t_verify.c
U trunk/src/lib/crypto/libk5crypto.exports
U trunk/src/lib/crypto/openssl/aes/aes-gen.c
D trunk/src/lib/crypto/openssl/des/f_tables.c
D trunk/src/lib/crypto/openssl/des/f_tables.h
U trunk/src/lib/crypto/openssl/enc_provider/deps
U trunk/src/lib/crypto/openssl/enc_provider/des3.c
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/util/collected-client-lib/Makefile.in
Modified: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/Makefile.in 2009-10-23 19:45:48 UTC (rev 22995)
@@ -194,15 +194,15 @@
clients\kcpytkt\Makefile clients\kdeltkt\Makefile \
include\Makefile \
lib\Makefile lib\crypto\Makefile \
- lib\crypto\krb\crc32\Makefile lib\crypto\builtin\des\Makefile \
- lib\crypto\krb\dk\Makefile lib\crypto\builtin\enc_provider\Makefile \
- lib\crypto\builtin\hash_provider\Makefile \
+ lib\crypto\krb\crc32\Makefile lib\crypto\@CRYPTO_IMPL@\des\Makefile \
+ lib\crypto\krb\dk\Makefile lib\crypto\@CRYPTO_IMPL@\enc_provider\Makefile \
+ lib\crypto\@CRYPTO_IMPL@\hash_provider\Makefile \
lib\crypto\krb\keyhash_provider\Makefile \
lib\crypto\krb\prf\Makefile lib\crypto\krb\rand2key\Makefile \
lib\crypto\krb\raw\Makefile lib\crypto\krb\old\Makefile \
- lib\crypto\builtin\sha1\Makefile lib\crypto\builtin\arcfour\Makefile \
- lib\crypto\builtin\md4\Makefile lib\crypto\builtin\md5\Makefile \
- lib\crypto\krb\yarrow\Makefile lib\crypto\builtin\aes\Makefile \
+ lib\crypto\@CRYPTO_IMPL@\sha1\Makefile lib\crypto\@CRYPTO_IMPL@\arcfour\Makefile \
+ lib\crypto\@CRYPTO_IMPL@\md4\Makefile lib\crypto\@CRYPTO_IMPL@\md5\Makefile \
+ lib\crypto\krb\yarrow\Makefile lib\crypto\@CRYPTO_IMPL@\aes\Makefile \
lib\crypto\crypto_tests \
lib\gssapi\Makefile lib\gssapi\generic\Makefile \
lib\gssapi\krb5\Makefile lib\gssapi\mechglue\Makefile \
@@ -265,27 +265,27 @@
##DOS## $(WCONFIG) config < $@.in > $@
##DOS##lib\crypto\krb\crc32\Makefile: lib\crypto\krb\crc32\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
-##DOS##lib\crypto\builtin\des\Makefile: lib\crypto\builtin\des\Makefile.in $(MKFDEP)
+##DOS##lib\crypto\@CRYPTO_IMPL@\des\Makefile: lib\crypto\@CRYPTO_IMPL@\des\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
##DOS##lib\crypto\krb\dk\Makefile: lib\crypto\krb\dk\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
-##DOS##lib\crypto\builtin\enc_provider\Makefile: lib\crypto\builtin\enc_provider\Makefile.in $(MKFDEP)
+##DOS##lib\crypto\@CRYPTO_IMPL@\enc_provider\Makefile: lib\crypto\@CRYPTO_IMPL@\enc_provider\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
-##DOS##lib\crypto\builtin\hash_provider\Makefile: lib\crypto\builtin\hash_provider\Makefile.in $(MKFDEP)
+##DOS##lib\crypto\@CRYPTO_IMPL@\hash_provider\Makefile: lib\crypto\@CRYPTO_IMPL@\hash_provider\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
##DOS##lib\crypto\krb\keyhash_provider\Makefile: lib\crypto\krb\keyhash_provider\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
-##DOS##lib\crypto\builtin\sha1\Makefile: lib\crypto\builtin\sha1\Makefile.in $(MKFDEP)
+##DOS##lib\crypto\@CRYPTO_IMPL@\sha1\Makefile: lib\crypto\@CRYPTO_IMPL@\sha1\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
-##DOS##lib\crypto\builtin\arcfour\Makefile: lib\crypto\builtin\arcfour\Makefile.in $(MKFDEP)
+##DOS##lib\crypto\@CRYPTO_IMPL@\arcfour\Makefile: lib\crypto\@CRYPTO_IMPL@\arcfour\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
-##DOS##lib\crypto\builtin\md4\Makefile: lib\crypto\builtin\md4\Makefile.in $(MKFDEP)
+##DOS##lib\crypto\@CRYPTO_IMPL@\md4\Makefile: lib\crypto\@CRYPTO_IMPL@\md4\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
-##DOS##lib\crypto\builtin\md5\Makefile: lib\crypto\md5\builtin\Makefile.in $(MKFDEP)
+##DOS##lib\crypto\@CRYPTO_IMPL@\md5\Makefile: lib\crypto\md5\@CRYPTO_IMPL@\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
##DOS##lib\crypto\krb\yarrow\Makefile: lib\crypto\krb\yarrow\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
-##DOS##lib\crypto\builtin\aes\Makefile: lib\crypto\builtin\aes\Makefile.in $(MKFDEP)
+##DOS##lib\crypto\@CRYPTO_IMPL@\aes\Makefile: lib\crypto\@CRYPTO_IMPL@\aes\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
##DOS##lib\crypto\krb\old\Makefile: lib\crypto\krb\old\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
@@ -293,7 +293,7 @@
##DOS## $(WCONFIG) config < $@.in > $@
##DOS##lib\crypto\krb\Makefile: lib\crypto\krb\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
-##DOS##lib\crypto\builtin\Makefile: lib\crypto\builtin\Makefile.in $(MKFDEP)
+##DOS##lib\crypto\@CRYPTO_IMPL@\Makefile: lib\crypto\@CRYPTO_IMPL@\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
##DOS##lib\gssapi\Makefile: lib\gssapi\Makefile.in $(MKFDEP)
##DOS## $(WCONFIG) config < $@.in > $@
@@ -395,14 +395,15 @@
clients/kpasswd/* clients/kcpytkt/* clients/kdeltkt/* \
config/* include/* include/kerberosIV/* \
include/krb5/* include/krb5/stock/* include/sys/* lib/* \
- lib/crypto/* lib/crypto/krb/crc32/* lib/crypto/builtin/des/* lib/crypto/krb/dk/* \
- lib/crypto/builtin/enc_provider/* lib/crypto/builtin/hash_provider/* \
+ lib/crypto/* 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/keyhash_provider/* \
lib/crypto/krb/prf/* lib/crypto/krb/rand2key/* \
lib/crypto/krb/old/* lib/crypto/krb/raw/* \
- lib/crypto/builtin/sha1/* lib/crypto/builtin/arcfour/* lib/crypto/builtin/md4/* \
- lib/crypto/builtin/md5/* lib/crypto/krb/yarrow/* \
- lib/crypto/builtin/* lib/crypto/krb/* lib/crypto/crypto_tests \
+ lib/crypto/@CRYPTO_IMPL@/sha1/* lib/crypto/@CRYPTO_IMPL@/arcfour/* \
+ lib/crypto/@CRYPTO_IMPL@/md4/* \
+ lib/crypto/@CRYPTO_IMPL@/md5/* lib/crypto/krb/yarrow/* \
+ lib/crypto/@CRYPTO_IMPL@/* lib/crypto/krb/* lib/crypto/crypto_tests \
lib/gssapi/* lib/gssapi/generic/* lib/gssapi/krb5/* \
lib/gssapi/mechglue/* lib/gssapi/spnego/* \
lib/krb5/* lib/krb5/asn.1/* lib/krb5/krb/* \
Modified: trunk/src/configure.in
===================================================================
--- trunk/src/configure.in 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/configure.in 2009-10-23 19:45:48 UTC (rev 22995)
@@ -1059,13 +1059,13 @@
lib lib/kdb
- lib/crypto lib/crypto/krb lib/crypto/krb/crc32 lib/crypto/builtin/des
- lib/crypto/krb/dk lib/crypto/builtin/enc_provider
- lib/crypto/builtin/hash_provider lib/crypto/krb/keyhash_provider
+ 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/keyhash_provider
lib/crypto/krb/prf lib/crypto/krb/rand2key
- lib/crypto/builtin lib/crypto/builtin/md4 lib/crypto/builtin/md5
- lib/crypto/krb/old lib/crypto/krb/raw lib/crypto/builtin/sha1
- lib/crypto/builtin/arcfour lib/crypto/krb/yarrow lib/crypto/builtin/aes
+ lib/crypto/$CRYPTO_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/arcfour lib/crypto/krb/yarrow lib/crypto/$CRYPTO_IMPL/aes
lib/crypto/crypto_tests
lib/krb5 lib/krb5/error_tables lib/krb5/asn.1 lib/krb5/ccache
Modified: trunk/src/lib/crypto/Makefile.in
===================================================================
--- trunk/src/lib/crypto/Makefile.in 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/Makefile.in 2009-10-23 19:45:48 UTC (rev 22995)
@@ -2,7 +2,7 @@
myfulldir=lib/crypto
mydir=lib/crypto
BUILDTOP=$(REL)..$(S)..
-SUBDIRS= krb builtin crypto_tests
+SUBDIRS= krb @CRYPTO_IMPL@ crypto_tests
RUN_SETUP = @KRB5_RUN_ENV@
PROG_LIBPATH=-L$(TOPLIBD)
@@ -20,21 +20,21 @@
LIBFINIFUNC=cryptoint_cleanup_library
RELDIR=crypto
-STOBJLISTS=krb/crc32/OBJS.ST krb/dk/OBJS.ST builtin/enc_provider/OBJS.ST \
- builtin/hash_provider/OBJS.ST krb/keyhash_provider/OBJS.ST \
+STOBJLISTS=krb/crc32/OBJS.ST krb/dk/OBJS.ST @CRYPTO_IMPL@/enc_provider/OBJS.ST \
+ @CRYPTO_IMPL@/hash_provider/OBJS.ST krb/keyhash_provider/OBJS.ST \
krb/prf/OBJS.ST krb/rand2key/OBJS.ST \
krb/old/OBJS.ST krb/raw/OBJS.ST krb/yarrow/OBJS.ST \
- builtin/md4/OBJS.ST builtin/md5/OBJS.ST builtin/sha1/OBJS.ST \
- builtin/arcfour/OBJS.ST builtin/aes/OBJS.ST builtin/des/OBJS.ST \
- krb/OBJS.ST builtin/OBJS.ST
+ @CRYPTO_IMPL@/md4/OBJS.ST @CRYPTO_IMPL@/md5/OBJS.ST @CRYPTO_IMPL@/sha1/OBJS.ST \
+ @CRYPTO_IMPL@/arcfour/OBJS.ST @CRYPTO_IMPL@/aes/OBJS.ST @CRYPTO_IMPL@/des/OBJS.ST \
+ krb/OBJS.ST @CRYPTO_IMPL@/OBJS.ST
-SUBDIROBJLISTS=krb/crc32/OBJS.ST krb/dk/OBJS.ST builtin/enc_provider/OBJS.ST \
- builtin/hash_provider/OBJS.ST krb/keyhash_provider/OBJS.ST \
+SUBDIROBJLISTS=krb/crc32/OBJS.ST krb/dk/OBJS.ST @CRYPTO_IMPL@/enc_provider/OBJS.ST \
+ @CRYPTO_IMPL@/hash_provider/OBJS.ST krb/keyhash_provider/OBJS.ST \
krb/prf/OBJS.ST krb/rand2key/OBJS.ST \
krb/old/OBJS.ST krb/raw/OBJS.ST krb/yarrow/OBJS.ST \
- builtin/md4/OBJS.ST builtin/md5/OBJS.ST builtin/sha1/OBJS.ST \
- builtin/arcfour/OBJS.ST builtin/aes/OBJS.ST builtin/des/OBJS.ST \
- krb/OBJS.ST builtin/OBJS.ST
+ @CRYPTO_IMPL@/md4/OBJS.ST @CRYPTO_IMPL@/md5/OBJS.ST @CRYPTO_IMPL@/sha1/OBJS.ST \
+ @CRYPTO_IMPL@/arcfour/OBJS.ST @CRYPTO_IMPL@/aes/OBJS.ST @CRYPTO_IMPL@/des/OBJS.ST \
+ krb/OBJS.ST @CRYPTO_IMPL@/OBJS.ST
# No dependencies. Record places to find this shared object if the target
# link editor and loader support it.
Modified: trunk/src/lib/crypto/builtin/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/Makefile.in 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/builtin/Makefile.in 2009-10-23 19:45:48 UTC (rev 22995)
@@ -5,19 +5,21 @@
SUBDIRS=des arcfour aes md4 md5 sha1 enc_provider hash_provider
LOCALINCLUDES = -I$(srcdir)/../krb \
-I$(srcdir)/../krb/hash_provider \
- -I$(srcdir)/../@CRYPTO_IMPL@/des \
- -I$(srcdir)/../@CRYPTO_IMPL@/aes \
- -I$(srcdir)/../@CRYPTO_IMPL@/arcfour \
- -I$(srcdir)/../@CRYPTO_IMPL@/sha1 \
- -I$(srcdir)/../@CRYPTO_IMPL@/md4 \
- -I$(srcdir)/../@CRYPTO_IMPL@/md5 \
- -I$(srcdir)/../@CRYPTO_IMPL@/enc_provider \
- -I$(srcdir)/../@CRYPTO_IMPL@/hash_provider
+ -I$(srcdir)/des \
+ -I$(srcdir)/aes \
+ -I$(srcdir)/arcfour \
+ -I$(srcdir)/sha1 \
+ -I$(srcdir)/md4 \
+ -I$(srcdir)/md5 \
+ -I$(srcdir)/enc_provider \
+ -I$(srcdir)/hash_provider
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
DEFS=
+EXTRADEPSRCS= $(srcdir)/t_cf2.c
+
##DOSBUILDTOP = ..\..\..
##DOSLIBNAME=$(OUTPRE)crypto.lib
##DOSOBJFILE=$(OUTPRE)crypto.lst
@@ -25,16 +27,16 @@
##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)arcfour.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst $(OUTPRE)aes.lst
STLIBOBJS=\
- ../@CRYPTO_IMPL@/hmac.o \
- ../@CRYPTO_IMPL@/pbkdf2.o
+ hmac.o \
+ pbkdf2.o
OBJS=\
- $(OUTPRE)../@CRYPTO_IMPL@/hmac.$(OBJEXT) \
- $(OUTPRE)../@CRYPTO_IMPL@/pbkdf2.$(OBJEXT)
+ $(OUTPRE)hmac.$(OBJEXT) \
+ $(OUTPRE)pbkdf2.$(OBJEXT)
SRCS=\
- $(srcdir)/../@CRYPTO_IMPL@/hmac.c \
- $(srcdir)/../@CRYPTO_IMPL@/pbkdf2.c
+ $(srcdir)/hmac.c \
+ $(srcdir)/pbkdf2.c
STOBJLISTS= des/OBJS.ST md4/OBJS.ST \
md5/OBJS.ST sha1/OBJS.ST \
@@ -59,7 +61,19 @@
depend:: $(SRCS)
clean-unix:: clean-libobjs
+check-unix:: t_cf2
+ $(RUN_SETUP) $(VALGRIND) ./t_cf2 <$(srcdir)/t_cf2.in >t_cf2.output
+ diff t_cf2.output $(srcdir)/t_cf2.expected
+t_cf2$(EXEEXT): t_cf2.$(OBJEXT) $(SUPPORT_DEPLIB)
+ $(CC_LINK) -o $@ t_cf2.$(OBJEXT) -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB)
+
+clean::
+ $(RM) t_cf2 t_cf2.o t_cf2.output
+
+
+
+
all-windows::
cd ..\des
@echo Making in crypto\des
Modified: trunk/src/lib/crypto/builtin/aes/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/aes/Makefile.in 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/builtin/aes/Makefile.in 2009-10-23 19:45:48 UTC (rev 22995)
@@ -12,30 +12,28 @@
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
-CIMPL = @CRYPTO_IMPL@/aes
-
STLIBOBJS=\
- ../../$(CIMPL)/aescrypt.o \
- ../../$(CIMPL)/aestab.o \
- ../../$(CIMPL)/aeskey.o \
- ../../$(CIMPL)/aes_s2k.o
+ aescrypt.o \
+ aestab.o \
+ aeskey.o \
+ aes_s2k.o
OBJS=\
- $(OUTPRE)../../$(CIMPL)/aescrypt.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/aestab.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/aeskey.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/aes_s2k.$(OBJEXT)
+ $(OUTPRE)aescrypt.$(OBJEXT) \
+ $(OUTPRE)aestab.$(OBJEXT) \
+ $(OUTPRE)aeskey.$(OBJEXT) \
+ $(OUTPRE)aes_s2k.$(OBJEXT)
SRCS=\
- $(srcdir)/../../$(CIMPL)/aescrypt.c \
- $(srcdir)/../../$(CIMPL)/aestab.c \
- $(srcdir)/../../$(CIMPL)/aeskey.c \
- $(srcdir)/../../$(CIMPL)/aes_s2k.c
+ $(srcdir)/aescrypt.c \
+ $(srcdir)/aestab.c \
+ $(srcdir)/aeskey.c \
+ $(srcdir)/aes_s2k.c
GEN_OBJS=\
- $(OUTPRE)../../$(CIMPL)/aescrypt.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/aestab.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/aeskey.$(OBJEXT)
+ $(OUTPRE)aescrypt.$(OBJEXT) \
+ $(OUTPRE)aestab.$(OBJEXT) \
+ $(OUTPRE)aeskey.$(OBJEXT)
##DOS##LIBOBJS = $(OBJS)
@@ -45,11 +43,11 @@
depend:: $(SRCS)
-../../$(CIMPL)/aes-gen: ../../$(CIMPL)/aes-gen.o $(GEN_OBJS)
- $(CC_LINK) -I../../../../include $(LOCALINCLUDES) -o ../../$(CIMPL)/aes-gen ../../$(CIMPL)/aes-gen.o $(GEN_OBJS)
+aes-gen: aes-gen.o $(GEN_OBJS)
+ $(CC_LINK) -I../../../../include $(LOCALINCLUDES) -o aes-gen aes-gen.o $(GEN_OBJS)
-run-aes-gen: ../../$(CIMPL)/aes-gen
- ../../$(CIMPL)/aes-gen > kresults.out
+run-aes-gen: aes-gen
+ ./aes-gen > kresults.out
check:: run-aes-gen
@@ -57,7 +55,7 @@
clean-unix:: clean-libobjs
clean::
- -$(RM) ../../$(CIMPL)/aes-gen ../../$(CIMPL)/aes-gen.o ../../$(CIMPL)/kresults.out
+ -$(RM) aes-gen aes-gen.o kresults.out
@libobj_frag@
Modified: trunk/src/lib/crypto/builtin/aes/deps
===================================================================
--- trunk/src/lib/crypto/builtin/aes/deps 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/builtin/aes/deps 2009-10-23 19:45:48 UTC (rev 22995)
@@ -2,15 +2,15 @@
# Generated makefile dependencies follow.
#
aescrypt.so aescrypt.po $(OUTPRE)aescrypt.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(srcdir)/../../builtin/aes/aes.h \
- $(srcdir)/../../builtin/aes/aescrypt.c $(srcdir)/../../builtin/aes/aesopt.h \
- $(srcdir)/../../builtin/aes/uitypes.h
+ $(BUILDTOP)/include/autoconf.h $(srcdir)/aes.h \
+ $(srcdir)/aescrypt.c $(srcdir)/aesopt.h \
+ $(srcdir)/uitypes.h
aestab.so aestab.po $(OUTPRE)aestab.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(srcdir)/../../builtin/aes/aes.h $(srcdir)/../../builtin/aes/aesopt.h \
- $(srcdir)/../../builtin/aes/aestab.c $(srcdir)/../../builtin/aes/uitypes.h
+ $(srcdir)/aes.h $(srcdir)/aesopt.h \
+ $(srcdir)/aestab.c $(srcdir)/uitypes.h
aeskey.so aeskey.po $(OUTPRE)aeskey.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(srcdir)/../../builtin/aes/aes.h $(srcdir)/../../builtin/aes/aeskey.c \
- $(srcdir)/../../builtin/aes/aesopt.h $(srcdir)/../../builtin/aes/uitypes.h
+ $(srcdir)/aes.h $(srcdir)/aeskey.c \
+ $(srcdir)/aesopt.h $(srcdir)/uitypes.h
aes_s2k.so aes_s2k.po $(OUTPRE)aes_s2k.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
$(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
@@ -20,5 +20,5 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/aes/aes_s2k.c \
- $(srcdir)/../../builtin/aes/aes_s2k.h $(srcdir)/../../krb/dk/dk.h
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/aes_s2k.c \
+ $(srcdir)/aes_s2k.h $(srcdir)/../../krb/dk/dk.h
Modified: trunk/src/lib/crypto/builtin/arcfour/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/arcfour/Makefile.in 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/builtin/arcfour/Makefile.in 2009-10-23 19:45:48 UTC (rev 22995)
@@ -2,7 +2,7 @@
myfulldir=lib/crypto/builtin/arcfour
mydir=lib/crypto/builtin/arcfour
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../@CRYPTO_IMPL@/md4 -I$(srcdir)/../../krb
+LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../md4 -I$(srcdir)/../../krb
DEFS=
##DOS##BUILDTOP = ..\..\..\..
@@ -12,22 +12,20 @@
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
-CIMPL = @CRYPTO_IMPL@/arcfour
-
STLIBOBJS=\
- ../../$(CIMPL)/arcfour.o \
- ../../$(CIMPL)/arcfour_aead.o \
- ../../$(CIMPL)/arcfour_s2k.o
+ arcfour.o \
+ arcfour_aead.o \
+ arcfour_s2k.o
OBJS=\
- $(OUTPRE)../../$(CIMPL)/arcfour.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/arcfour_aead.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/arcfour_s2k.$(OBJEXT)
+ $(OUTPRE)arcfour.$(OBJEXT) \
+ $(OUTPRE)arcfour_aead.$(OBJEXT) \
+ $(OUTPRE)arcfour_s2k.$(OBJEXT)
SRCS=\
- $(srcdir)/../../$(CIMPL)/arcfour.c \
- $(srcdir)/../../$(CIMPL)/arcfour_aead.c\
- $(srcdir)/../../$(CIMPL)/arcfour_s2k.c
+ $(srcdir)/arcfour.c \
+ $(srcdir)/arcfour_aead.c\
+ $(srcdir)/arcfour_s2k.c
##DOS##LIBOBJS = $(OBJS)
Modified: trunk/src/lib/crypto/builtin/arcfour/deps
===================================================================
--- trunk/src/lib/crypto/builtin/arcfour/deps 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/builtin/arcfour/deps 2009-10-23 19:45:48 UTC (rev 22995)
@@ -10,8 +10,8 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/arcfour/arcfour-int.h \
- $(srcdir)/../../builtin/arcfour/arcfour.c $(srcdir)/../../builtin/arcfour/arcfour.h \
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/arcfour-int.h \
+ $(srcdir)/arcfour.c $(srcdir)/arcfour.h \
$(srcdir)/../hash_provider/hash_provider.h
arcfour_aead.so arcfour_aead.po $(OUTPRE)arcfour_aead.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
@@ -23,8 +23,8 @@
$(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/authdata_plugin.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(srcdir)/../../builtin/arcfour/arcfour-int.h $(srcdir)/../../builtin/arcfour/arcfour.h \
- $(srcdir)/../../builtin/arcfour/arcfour_aead.c $(srcdir)/../../krb/aead.h \
+ $(srcdir)/arcfour-int.h $(srcdir)/arcfour.h \
+ $(srcdir)/arcfour_aead.c $(srcdir)/../../krb/aead.h \
$(srcdir)/../../krb/cksumtypes.h
arcfour_s2k.so arcfour_s2k.po $(OUTPRE)arcfour_s2k.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
@@ -36,6 +36,7 @@
$(SRCTOP)/include/k5-utf8.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/arcfour/arcfour-int.h \
- $(srcdir)/../../builtin/arcfour/arcfour.h $(srcdir)/../../builtin/arcfour/arcfour_s2k.c \
- $(srcdir)/../../builtin/md4/rsa-md4.h
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/arcfour-int.h \
+ $(srcdir)/arcfour.h $(srcdir)/arcfour_s2k.c \
+ $(srcdir)/../md4/rsa-md4.h
+
Modified: trunk/src/lib/crypto/builtin/deps
===================================================================
--- trunk/src/lib/crypto/builtin/deps 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/builtin/deps 2009-10-23 19:45:48 UTC (rev 22995)
@@ -10,7 +10,7 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../builtin/hmac.c \
+ $(SRCTOP)/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 \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
@@ -21,5 +21,5 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../builtin/hash_provider/hash_provider.h \
- $(srcdir)/../builtin/pbkdf2.c
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/hash_provider/hash_provider.h \
+ $(srcdir)/pbkdf2.c
Modified: trunk/src/lib/crypto/builtin/des/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/des/Makefile.in 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/builtin/des/Makefile.in 2009-10-23 19:45:48 UTC (rev 22995)
@@ -13,50 +13,49 @@
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
-CIMPL = @CRYPTO_IMPL@/des
STLIBOBJS=\
- ../../$(CIMPL)/afsstring2key.o \
- ../../$(CIMPL)/d3_cbc.o \
- ../../$(CIMPL)/d3_aead.o \
- ../../$(CIMPL)/d3_kysched.o \
- ../../$(CIMPL)/f_aead.o \
- ../../$(CIMPL)/f_cbc.o \
- ../../$(CIMPL)/f_cksum.o \
- ../../$(CIMPL)/f_parity.o \
- ../../$(CIMPL)/f_sched.o \
- ../../$(CIMPL)/f_tables.o \
- ../../$(CIMPL)/key_sched.o \
- ../../$(CIMPL)/string2key.o \
- ../../$(CIMPL)/weak_key.o
+ afsstring2key.o \
+ d3_cbc.o \
+ d3_aead.o \
+ d3_kysched.o \
+ f_aead.o \
+ f_cbc.o \
+ f_cksum.o \
+ f_parity.o \
+ f_sched.o \
+ f_tables.o \
+ key_sched.o \
+ string2key.o \
+ weak_key.o
-OBJS= $(OUTPRE)../../$(CIMPL)/afsstring2key.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/d3_cbc.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/d3_aead.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/d3_kysched.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/f_aead.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/f_cbc.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/f_cksum.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/f_parity.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/f_sched.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/f_tables.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/key_sched.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/string2key.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/weak_key.$(OBJEXT)
+OBJS= $(OUTPRE)afsstring2key.$(OBJEXT) \
+ $(OUTPRE)d3_cbc.$(OBJEXT) \
+ $(OUTPRE)d3_aead.$(OBJEXT) \
+ $(OUTPRE)d3_kysched.$(OBJEXT) \
+ $(OUTPRE)f_aead.$(OBJEXT) \
+ $(OUTPRE)f_cbc.$(OBJEXT) \
+ $(OUTPRE)f_cksum.$(OBJEXT) \
+ $(OUTPRE)f_parity.$(OBJEXT) \
+ $(OUTPRE)f_sched.$(OBJEXT) \
+ $(OUTPRE)f_tables.$(OBJEXT) \
+ $(OUTPRE)key_sched.$(OBJEXT) \
+ $(OUTPRE)string2key.$(OBJEXT) \
+ $(OUTPRE)weak_key.$(OBJEXT)
-SRCS= $(srcdir)/../../$(CIMPL)/afsstring2key.c \
- $(srcdir)/../../$(CIMPL)/d3_cbc.c \
- $(srcdir)/../../$(CIMPL)/d3_aead.c \
- $(srcdir)/../../$(CIMPL)/d3_kysched.c \
- $(srcdir)/../../$(CIMPL)/f_aead.c \
- $(srcdir)/../../$(CIMPL)/f_cbc.c \
- $(srcdir)/../../$(CIMPL)/f_cksum.c \
- $(srcdir)/../../$(CIMPL)/f_parity.c \
- $(srcdir)/../../$(CIMPL)/f_sched.c \
- $(srcdir)/../../$(CIMPL)/f_tables.c \
- $(srcdir)/../../$(CIMPL)/key_sched.c \
- $(srcdir)/../../$(CIMPL)/weak_key.c \
- $(srcdir)/../../$(CIMPL)/string2key.c
+SRCS= $(srcdir)/afsstring2key.c \
+ $(srcdir)/d3_cbc.c \
+ $(srcdir)/d3_aead.c \
+ $(srcdir)/d3_kysched.c \
+ $(srcdir)/f_aead.c \
+ $(srcdir)/f_cbc.c \
+ $(srcdir)/f_cksum.c \
+ $(srcdir)/f_parity.c \
+ $(srcdir)/f_sched.c \
+ $(srcdir)/f_tables.c \
+ $(srcdir)/key_sched.c \
+ $(srcdir)/weak_key.c \
+ $(srcdir)/string2key.c
EXTRADEPSRCS = $(SRCDIR)destest.c
@@ -66,13 +65,29 @@
$(OUTPRE)f_cbc.$(OBJEXT) $(OUTPRE)f_tables.$(OBJEXT) \
$(OUTPRE)f_cksum.$(OBJEXT)
+verify$(EXEEXT): t_verify.$(OBJEXT) $(TOBJS) f_parity.$(OBJEXT) \
+ $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB)
+ $(CC_LINK) -o $@ t_verify.$(OBJEXT) $(TOBJS) f_parity.$(OBJEXT) \
+ -lcom_err $(SUPPORT_LIB)
+
destest$(EXEEXT): destest.$(OBJEXT) $(TOBJS) $(SUPPORT_DEPLIB)
$(CC_LINK) -o $@ destest.$(OBJEXT) $(TOBJS) $(SUPPORT_LIB)
all-unix:: all-libobjs
-check-unix:: destest
+TAFSS2KOBJS = \
+ t_afss2k.$(OBJEXT) $(TOBJS) \
+ afsstring2key.$(OBJEXT) f_parity.$(OBJEXT) weak_key.$(OBJEXT)
+
+t_afss2k$(EXEEXT): $(TAFSS2KOBJS) $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB)
+ $(CC_LINK) -o $@ $(TAFSS2KOBJS) -lcom_err $(SUPPORT_LIB)
+
+check-unix:: verify destest t_afss2k
+ $(RUN_SETUP) $(VALGRIND) ./verify -z
+ $(RUN_SETUP) $(VALGRIND) ./verify -m
+ $(RUN_SETUP) $(VALGRIND) ./verify
$(RUN_SETUP) $(VALGRIND) ./destest < $(srcdir)/keytest.data
+ $(RUN_SETUP) $(VALGRIND) ./t_afss2k
includes:: depend
@@ -81,7 +96,8 @@
check-windows::
clean::
- $(RM) destest.$(OBJEXT) destest$(EXEEXT)
+ $(RM) destest.$(OBJEXT) destest$(EXEEXT) \
+ t_verify.$(OBJEXT) t_afss2k.$(OBJEXT) t_afss2k$(EXEEXT)
clean-unix:: clean-libobjs
Modified: trunk/src/lib/crypto/builtin/des/deps
===================================================================
--- trunk/src/lib/crypto/builtin/des/deps 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/builtin/des/deps 2009-10-23 19:45:48 UTC (rev 22995)
@@ -11,7 +11,7 @@
$(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/authdata_plugin.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(srcdir)/../../builtin/des/afsstring2key.c $(srcdir)/../../builtin/des/des_int.h
+ $(srcdir)/afsstring2key.c $(srcdir)/des_int.h
d3_cbc.so d3_cbc.po $(OUTPRE)d3_cbc.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
$(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
@@ -21,8 +21,8 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/des/d3_cbc.c \
- $(srcdir)/../../builtin/des/des_int.h $(srcdir)/../../builtin/des/f_tables.h
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/d3_cbc.c \
+ $(srcdir)/des_int.h $(srcdir)/f_tables.h
d3_aead.so d3_aead.po $(OUTPRE)d3_aead.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
$(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
@@ -32,8 +32,8 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/des/d3_aead.c \
- $(srcdir)/../../builtin/des/des_int.h $(srcdir)/../../builtin/des/f_tables.h \
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/d3_aead.c \
+ $(srcdir)/des_int.h $(srcdir)/f_tables.h \
$(srcdir)/../../krb/aead.h $(srcdir)/../../krb/cksumtypes.h
d3_kysched.so d3_kysched.po $(OUTPRE)d3_kysched.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
@@ -45,7 +45,7 @@
$(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/authdata_plugin.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(srcdir)/../../builtin/des/d3_kysched.c $(srcdir)/../../builtin/des/des_int.h
+ $(srcdir)/d3_kysched.c $(srcdir)/des_int.h
f_aead.so f_aead.po $(OUTPRE)f_aead.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
$(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
@@ -55,8 +55,8 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/des/des_int.h \
- $(srcdir)/../../builtin/des/f_aead.c $(srcdir)/../../builtin/des/f_tables.h \
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/des_int.h \
+ $(srcdir)/f_aead.c $(srcdir)/f_tables.h \
$(srcdir)/../../krb/aead.h $(srcdir)/../../krb/cksumtypes.h
f_cbc.so f_cbc.po $(OUTPRE)f_cbc.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
@@ -67,8 +67,8 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/des/des_int.h \
- $(srcdir)/../../builtin/des/f_cbc.c $(srcdir)/../../builtin/des/f_tables.h
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/des_int.h \
+ $(srcdir)/f_cbc.c $(srcdir)/f_tables.h
f_cksum.so f_cksum.po $(OUTPRE)f_cksum.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
$(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
@@ -78,8 +78,8 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/des/des_int.h \
- $(srcdir)/../../builtin/des/f_cksum.c $(srcdir)/../../builtin/des/f_tables.h
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/des_int.h \
+ $(srcdir)/f_cksum.c $(srcdir)/f_tables.h
f_parity.so f_parity.po $(OUTPRE)f_parity.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -90,7 +90,7 @@
$(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/authdata_plugin.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(srcdir)/../../builtin/des/des_int.h $(srcdir)/../../builtin/des/f_parity.c
+ $(srcdir)/des_int.h $(srcdir)/f_parity.c
f_sched.so f_sched.po $(OUTPRE)f_sched.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
$(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
@@ -100,8 +100,8 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/des/des_int.h \
- $(srcdir)/../../builtin/des/f_sched.c
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/des_int.h \
+ $(srcdir)/f_sched.c
f_tables.so f_tables.po $(OUTPRE)f_tables.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -112,8 +112,8 @@
$(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/authdata_plugin.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(srcdir)/../../builtin/des/des_int.h $(srcdir)/../../builtin/des/f_tables.c \
- $(srcdir)/../../builtin/des/f_tables.h
+ $(srcdir)/des_int.h $(srcdir)/f_tables.c \
+ $(srcdir)/f_tables.h
key_sched.so key_sched.po $(OUTPRE)key_sched.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -124,7 +124,7 @@
$(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/authdata_plugin.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(srcdir)/../../builtin/des/des_int.h $(srcdir)/../../builtin/des/key_sched.c
+ $(srcdir)/des_int.h $(srcdir)/key_sched.c
weak_key.so weak_key.po $(OUTPRE)weak_key.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -135,7 +135,7 @@
$(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/authdata_plugin.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(srcdir)/../../builtin/des/des_int.h $(srcdir)/../../builtin/des/weak_key.c
+ $(srcdir)/des_int.h $(srcdir)/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 \
@@ -146,7 +146,7 @@
$(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/authdata_plugin.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(srcdir)/../../builtin/des/des_int.h $(srcdir)/../../builtin/des/string2key.c
+ $(srcdir)/des_int.h $(srcdir)/string2key.c
destest.so destest.po $(OUTPRE)destest.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
$(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
Copied: trunk/src/lib/crypto/builtin/des/t_afss2k.c (from rev 22931, trunk/src/lib/crypto/crypto_tests/t_afss2k.c)
Copied: trunk/src/lib/crypto/builtin/des/t_verify.c (from rev 22931, trunk/src/lib/crypto/crypto_tests/t_verify.c)
Modified: trunk/src/lib/crypto/builtin/enc_provider/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/enc_provider/Makefile.in 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/builtin/enc_provider/Makefile.in 2009-10-23 19:45:48 UTC (rev 22995)
@@ -2,12 +2,12 @@
myfulldir=lib/crypto/builtin/enc_provider
mydir=lib/crypto/builtin/enc_provider
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/../../@CRYPTO_IMPL@/des \
- -I$(srcdir)/../../@CRYPTO_IMPL@/arcfour \
- -I$(srcdir)/../../@CRYPTO_IMPL@/aes \
+LOCALINCLUDES = -I$(srcdir)/../des \
+ -I$(srcdir)/../arcfour \
+ -I$(srcdir)/../aes \
-I$(srcdir)/../../krb \
-I$(srcdir)/../../krb/rand2key \
- -I$(srcdir)/.. -I$(srcdir)/../../@CRYPTO_IMPL@
+ -I$(srcdir)/.. -I$(srcdir)/.
DEFS=
##DOS##BUILDTOP = ..\..\..\..
@@ -18,22 +18,22 @@
PROG_RPATH=$(KRB5_LIBDIR)
STLIBOBJS= \
- ../../@CRYPTO_IMPL@/enc_provider/des.o \
- ../../@CRYPTO_IMPL@/enc_provider/des3.o \
- ../../@CRYPTO_IMPL@/enc_provider/rc4.o \
- ../../@CRYPTO_IMPL@/enc_provider/aes.o
+ des.o \
+ des3.o \
+ rc4.o \
+ aes.o
OBJS= \
- $(OUTPRE)../../@CRYPTO_IMPL@/enc_provider/des.$(OBJEXT) \
- $(OUTPRE)../../@CRYPTO_IMPL@/enc_provider/des3.$(OBJEXT) \
- $(OUTPRE)../../@CRYPTO_IMPL@/enc_provider/aes.$(OBJEXT) \
- $(OUTPRE)../../@CRYPTO_IMPL@/enc_provider/rc4.$(OBJEXT)
+ $(OUTPRE)des.$(OBJEXT) \
+ $(OUTPRE)des3.$(OBJEXT) \
+ $(OUTPRE)aes.$(OBJEXT) \
+ $(OUTPRE)rc4.$(OBJEXT)
SRCS= \
- $(srcdir)/../../@CRYPTO_IMPL@/enc_provider/des.c \
- $(srcdir)/../../@CRYPTO_IMPL@/enc_provider/des3.c \
- $(srcdir)/../../@CRYPTO_IMPL@/enc_provider/aes.c \
- $(srcdir)/../../@CRYPTO_IMPL@/enc_provider/rc4.c
+ $(srcdir)/des.c \
+ $(srcdir)/des3.c \
+ $(srcdir)/aes.c \
+ $(srcdir)/rc4.c
##DOS##LIBOBJS = $(OBJS)
Modified: trunk/src/lib/crypto/builtin/enc_provider/deps
===================================================================
--- trunk/src/lib/crypto/builtin/enc_provider/deps 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/builtin/enc_provider/deps 2009-10-23 19:45:48 UTC (rev 22995)
@@ -10,8 +10,8 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/des/des_int.h \
- $(srcdir)/../../builtin/enc_provider/des.c $(srcdir)/../../builtin/enc_provider/enc_provider.h \
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/../des/des_int.h \
+ $(srcdir)/des.c $(srcdir)/enc_provider.h \
$(srcdir)/../../krb/aead.h $(srcdir)/../../krb/cksumtypes.h \
$(srcdir)/../../krb/rand2key/rand2key.h
des3.so des3.po $(OUTPRE)des3.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
@@ -23,8 +23,8 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/des/des_int.h \
- $(srcdir)/../../builtin/enc_provider/des3.c $(srcdir)/../../krb/aead.h \
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/../des/des_int.h \
+ $(srcdir)/des3.c $(srcdir)/../../krb/aead.h \
$(srcdir)/../../krb/cksumtypes.h $(srcdir)/../../krb/rand2key/rand2key.h
aes.so aes.po $(OUTPRE)aes.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
@@ -35,9 +35,9 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/aes/aes.h \
- $(srcdir)/../../builtin/aes/uitypes.h $(srcdir)/../../builtin/enc_provider/aes.c \
- $(srcdir)/../../builtin/enc_provider/enc_provider.h \
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/../aes/aes.h \
+ $(srcdir)/../aes/uitypes.h $(srcdir)/aes.c \
+ $(srcdir)/enc_provider.h \
$(srcdir)/../../krb/aead.h $(srcdir)/../../krb/cksumtypes.h \
$(srcdir)/../../krb/rand2key/rand2key.h
rc4.so rc4.po $(OUTPRE)rc4.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
@@ -49,7 +49,7 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/arcfour/arcfour-int.h \
- $(srcdir)/../../builtin/arcfour/arcfour.h $(srcdir)/../../builtin/enc_provider/enc_provider.h \
- $(srcdir)/../../builtin/enc_provider/rc4.c $(srcdir)/../../krb/aead.h \
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/../arcfour/arcfour-int.h \
+ $(srcdir)/../arcfour/arcfour.h $(srcdir)/enc_provider.h \
+ $(srcdir)/rc4.c $(srcdir)/../../krb/aead.h \
$(srcdir)/../../krb/cksumtypes.h $(srcdir)/../../krb/rand2key/rand2key.h
Modified: trunk/src/lib/crypto/builtin/hash_provider/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/hash_provider/Makefile.in 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/builtin/hash_provider/Makefile.in 2009-10-23 19:45:48 UTC (rev 22995)
@@ -2,8 +2,8 @@
myfulldir=lib/crypto/builtin/hash_provider
mydir=lib/crypto/builtin/hash_provider
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../../@CRYPTO_IMPL@/md4 \
- -I$(srcdir)/../../@CRYPTO_IMPL@/md5 -I$(srcdir)/../../@CRYPTO_IMPL@/sha1
+LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \
+ -I$(srcdir)/../md5 -I$(srcdir)/../sha1
DEFS=
##DOS##BUILDTOP = ..\..\..\..
@@ -13,23 +13,21 @@
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
-CIMPL = @CRYPTO_IMPL@/hash_provider
-
STLIBOBJS= \
- ../../$(CIMPL)/hash_crc32.o \
- ../../$(CIMPL)/hash_md4.o \
- ../../$(CIMPL)/hash_md5.o \
- ../../$(CIMPL)/hash_sha1.o
+ hash_crc32.o \
+ hash_md4.o \
+ hash_md5.o \
+ hash_sha1.o
-OBJS= $(OUTPRE)../../$(CIMPL)/hash_crc32.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/hash_md4.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/hash_md5.$(OBJEXT) \
- $(OUTPRE)../../$(CIMPL)/hash_sha1.$(OBJEXT)
+OBJS= $(OUTPRE)hash_crc32.$(OBJEXT) \
+ $(OUTPRE)hash_md4.$(OBJEXT) \
+ $(OUTPRE)hash_md5.$(OBJEXT) \
+ $(OUTPRE)hash_sha1.$(OBJEXT)
-SRCS= $(srcdir)/../../$(CIMPL)/hash_crc32.c \
- $(srcdir)/../../$(CIMPL)/hash_md4.c \
- $(srcdir)/../../$(CIMPL)/hash_md5.c \
- $(srcdir)/../../$(CIMPL)/hash_sha1.c
+SRCS= $(srcdir)/hash_crc32.c \
+ $(srcdir)/hash_md4.c \
+ $(srcdir)/hash_md5.c \
+ $(srcdir)/hash_sha1.c
##DOS##LIBOBJS = $(OBJS)
Modified: trunk/src/lib/crypto/builtin/hash_provider/deps
===================================================================
--- trunk/src/lib/crypto/builtin/hash_provider/deps 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/builtin/hash_provider/deps 2009-10-23 19:45:48 UTC (rev 22995)
@@ -11,8 +11,8 @@
$(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/authdata_plugin.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(srcdir)/../../builtin/hash_provider/hash_crc32.c \
- $(srcdir)/../../builtin/hash_provider/hash_provider.h \
+ $(srcdir)/hash_crc32.c \
+ $(srcdir)/hash_provider.h \
$(srcdir)/../../krb/crc32/crc-32.h
hash_md4.so hash_md4.po $(OUTPRE)hash_md4.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
@@ -24,8 +24,8 @@
$(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/authdata_plugin.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(srcdir)/../../builtin/hash_provider/hash_md4.c $(srcdir)/../../builtin/hash_provider/hash_provider.h \
- $(srcdir)/../../builtin/md4/rsa-md4.h
+ $(srcdir)/hash_md4.c $(srcdir)/hash_provider.h \
+ $(srcdir)/../md4/rsa-md4.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,8 +36,8 @@
$(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/authdata_plugin.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(srcdir)/../../builtin/hash_provider/hash_md5.c $(srcdir)/../../builtin/hash_provider/hash_provider.h \
- $(srcdir)/../../builtin/md5/rsa-md5.h
+ $(srcdir)/hash_md5.c $(srcdir)/hash_provider.h \
+ $(srcdir)/../md5/rsa-md5.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 \
@@ -48,5 +48,5 @@
$(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/authdata_plugin.h \
$(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
$(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
- $(srcdir)/../../builtin/hash_provider/hash_provider.h \
- $(srcdir)/../../builtin/hash_provider/hash_sha1.c $(srcdir)/../../builtin/sha1/shs.h
+ $(srcdir)/hash_provider.h \
+ $(srcdir)/hash_sha1.c $(srcdir)/../sha1/shs.h
Modified: trunk/src/lib/crypto/builtin/md4/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/md4/Makefile.in 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/builtin/md4/Makefile.in 2009-10-23 19:45:48 UTC (rev 22995)
@@ -12,11 +12,11 @@
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
-STLIBOBJS= ../../@CRYPTO_IMPL@/md4/md4.o
+STLIBOBJS= md4.o
-OBJS= $(OUTPRE)../../@CRYPTO_IMPL@/md4/md4.$(OBJEXT)
+OBJS= $(OUTPRE)md4.$(OBJEXT)
-SRCS= $(srcdir)/../../@CRYPTO_IMPL@/md4/md4.c
+SRCS= $(srcdir)/md4.c
##DOS##LIBOBJS = $(OBJS)
Modified: trunk/src/lib/crypto/builtin/md4/deps
===================================================================
--- trunk/src/lib/crypto/builtin/md4/deps 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/builtin/md4/deps 2009-10-23 19:45:48 UTC (rev 22995)
@@ -10,5 +10,5 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/md4/md4.c \
- $(srcdir)/../../builtin/md4/rsa-md4.h
+ $(SRCTOP)/include/socket-utils.h md4.c \
+ rsa-md4.h
Modified: trunk/src/lib/crypto/builtin/md5/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/md5/Makefile.in 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/builtin/md5/Makefile.in 2009-10-23 19:45:48 UTC (rev 22995)
@@ -11,11 +11,11 @@
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
-STLIBOBJS= ../../@CRYPTO_IMPL@/md5/md5.o
+STLIBOBJS= md5.o
-OBJS= $(OUTPRE)../../@CRYPTO_IMPL@/md5/md5.$(OBJEXT)
+OBJS= $(OUTPRE)md5.$(OBJEXT)
-SRCS= $(srcdir)/../../@CRYPTO_IMPL@/md5/md5.c
+SRCS= $(srcdir)/md5.c
##DOS##LIBOBJS = $(OBJS)
Modified: trunk/src/lib/crypto/builtin/md5/deps
===================================================================
--- trunk/src/lib/crypto/builtin/md5/deps 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/builtin/md5/deps 2009-10-23 19:45:48 UTC (rev 22995)
@@ -10,5 +10,5 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/md5/md5.c \
- $(srcdir)/../../builtin/md5/rsa-md5.h
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/md5.c \
+ $(srcdir)/rsa-md5.h
Modified: trunk/src/lib/crypto/builtin/sha1/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/sha1/Makefile.in 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/builtin/sha1/Makefile.in 2009-10-23 19:45:48 UTC (rev 22995)
@@ -11,11 +11,11 @@
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
-STLIBOBJS= ../../@CRYPTO_IMPL@/sha1/shs.o
+STLIBOBJS= shs.o
-OBJS= $(OUTPRE)../../@CRYPTO_IMPL@/sha1/shs.$(OBJEXT)
+OBJS= $(OUTPRE)shs.$(OBJEXT)
-SRCS= $(srcdir)/../../@CRYPTO_IMPL@/sha1/shs.c
+SRCS= $(srcdir)/shs.c
##DOS##LIBOBJS = $(OBJS)
@@ -24,13 +24,26 @@
includes:: depend
depend:: $(SRCS)
+t_shs: t_shs.o shs.o $(SUPPORT_DEPLIB)
+ $(CC_LINK) -o t_shs t_shs.o shs.o $(SUPPORT_LIB)
-check-unix::
+$(OUTPRE)t_shs.exe: $(OUTPRE)t_shs.obj $(OUTPRE)shs.obj
+ link -out:$@ $**
-check-windows::
+t_shs3: t_shs3.o shs.o $(SUPPORT_DEPLIB)
+ $(CC_LINK) -o t_shs3 t_shs3.o shs.o $(SUPPORT_LIB)
-clean::
+check-unix:: t_shs t_shs3
+ $(RUN_SETUP) $(VALGRIND) $(C)t_shs -x
+ $(RUN_SETUP) $(VALGRIND) $(C)t_shs3
+check-windows:: $(OUTPRE)t_shs.exe $(OUTPRE)t_shs3.exe
+ $(OUTPRE)$(C)t_shs.exe -x
+ $(OUTPRE)$(C)t_shs3.exe
+
+clean::
+ $(RM) t_shs$(EXEEXT) t_shs.$(OBJEXT) t_shs3$(EXEEXT) t_shs3.$(OBJEXT)
+
clean-unix:: clean-libobjs
@libobj_frag@
Modified: trunk/src/lib/crypto/builtin/sha1/deps
===================================================================
--- trunk/src/lib/crypto/builtin/sha1/deps 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/builtin/sha1/deps 2009-10-23 19:45:48 UTC (rev 22995)
@@ -10,5 +10,5 @@
$(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
$(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/sha1/shs.c \
- $(srcdir)/../../builtin/sha1/shs.h
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/shs.c \
+ $(srcdir)/shs.h
Copied: trunk/src/lib/crypto/builtin/t_cf2.c (from rev 22972, trunk/src/lib/crypto/crypto_tests/t_cf2.c)
Copied: trunk/src/lib/crypto/builtin/t_cf2.comments (from rev 22972, trunk/src/lib/crypto/crypto_tests/t_cf2.comments)
Copied: trunk/src/lib/crypto/builtin/t_cf2.expected (from rev 22972, trunk/src/lib/crypto/crypto_tests/t_cf2.expected)
Copied: trunk/src/lib/crypto/builtin/t_cf2.in (from rev 22972, trunk/src/lib/crypto/crypto_tests/t_cf2.in)
Modified: trunk/src/lib/crypto/crypto_tests/Makefile.in
===================================================================
--- trunk/src/lib/crypto/crypto_tests/Makefile.in 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/crypto_tests/Makefile.in 2009-10-23 19:45:48 UTC (rev 22995)
@@ -17,7 +17,6 @@
EXTRADEPSRCS=\
$(srcdir)/t_nfold.c \
- $(srcdir)/t_cf2.c \
$(srcdir)/t_encrypt.c \
$(srcdir)/t_prf.c \
$(srcdir)/t_prng.c \
@@ -26,13 +25,9 @@
$(srcdir)/t_cts.c \
$(srcdir)/vectors.c \
$(srcdir)/aes-test.c \
- $(srcdir)/t_afss2k.c \
$(srcdir)/t_cksum.c \
$(srcdir)/t_crc.c \
$(srcdir)/t_mddriver.c \
- $(srcdir)/t_shs3.c \
- $(srcdir)/t_shs.c \
- $(srcdir)/t_verify.c \
$(srcdir)/t_kperf.c \
$(srcdir)/ytest.c
@@ -44,11 +39,11 @@
##DOS##LIBOBJS = $(OBJS)
-check-unix:: t_nfold t_encrypt t_prf t_prng t_hmac t_cf2 \
+check-unix:: t_nfold t_encrypt t_prf t_prng t_hmac \
t_cksum4 t_cksum5 \
- aes-test verify t_afss2k \
+ aes-test \
t_mddriver4 t_mddriver \
- t_shs t_shs3 t_crc t_cts
+ t_crc t_cts
$(RUN_SETUP) $(VALGRIND) ./t_nfold
$(RUN_SETUP) $(VALGRIND) ./t_encrypt
$(RUN_SETUP) $(VALGRIND) ./t_prng <$(srcdir)/t_prng.seed >t_prng.output && \
@@ -56,23 +51,16 @@
$(RUN_SETUP) $(VALGRIND) ./t_hmac
$(RUN_SETUP) $(VALGRIND) ./t_prf <$(srcdir)/t_prf.in >t_prf.output
diff t_prf.output $(srcdir)/t_prf.expected
- $(RUN_SETUP) $(VALGRIND) ./t_cf2 <$(srcdir)/t_cf2.in >t_cf2.output
- diff t_cf2.output $(srcdir)/t_cf2.expected
$(RUN_SETUP) $(VALGRIND) ./t_cksum4 "this is a test"
$(RUN_SETUP) $(VALGRIND) ./t_cksum5 "this is a test"
$(RUN_SETUP) $(VALGRIND) ./t_crc
+ $(RUN_SETUP) $(VALGRIND) ./t_cts
$(RUN_SETUP) $(VALGRIND) ./aes-test -k > vk.txt
cmp vk.txt $(srcdir)/expect-vk.txt
$(RUN_SETUP) $(VALGRIND) ./aes-test > vt.txt
cmp vt.txt $(srcdir)/expect-vt.txt
- $(RUN_SETUP) $(VALGRIND) ./verify -z
- $(RUN_SETUP) $(VALGRIND) ./verify -m
- $(RUN_SETUP) $(VALGRIND) ./verify
- $(RUN_SETUP) $(VALGRIND) ./t_afss2k
$(RUN_SETUP) $(VALGRIND) $(C)t_mddriver4 -x
$(RUN_SETUP) $(VALGRIND) $(C)t_mddriver -x
- $(RUN_SETUP) $(VALGRIND) $(C)t_shs -x
- $(RUN_SETUP) $(VALGRIND) $(C)t_shs3
@@ -91,10 +79,6 @@
t_prf$(EXEEXT): t_prf.$(OBJEXT) $(SUPPORT_DEPLIB)
$(CC_LINK) -o $@ t_prf.$(OBJEXT) -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB)
-t_cf2$(EXEEXT): t_cf2.$(OBJEXT) $(SUPPORT_DEPLIB)
- $(CC_LINK) -o $@ t_cf2.$(OBJEXT) -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB)
-
-
t_prng$(EXEEXT): t_prng.$(OBJEXT) $(SUPPORT_DEPLIB)
$(CC_LINK) -o $@ t_prng.$(OBJEXT) -lk5crypto -lcom_err $(SUPPORT_LIB)
@@ -129,12 +113,6 @@
aes-test: aes-test.$(OBJEXT) $(CRYPTO_DEPLIB)
$(CC_LINK) -o aes-test aes-test.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB)
-verify$(EXEEXT): t_verify.$(OBJEXT) $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB)
- $(CC_LINK) -o $@ t_verify.$(OBJEXT) -lcom_err $(SUPPORT_LIB) -lk5crypto
-
-t_afss2k: t_afss2k.$(OBJEXT) $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB) $(CRYPTO_DEPLIB)
- $(CC_LINK) -o $@ t_afss2k.$(OBJEXT) -lcom_err $(SUPPORT_LIB) -lk5crypto
-
t_mddriver4.o: $(srcdir)/t_mddriver.c
$(CC) -DMD=4 $(ALL_CFLAGS) -o t_mddriver4.o -c $(srcdir)/t_mddriver.c
@@ -144,12 +122,6 @@
t_mddriver: t_mddriver.o $(SUPPORT_DEPLIB) $(CRYPTO_DEPLIB)
$(CC_LINK) -o t_mddriver t_mddriver.o -lk5crypto $(SUPPORT_LIB)
-t_shs: t_shs.o $(SUPPORT_DEPLIB) $(CRYPTO_DEPLIB)
- $(CC_LINK) -o t_shs t_shs.o $(SUPPORT_LIB) $(CRYPTO_DEPLIB)
-
-t_shs3: t_shs3.o $(SUPPORT_DEPLIB) $(CRYPTO_DEPLIB)
- $(CC_LINK) -o t_shs3 t_shs3.o $(SUPPORT_LIB) $(CRYPTO_DEPLIB)
-
t_kperf: t_kperf.o $(SUPPORT_DEPLIB) $(CRYPTO_DEPLIB)
$(CC_LINK) -o t_kperf t_kperf.o $(SUPPORT_LIB) $(CRYPTO_DEPLIB)
@@ -161,19 +133,16 @@
clean::
$(RM) t_nfold.o t_nfold nfold.$(OBJEXT) t_encrypt t_encrypt.o \
t_prng.o t_prng t_hmac.o t_hmac t_pkcs5.o t_pkcs5 pbkdf2.o \
- t_prf t_prf.o t_cf2 t_cf2.o \
+ t_prf t_prf.o \
aes-test.o aes-test vt.txt vk.txt kresults.out \
- t_afss2k.o t_afss2k t_cksum.o t_cksum \
+ t_cksum.o t_cksum \
t_crc.o t_crc t_cts.o t_cts \
t_mddriver4.o t_mddriver4 t_mddriver.o t_mddriver \
t_cksum4 t_cksum4.o t_cksum5 t_cksum5.o \
- t_shs3 t_shs3.o t_shs t_shs.o verify t_verify.o \
- t_mddriver$(EXEEXT) $(OUTPRE)t_mddriver.$(OBJEXT) \
- t_shs$(EXEEXT) t_shs.$(OBJEXT) t_shs3$(EXEEXT) t_shs3.$(OBJEXT)
+ t_mddriver$(EXEEXT) $(OUTPRE)t_mddriver.$(OBJEXT)
-$(RM) t_prng.output
-$(RM) t_prf.output
- -$(RM) t_cf2.output
@lib_frag@
@libobj_frag@
Deleted: trunk/src/lib/crypto/crypto_tests/t_afss2k.c
Deleted: trunk/src/lib/crypto/crypto_tests/t_cf2.c
Deleted: trunk/src/lib/crypto/crypto_tests/t_cf2.comments
Deleted: trunk/src/lib/crypto/crypto_tests/t_cf2.expected
Deleted: trunk/src/lib/crypto/crypto_tests/t_cf2.in
Deleted: trunk/src/lib/crypto/crypto_tests/t_shs.c
Deleted: trunk/src/lib/crypto/crypto_tests/t_shs3.c
Deleted: trunk/src/lib/crypto/crypto_tests/t_verify.c
Modified: trunk/src/lib/crypto/libk5crypto.exports
===================================================================
--- trunk/src/lib/crypto/libk5crypto.exports 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/libk5crypto.exports 2009-10-23 19:45:48 UTC (rev 22995)
@@ -1,6 +1,3 @@
-des_FP_table
-des_IP_table
-des_SP_table
is_coll_proof_cksum
is_keyed_cksum
krb5_MD4Final
Modified: trunk/src/lib/crypto/openssl/aes/aes-gen.c
===================================================================
--- trunk/src/lib/crypto/openssl/aes/aes-gen.c 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/openssl/aes/aes-gen.c 2009-10-23 19:45:48 UTC (rev 22995)
@@ -32,9 +32,11 @@
test_case[i].input[j] = 0xff & rand();
}
- r = aes_enc_key (key, sizeof(key), &ctx);
+ r = krb5int_aes_enc_key (key, sizeof(key), &ctx);
+ //r = aes_enc_key (key, sizeof(key), &ctx);
if (!r) fprintf(stderr, "error, line %d\n", __LINE__), exit(1);
- r = aes_dec_key (key, sizeof(key), &dctx);
+ r = krb5int_aes_dec_key (key, sizeof(key), &dctx);
+ //r = aes_dec_key (key, sizeof(key), &dctx);
if (!r) fprintf(stderr, "error, line %d\n", __LINE__), exit(1);
}
Deleted: trunk/src/lib/crypto/openssl/des/f_tables.c
Deleted: trunk/src/lib/crypto/openssl/des/f_tables.h
Modified: trunk/src/lib/crypto/openssl/enc_provider/deps
===================================================================
--- trunk/src/lib/crypto/openssl/enc_provider/deps 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/openssl/enc_provider/deps 2009-10-23 19:45:48 UTC (rev 22995)
@@ -3,48 +3,53 @@
#
des.so des.po $(OUTPRE)des.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
- $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \
- $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \
- $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \
- $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \
- $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \
- $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
+ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \
+ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \
+ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \
+ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
+ $(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/des/des_int.h \
- $(srcdir)/../../krb/aead.h $(srcdir)/../cksumtypes.h des.c \
- enc_provider.h
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/../des/des_int.h \
+ $(srcdir)/des.c $(srcdir)/enc_provider.h \
+ $(srcdir)/../../krb/aead.h $(srcdir)/../../krb/cksumtypes.h \
+ $(srcdir)/../../krb/rand2key/rand2key.h
des3.so des3.po $(OUTPRE)des3.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
- $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \
- $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \
- $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \
- $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \
- $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \
- $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
+ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \
+ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \
+ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \
+ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
+ $(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/des/des_int.h \
- $(srcdir)/../../krb/aead.h $(srcdir)/../cksumtypes.h des3.c
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/../des/des_int.h \
+ $(srcdir)/des3.c $(srcdir)/../../krb/aead.h \
+ $(srcdir)/../../krb/cksumtypes.h $(srcdir)/../../krb/rand2key/rand2key.h
aes.so aes.po $(OUTPRE)aes.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
- $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \
- $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \
- $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \
- $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \
- $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \
- $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
+ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \
+ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \
+ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \
+ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
+ $(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/aes/aes.h \
- $(srcdir)/../../builtin/aes/uitypes.h $(srcdir)/../../krb/aead.h \
- $(srcdir)/../cksumtypes.h aes.c enc_provider.h
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/../aes/aes.h \
+ $(srcdir)/../aes/uitypes.h $(srcdir)/aes.c \
+ $(srcdir)/enc_provider.h \
+ $(srcdir)/../../krb/aead.h $(srcdir)/../../krb/cksumtypes.h \
+ $(srcdir)/../../krb/rand2key/rand2key.h
rc4.so rc4.po $(OUTPRE)rc4.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
- $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \
- $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \
- $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \
- $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \
- $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \
- $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
+ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \
+ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \
+ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \
+ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
+ $(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h $(srcdir)/../../builtin/arcfour/arcfour-int.h \
- $(srcdir)/../../builtin/arcfour/arcfour.h $(srcdir)/../../krb/aead.h \
- $(srcdir)/../cksumtypes.h enc_provider.h rc4.c
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/../arcfour/arcfour-int.h \
+ $(srcdir)/../arcfour/arcfour.h $(srcdir)/enc_provider.h \
+ $(srcdir)/rc4.c $(srcdir)/../../krb/aead.h \
+ $(srcdir)/../../krb/cksumtypes.h $(srcdir)/../../krb/rand2key/rand2key.h
Modified: trunk/src/lib/crypto/openssl/enc_provider/des3.c
===================================================================
--- trunk/src/lib/crypto/openssl/enc_provider/des3.c 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/openssl/enc_provider/des3.c 2009-10-23 19:45:48 UTC (rev 22995)
@@ -220,8 +220,11 @@
oblock, MIT_DES_BLOCK_LENGTH, &output_pos);
}
- if(ret)
+ if(ret) {
+ /*if (ivec != NULL && ivec->data)
+ memcpy(ivec->data, oblock, MIT_DES_BLOCK_LENGTH); */
ret = EVP_EncryptFinal_ex(&ciph_ctx, oblock+input_pos.data_pos, &tmp_len);
+ }
EVP_CIPHER_CTX_cleanup(&ciph_ctx);
@@ -300,9 +303,12 @@
oblock, MIT_DES_BLOCK_LENGTH, &output_pos);
}
- if(ret)
+ if(ret) {
+ /*if (ivec != NULL && ivec->data)
+ memcpy(ivec->data, oblock, MIT_DES_BLOCK_LENGTH); */
ret = EVP_DecryptFinal_ex(&ciph_ctx,
oblock + input_pos.data_pos, &tmp_len);
+ }
EVP_CIPHER_CTX_cleanup(&ciph_ctx);
Modified: trunk/src/lib/crypto/openssl/md4/deps
===================================================================
--- trunk/src/lib/crypto/openssl/md4/deps 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/openssl/md4/deps 2009-10-23 19:45:48 UTC (rev 22995)
@@ -3,11 +3,12 @@
#
md4.so md4.po $(OUTPRE)md4.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
- $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/autoconf.h \
- $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \
- $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \
- $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \
- $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \
- $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
+ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \
+ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \
+ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \
+ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
+ $(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h md4.c rsa-md4.h
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/md4.c \
+ $(srcdir)/rsa-md4.h
Modified: trunk/src/lib/crypto/openssl/md5/deps
===================================================================
--- trunk/src/lib/crypto/openssl/md5/deps 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/openssl/md5/deps 2009-10-23 19:45:48 UTC (rev 22995)
@@ -3,11 +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) $(SRCTOP)/include/autoconf.h \
- $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \
- $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \
- $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \
- $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \
- $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
+ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \
+ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \
+ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \
+ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
+ $(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h md5.c rsa-md5.h
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/md5.c \
+ $(srcdir)/rsa-md5.h
Modified: trunk/src/lib/crypto/openssl/sha1/deps
===================================================================
--- trunk/src/lib/crypto/openssl/sha1/deps 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/lib/crypto/openssl/sha1/deps 2009-10-23 19:45:48 UTC (rev 22995)
@@ -3,11 +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) $(SRCTOP)/include/autoconf.h \
- $(SRCTOP)/include/k5-buf.h $(SRCTOP)/include/k5-err.h \
- $(SRCTOP)/include/k5-gmt_mktime.h $(SRCTOP)/include/k5-int-pkinit.h \
- $(SRCTOP)/include/k5-int.h $(SRCTOP)/include/k5-platform.h \
- $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \
- $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \
+ $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
+ $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \
+ $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \
+ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \
+ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
+ $(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \
$(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
- $(SRCTOP)/include/socket-utils.h shs.c shs.h
+ $(SRCTOP)/include/socket-utils.h $(srcdir)/shs.c \
+ $(srcdir)/shs.h
Modified: trunk/src/util/collected-client-lib/Makefile.in
===================================================================
--- trunk/src/util/collected-client-lib/Makefile.in 2009-10-23 19:39:38 UTC (rev 22994)
+++ trunk/src/util/collected-client-lib/Makefile.in 2009-10-23 19:45:48 UTC (rev 22995)
@@ -41,21 +41,21 @@
../../lib/krb5/unicode/OBJS.ST \
../profile/OBJS.ST \
../../lib/crypto/krb/crc32/OBJS.ST \
- ../../lib/crypto/builtin/des/OBJS.ST \
+ ../../lib/crypto/@CRYPTO_IMPL@/des/OBJS.ST \
../../lib/crypto/krb/dk/OBJS.ST \
- ../../lib/crypto/builtin/enc_provider/OBJS.ST \
+ ../../lib/crypto/@CRYPTO_IMPL@/enc_provider/OBJS.ST \
../../lib/crypto/krb/hash_provider/OBJS.ST \
../../lib/crypto/krb/keyhash_provider/OBJS.ST \
- ../../lib/crypto/builtin/md4/OBJS.ST \
- ../../lib/crypto/builtin/md5/OBJS.ST \
+ ../../lib/crypto/@CRYPTO_IMPL@/md4/OBJS.ST \
+ ../../lib/crypto/@CRYPTO_IMPL@/md5/OBJS.ST \
../../lib/crypto/krb/old/OBJS.ST \
../../lib/crypto/krb/raw/OBJS.ST \
- ../../lib/crypto/builtin/sha1/OBJS.ST \
- ../../lib/crypto/builtin/arcfour/OBJS.ST \
- ../../lib/crypto/builtin/aes/OBJS.ST \
+ ../../lib/crypto/@CRYPTO_IMPL@/sha1/OBJS.ST \
+ ../../lib/crypto/@CRYPTO_IMPL@/arcfour/OBJS.ST \
+ ../../lib/crypto/@CRYPTO_IMPL@/aes/OBJS.ST \
../../lib/crypto/krb/yarrow/OBJS.ST \
../../lib/crypto/krb/OBJS.ST \
- ../../lib/crypto/builtin/OBJS.ST \
+ ../../lib/crypto/@CRYPTO_IMPL@/OBJS.ST \
../../lib/crypto/OBJS.ST \
../et/OBJS.ST \
../support/OBJS.ST
More information about the cvs-krb5
mailing list