Build and link in AES crypto code (but don't define the enctype yet).

Build and link in PBKDF2 function.
Add ciphertext stealing tests.
Update various tests to correspond with IETF crypto draft.

* aes: New directory, containing AES implementation from Brian Gladstone,
tweaked a little for the krb5 build system.
* configure.in: Build its makefile.
* Makefile.in (LOCAL_SUBDIRS, LOCALINCLUDES, STOBJLISTS, SUBDIROBJLISTS): Add
aes entries.

* t_cts.c: New test file.
* Makefile.in (EXTRADEPSRCS): Add t_cts.
(t_cts$(EXEEXT)): New rule.

* Makefile.in (SRCS, OBJS, STLIBOBJS): Add pbkdf2.
(EXTRADEPSRCS): Remove pbkdf2.c.
(t_pkcs5$(EXEEXT)): Don't list pbkdf2.$(OBJEXT).

* t_nfold.c (fold_kerberos): New function.
(main): Call it with different lengths.
* vectors.c: Include ctype.h and hash_provider.h.
(test_nfold, test_mit_des_s2k, test_s2k, test_dr_dk): Test case data now static
and const.
(test_nfold): Add "Q" and "ba" tests from Simon Josefsson.
(GCLEF): New macro.
(test_mit_des_s2k): Add GCLEF test case.  Fill in "key" at run time, not as
initialization.
(test_s2k): Added GCLEF test case.
(krb5int_enc_aes128, krb5int_enc_aes256): Declare.
(combine_keys, test_des3_combine, k5_des3_make_key): Functions deleted.
(whoami): New variable.
(printd, printk): New functions.
(test_pbkdf2): New function.
(main): Initialize whoami.  Test nfold only for now.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15144 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 14 insertions, 5 deletions

diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index d50418ca8..be18f5675 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -3,9 +3,10 @@ myfulldir=lib/crypto
 mydir=.
 BUILDTOP=$(REL)..$(S)..
 LOCAL_SUBDIRS=crc32 des dk enc_provider hash_provider keyhash_provider \
-	md4 md5 old raw sha1 arcfour yarrow
+	md4 md5 old raw sha1 arcfour yarrow aes
 LOCALINCLUDES = -I$(srcdir)/enc_provider \
 	-I$(srcdir)/hash_provider -I$(srcdir)/keyhash_provider \
+	-I$(srcdir)/aes \
 	-I$(srcdir)/old -I$(srcdir)/raw -I$(srcdir)/dk -I$(srcdir)/arcfour \
 	-I$(srcdir)/yarrow -I$(srcdir)/sha1
 RUN_SETUP = @KRB5_RUN_ENV@
@@ -17,8 +18,8 @@ EXTRADEPSRCS=\
 	$(srcdir)/t_encrypt.c	\
 	$(srcdir)/t_prng.c	\
 	$(srcdir)/t_hmac.c	\
-	$(srcdir)/pbkdf2.c	\
 	$(srcdir)/t_pkcs5.c	\
+	$(srcdir)/t_cts.c	\
 	$(srcdir)/vectors.c
 
 ##DOSBUILDTOP = ..\..
@@ -55,6 +56,7 @@ STLIBOBJS=\
 	make_random_key.o	\
 	nfold.o			\
 	old_api_glue.o		\
+	pbkdf2.o		\
 	prng.o			\
 	state.o \
 	string_to_cksumtype.o	\
@@ -86,6 +88,7 @@ OBJS=\
 	$(OUTPRE)make_random_key.$(OBJEXT)	\
 	$(OUTPRE)nfold.$(OBJEXT)		\
 	$(OUTPRE)old_api_glue.$(OBJEXT)		\
+	$(OUTPRE)pbkdf2.$(OBJEXT)		\
 	$(OUTPRE)prng.$(OBJEXT)			\
 	$(OUTPRE)state.$(OBJEXT) \
 	$(OUTPRE)string_to_cksumtype.$(OBJEXT)	\
@@ -117,6 +120,7 @@ SRCS=\
 	$(srcdir)/make_random_key.c	\
 	$(srcdir)/nfold.c		\
 	$(srcdir)/old_api_glue.c	\
+	$(srcdir)/pbkdf2.c	\
 	$(srcdir)/prng.c		\
 	$(srcdir)/state.c \
 	$(srcdir)/string_to_cksumtype.c	\
@@ -135,11 +139,13 @@ RELDIR=crypto
 STOBJLISTS=crc32/OBJS.ST des/OBJS.ST dk/OBJS.ST enc_provider/OBJS.ST \
 	hash_provider/OBJS.ST keyhash_provider/OBJS.ST md4/OBJS.ST \
 	md5/OBJS.ST old/OBJS.ST raw/OBJS.ST sha1/OBJS.ST arcfour/OBJS.ST \
+	aes/OBJS.ST \
 	yarrow/OBJS.ST \
 	OBJS.ST
 SUBDIROBJLISTS=crc32/OBJS.ST des/OBJS.ST dk/OBJS.ST enc_provider/OBJS.ST \
 	hash_provider/OBJS.ST keyhash_provider/OBJS.ST md4/OBJS.ST \
 	md5/OBJS.ST old/OBJS.ST raw/OBJS.ST sha1/OBJS.ST arcfour/OBJS.ST \
+	aes/OBJS.ST \
 	yarrow/OBJS.ST
 
 # No dependencies.  Record places to find this shared object if the target
@@ -180,13 +186,16 @@ t_prng$(EXEEXT): t_prng.$(OBJEXT)
 t_hmac$(EXEEXT): t_hmac.$(OBJEXT) $(CRYPTO_DEPLIB)
 	$(CC_LINK) -o $@ t_hmac.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB)
 
-t_pkcs5$(EXEEXT): t_pkcs5.$(OBJEXT) pbkdf2.$(OBJEXT) $(CRYPTO_DEPLIB)
-	$(CC_LINK) -o $@ t_pkcs5.$(OBJEXT) pbkdf2.$(OBJEXT) \
-		$(K5CRYPTO_LIB) $(COM_ERR_LIB)
+t_pkcs5$(EXEEXT): t_pkcs5.$(OBJEXT) $(CRYPTO_DEPLIB)
+	$(CC_LINK) -o $@ t_pkcs5.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB)
 
 vectors$(EXEEXT): vectors.$(OBJEXT) $(CRYPTO_DEPLIB)
 	$(CC_LINK) -o $@ vectors.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB)
 
+t_cts$(EXEEXT): t_cts.$(OBJEXT) $(CRYPTO_DEPLIB)
+	$(CC_LINK) -o $@ t_cts.$(OBJEXT) \
+		$(K5CRYPTO_LIB) $(COM_ERR_LIB)
+
 
 clean::
 	$(RM) t_nfold.o t_nfold t_encrypt t_encrypt.o t_prng.o t_prng \