Crypto modularity proj: Move enc_provider into builtin dir. Adjust builtin make syste...

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

diff --git a/src/Makefile.in b/src/Makefile.in
index bd67ad677c58adbb9d4553673e5be131ab2206d7..d74e9e535c14eb387f5821a4dbfcf6cc1edd2f44 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -195,7 +195,7 @@ WINMAKEFILES=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\krb\enc_provider\Makefile \
+       lib\crypto\krb\dk\Makefile lib\crypto\builtin\enc_provider\Makefile \
        lib\crypto\krb\hash_provider\Makefile \
        lib\crypto\krb\keyhash_provider\Makefile \
        lib\crypto\krb\raw\Makefile lib\crypto\old\Makefile \
@@ -268,7 +268,7 @@ WINMAKEFILES=Makefile \
 ##DOS##        $(WCONFIG) config < $@.in > $@
 ##DOS##lib\crypto\krb\dk\Makefile: lib\crypto\krb\dk\Makefile.in $(MKFDEP)
 ##DOS##        $(WCONFIG) config < $@.in > $@
-##DOS##lib\crypto\krb\enc_provider\Makefile: lib\crypto\krb\enc_provider\Makefile.in $(MKFDEP)
+##DOS##lib\crypto\builtin\enc_provider\Makefile: lib\crypto\builtin\enc_provider\Makefile.in $(MKFDEP)
 ##DOS##        $(WCONFIG) config < $@.in > $@
 ##DOS##lib\crypto\krb\hash_provider\Makefile: lib\crypto\krb\hash_provider\Makefile.in $(MKFDEP)
 ##DOS##        $(WCONFIG) config < $@.in > $@
@@ -395,7 +395,7 @@ FILES= ./* \
        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/krb/enc_provider/* lib/crypto/krb/hash_provider/* \
+       lib/crypto/builtin/enc_provider/* lib/crypto/krb/hash_provider/* \
        lib/crypto/krb/keyhash_provider/* lib/crypto/krb/old/* lib/crypto/krb/raw/* \
        lib/crypto/builtin/sha1/* lib/crypto/builtin/arcfour/* lib/crypto/builtin/md4/* \
        lib/crypto/builtin/md5/* lib/crypto/krb/yarrow/* \

diff --git a/src/configure.in b/src/configure.in
index 368d1795e4b66113cf2e1c801c65c5b3bb915d7b..8777e20def46532f2c192835a2a8f5f67b59e2a7 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -1060,7 +1060,7 @@ V5_AC_OUTPUT_MAKEFILE(.
        lib lib/kdb
 
        lib/crypto lib/crypto/krb lib/crypto/krb/crc32 lib/crypto/builtin/des
-       lib/crypto/krb/dk lib/crypto/krb/enc_provider
+       lib/crypto/krb/dk lib/crypto/builtin/enc_provider
        lib/crypto/krb/hash_provider lib/crypto/krb/keyhash_provider
        lib/crypto/builtin lib/crypto/builtin/md4 lib/crypto/builtin/md5
        lib/crypto/krb/old lib/crypto/krb/raw lib/crypto/builtin/sha1

diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index b68ef554fd98a6db9892cc6462b9ac5d89b246c3..a6203b2fb17ff4bbe90a0234379943dd8284b7ab 100644 (file)
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=../..
 myfulldir=lib/crypto
 mydir=lib/crypto
 BUILDTOP=$(REL)..$(S)..
-SUBDIRS=krb builtin crypto_tests
+SUBDIRS= builtin krb crypto_tests
 
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
@@ -20,19 +20,19 @@ LIBINITFUNC=cryptoint_initialize_library
 LIBFINIFUNC=cryptoint_cleanup_library
 RELDIR=crypto
 
-STOBJLISTS=krb/crc32/OBJS.ST krb/dk/OBJS.ST krb/enc_provider/OBJS.ST           \
-        krb/hash_provider/OBJS.ST krb/keyhash_provider/OBJS.ST                 \
-        krb/old/OBJS.ST krb/raw/OBJS.ST krb/yarrow/OBJS.ST                     \
-        @CRYPTO_IMPL@/md4/OBJS.ST @CRYPTO_IMPL@/md5/OBJS.ST @CRYPTO_IMPL@/sha1/OBJS.ST                 \
-       @CRYPTO_IMPL@/arcfour/OBJS.ST  @CRYPTO_IMPL@/aes/OBJS.ST @CRYPTO_IMPL@/des/OBJS.ST      \
-        krb/OBJS.ST  @CRYPTO_IMPL@/OBJS.ST
+STOBJLISTS=krb/crc32/OBJS.ST krb/dk/OBJS.ST builtin/enc_provider/OBJS.ST       \
+       krb/hash_provider/OBJS.ST krb/keyhash_provider/OBJS.ST                  \
+       krb/old/OBJS.ST krb/raw/OBJS.ST krb/yarrow/OBJS.ST                      \
+       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
 
-SUBDIROBJLISTS=krb/crc32/OBJS.ST krb/dk/OBJS.ST krb/enc_provider/OBJS.ST       \
-        krb/hash_provider/OBJS.ST krb/keyhash_provider/OBJS.ST                         \
+SUBDIROBJLISTS=krb/crc32/OBJS.ST krb/dk/OBJS.ST builtin/enc_provider/OBJS.ST   \
+       krb/hash_provider/OBJS.ST krb/keyhash_provider/OBJS.ST                  \
        krb/old/OBJS.ST krb/raw/OBJS.ST  krb/yarrow/OBJS.ST                     \
-       @CRYPTO_IMPL@/md4/OBJS.ST @CRYPTO_IMPL@/md5/OBJS.ST     @CRYPTO_IMPL@/sha1/OBJS.ST              \
-       @CRYPTO_IMPL@/arcfour/OBJS.ST @CRYPTO_IMPL@/aes/OBJS.ST @CRYPTO_IMPL@/des/OBJS.ST               \
-        krb/OBJS.ST  @CRYPTO_IMPL@/OBJS.ST
+       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
 
 # No dependencies.  Record places to find this shared object if the target
 # link editor and loader support it.

diff --git a/src/lib/crypto/builtin/Makefile.in b/src/lib/crypto/builtin/Makefile.in
index 03ca5e966501ce0715f8f87a62c761be369ba5ce..c1d8a554be51404ffde84ad5b40117d209a00060 100644 (file)
--- a/src/lib/crypto/builtin/Makefile.in
+++ b/src/lib/crypto/builtin/Makefile.in
@@ -2,15 +2,16 @@ thisconfigdir=../../..
 myfulldir=lib/crypto/builtin
 mydir=lib/crypto/builtin
 BUILDTOP=$(REL)..$(S)..$(S)..
-SUBDIRS=../@CRYPTO_IMPL@/des ../@CRYPTO_IMPL@/arcfour ../@CRYPTO_IMPL@/aes     \
-       ../@CRYPTO_IMPL@/md4 ../@CRYPTO_IMPL@/md5  ../@CRYPTO_IMPL@/sha1 
-LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir)/../krb/hash_provider    \
+SUBDIRS=des arcfour aes         md4 md5  sha1 enc_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@/md5        \
+               -I$(srcdir)/../@CRYPTO_IMPL@/enc_provider       
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 DEFS=
@@ -23,8 +24,8 @@ DEFS=
 ##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)arcfour.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst $(OUTPRE)aes.lst
 
 STLIBOBJS=\
-       hmac.o  \
-       pbkdf2.o                
+       ../@CRYPTO_IMPL@/hmac.o \
+       ../@CRYPTO_IMPL@/pbkdf2.o               
 
 OBJS=\
        $(OUTPRE)../@CRYPTO_IMPL@/hmac.$(OBJEXT)        \
@@ -34,16 +35,18 @@ SRCS=\
        $(srcdir)/../@CRYPTO_IMPL@/hmac.c       \
        $(srcdir)/../@CRYPTO_IMPL@/pbkdf2.c     
 
-STOBJLISTS= ../@CRYPTO_IMPL@/des/OBJS.ST ../@CRYPTO_IMPL@/md4/OBJS.ST  \
-       ../@CRYPTO_IMPL@/md5/OBJS.ST ../@CRYPTO_IMPL@/sha1/OBJS.ST      \
-       ../@CRYPTO_IMPL@/arcfour/OBJS.ST        \
-       ../@CRYPTO_IMPL@/aes/OBJS.ST            \
-       ../@CRYPTO_IMPL@/OBJS.ST
+STOBJLISTS= des/OBJS.ST md4/OBJS.ST    \
+       md5/OBJS.ST sha1/OBJS.ST        \
+       enc_provider/OBJS.ST            \
+       arcfour/OBJS.ST                 \
+       aes/OBJS.ST                     \
+       OBJS.ST
 
-SUBDIROBJLISTS= ../@CRYPTO_IMPL@/des/OBJS.ST ../@CRYPTO_IMPL@/md4/OBJS.ST      \
-               ../@CRYPTO_IMPL@/md5/OBJS.ST ../@CRYPTO_IMPL@/sha1/OBJS.ST      \
-               ../@CRYPTO_IMPL@/arcfour/OBJS.ST                                \
-               ../@CRYPTO_IMPL@/aes/OBJS.ST ../@CRYPTO_IMPL@/OBJS.ST
+SUBDIROBJLISTS= des/OBJS.ST md4/OBJS.ST        \
+               md5/OBJS.ST sha1/OBJS.ST        \
+               enc_provider/OBJS.ST            \
+               arcfour/OBJS.ST                 \
+               aes/OBJS.ST OBJS.ST
 
 ##DOS##LIBOBJS = $(OBJS)
 
@@ -67,6 +70,9 @@ all-windows::
        cd ..\sha1
        @echo Making in crypto\sha1
        $(MAKE) -$(MFLAGS)
+       cd ..\enc_provider
+       @echo Making in crypto\enc_provider
+       $(MAKE) -$(MFLAGS)
        cd ..\arcfour
        @echo Making in crypto\arcfour
        $(MAKE) -$(MFLAGS)
@@ -88,6 +94,9 @@ clean-windows::
        cd ..\sha1
        @echo Making clean in crypto\sha1
        $(MAKE) -$(MFLAGS) clean
+       cd ..\enc_provider
+       @echo Making clean in crypto\enc_provider
+       $(MAKE) -$(MFLAGS) clean
        cd ..\arcfour
        @echo Making clean in crypto\arcfour
        $(MAKE) -$(MFLAGS) clean
@@ -109,6 +118,9 @@ check-windows::
        cd ..\sha1
        @echo Making check in crypto\sha1
        $(MAKE) -$(MFLAGS) check
+       cd ..\enc_provider
+       @echo Making check in crypto\enc_provider
+       $(MAKE) -$(MFLAGS) check
        cd ..\arcfour
        @echo Making check in crypto\arcfour
        $(MAKE) -$(MFLAGS) check

diff --git a/src/lib/crypto/builtin/aes/Makefile.in b/src/lib/crypto/builtin/aes/Makefile.in
index ed36f7e6131e3c6404fbc5d28a3c26dcd57d57b8..49bc6a9c23b065448237734cbd22e0d09746f068 100644 (file)
--- a/src/lib/crypto/builtin/aes/Makefile.in
+++ b/src/lib/crypto/builtin/aes/Makefile.in
@@ -12,28 +12,30 @@ DEFS=
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
+CIMPL = @CRYPTO_IMPL@/aes
+
 STLIBOBJS=\
-       aescrypt.o      \
-       aestab.o        \
-       aeskey.o        \
-       aes_s2k.o
+       ../../$(CIMPL)/aescrypt.o       \
+       ../../$(CIMPL)/aestab.o \
+       ../../$(CIMPL)/aeskey.o \
+       ../../$(CIMPL)/aes_s2k.o
 
 OBJS=\
-       $(OUTPRE)aescrypt.$(OBJEXT)     \
-       $(OUTPRE)aestab.$(OBJEXT)       \
-       $(OUTPRE)aeskey.$(OBJEXT)       \
-       $(OUTPRE)aes_s2k.$(OBJEXT)
+       $(OUTPRE)../../$(CIMPL)/aescrypt.$(OBJEXT)      \
+       $(OUTPRE)../../$(CIMPL)/aestab.$(OBJEXT)        \
+       $(OUTPRE)../../$(CIMPL)/aeskey.$(OBJEXT)        \
+       $(OUTPRE)../../$(CIMPL)/aes_s2k.$(OBJEXT)
 
 SRCS=\
-       $(srcdir)/aescrypt.c    \
-       $(srcdir)/aestab.c      \
-       $(srcdir)/aeskey.c      \
-       $(srcdir)/aes_s2k.c
+       $(srcdir)..//../$(CIMPL)/aescrypt.c     \
+       $(srcdir)..//../$(CIMPL)/aestab.c       \
+       $(srcdir)/../../$(CIMPL)/aeskey.c       \
+       $(srcdir)/../../$(CIMPL)/aes_s2k.c
 
 GEN_OBJS=\
-       $(OUTPRE)aescrypt.$(OBJEXT)     \
-       $(OUTPRE)aestab.$(OBJEXT)       \
-       $(OUTPRE)aeskey.$(OBJEXT)
+       $(OUTPRE)../../$(CIMPL)/aescrypt.$(OBJEXT)      \
+       $(OUTPRE)../../$(CIMPL)/aestab.$(OBJEXT)        \
+       $(OUTPRE)../../$(CIMPL)/aeskey.$(OBJEXT)
 
 ##DOS##LIBOBJS = $(OBJS)
 

diff --git a/src/lib/crypto/builtin/des/Makefile.in b/src/lib/crypto/builtin/des/Makefile.in
index a609c42991687bdd599b4f188b0699f252a79d11..47e9b1a6149f178f51f556dd445f840fa77546a8 100644 (file)
--- a/src/lib/crypto/builtin/des/Makefile.in
+++ b/src/lib/crypto/builtin/des/Makefile.in
@@ -12,51 +12,53 @@ DEFS=
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
+CIMPL = @CRYPTO_IMPL@/des
+
 STLIBOBJS=\
-       afsstring2key.o \
-       d3_cbc.o        \
-       d3_aead.o       \
-       d3_kysched.o    \
-       des_prf.o       \
-       f_aead.o        \
-       f_cbc.o         \
-       f_cksum.o       \
-       f_parity.o      \
-       f_sched.o       \
-       f_tables.o      \
-       key_sched.o     \
-       string2key.o    \
-       weak_key.o
+       ../../$(CIMPL)/afsstring2key.o  \
+       ../../$(CIMPL)/d3_cbc.o \
+       ../../$(CIMPL)/d3_aead.o        \
+       ../../$(CIMPL)/d3_kysched.o     \
+       ../../$(CIMPL)/des_prf.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
 
-OBJS=  $(OUTPRE)afsstring2key.$(OBJEXT)        \
-       $(OUTPRE)d3_cbc.$(OBJEXT)       \
-       $(OUTPRE)d3_aead.$(OBJEXT)      \
-       $(OUTPRE)d3_kysched.$(OBJEXT)   \
-       $(OUTPRE)des_prf.$(OBJEXT)      \
-       $(OUTPRE)f_aead.$(OBJEXT)       \
-       $(OUTPRE)f_cbc.$(OBJEXT)        \
-       $(OUTPRE)f_cksum.$(OBJEXT)      \
-       $(OUTPRE)f_parity.$(OBJEXT)     \
-       $(OUTPRE)f_sched.$(OBJEXT)      \
-       $(OUTPRE)f_tables.$(OBJEXT)     \
-       $(OUTPRE)key_sched.$(OBJEXT)    \
-       $(OUTPRE)string2key.$(OBJEXT)   \
-       $(OUTPRE)weak_key.$(OBJEXT)
+OBJS=  $(OUTPRE)../../$(CIMPL)/afsstring2key.$(OBJEXT) \
+       $(OUTPRE)../../$(CIMPL)/d3_cbc.$(OBJEXT)        \
+       $(OUTPRE)../../$(CIMPL)/d3_aead.$(OBJEXT)       \
+       $(OUTPRE)../../$(CIMPL)/d3_kysched.$(OBJEXT)    \
+       $(OUTPRE)../../$(CIMPL)/des_prf.$(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)
 
-SRCS=  $(srcdir)/afsstring2key.c       \
-       $(srcdir)/d3_cbc.c      \
-       $(srcdir)/d3_aead.c     \
-       $(srcdir)/d3_kysched.c  \
-       $(srcdir)/des_prf.c     \
-       $(srcdir)/f_aead.c      \
-       $(srcdir)/f_cbc.c       \
-       $(srcdir)/f_cksum.c     \
-       $(srcdir)/f_parity.c    \
-       $(srcdir)/f_sched.c     \
-       $(srcdir)/f_tables.c    \
-       $(srcdir)/key_sched.c   \
-       $(srcdir)/weak_key.c    \
-       $(srcdir)/string2key.c
+SRCS=  $(srcdir)/../../$(CIMPL)/afsstring2key.c        \
+       $(srcdir)/../../$(CIMPL)/d3_cbc.c       \
+       $(srcdir)/../../$(CIMPL)/d3_aead.c      \
+       $(srcdir)/../../$(CIMPL)/d3_kysched.c   \
+       $(srcdir)/../../$(CIMPL)/des_prf.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
 
 ##DOS##LIBOBJS = $(OBJS)
 

diff --git a/src/lib/crypto/builtin/enc_provider/Makefile.in b/src/lib/crypto/builtin/enc_provider/Makefile.in
new file mode 100644 (file)
index 0000000..1895b51
--- /dev/null
+++ b/src/lib/crypto/builtin/enc_provider/Makefile.in
@@ -0,0 +1,48 @@
+thisconfigdir=../../../..
+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     \
+               -I$(srcdir)/../../krb   \
+               -I$(srcdir)/.. -I$(srcdir)/../../@CRYPTO_IMPL@ 
+DEFS=
+
+##DOS##BUILDTOP = ..\..\..\..
+##DOS##PREFIXDIR=enc_provider
+##DOS##OBJFILE=..\$(OUTPRE)enc_prov.lst
+
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
+
+STLIBOBJS= \
+       ../../@CRYPTO_IMPL@/enc_provider/des.o  \
+       ../../@CRYPTO_IMPL@/enc_provider/des3.o         \
+       ../../@CRYPTO_IMPL@/enc_provider/rc4.o  \
+       ../../@CRYPTO_IMPL@/enc_provider/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)
+
+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
+
+##DOS##LIBOBJS = $(OBJS)
+
+all-unix:: all-libobjs
+
+includes:: depend
+
+depend:: $(SRCS)
+
+clean-unix:: clean-libobjs
+
+@libobj_frag@
+

diff --git a/src/lib/crypto/krb/enc_provider/aes.c b/src/lib/crypto/builtin/enc_provider/aes.c
similarity index 99%
rename from src/lib/crypto/krb/enc_provider/aes.c
rename to src/lib/crypto/builtin/enc_provider/aes.c
index 060d119c428a7282379dd9d6b045ceb75c3ce80c..88f2d9e350ef934054d2d83a46115a077fe2020d 100644 (file)
--- a/src/lib/crypto/krb/enc_provider/aes.c
+++ b/src/lib/crypto/builtin/enc_provider/aes.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include "enc_provider.h"
 #include "aes.h"
-#include "../aead.h"
+#include <aead.h>
 
 #if 0
 aes_rval aes_blk_len(unsigned int blen, aes_ctx cx[1]);

diff --git a/src/lib/crypto/krb/enc_provider/deps b/src/lib/crypto/builtin/enc_provider/deps
similarity index 83%
rename from src/lib/crypto/krb/enc_provider/deps
rename to src/lib/crypto/builtin/enc_provider/deps
index 0649762796d52adacd50f69f2f8dde8c45b34376..ed1b61cfc901915a4184500a375da0b7b9534635 100644 (file)
--- a/src/lib/crypto/krb/enc_provider/deps
+++ b/src/lib/crypto/builtin/enc_provider/deps
@@ -10,8 +10,8 @@ des.so des.po $(OUTPRE)des.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
   $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
   $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
-  $(srcdir)/../../builtin/des/des_int.h $(srcdir)/../aead.h \
-  $(srcdir)/../cksumtypes.h des.c enc_provider.h
+  $(srcdir)/../des/des_int.h $(srcdir)/../../krb/aead.h \
+  $(srcdir)/../../krb/cksumtypes.h des.c enc_provider.h
 des3.so des3.po $(OUTPRE)des3.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
   $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
@@ -21,8 +21,8 @@ des3.so des3.po $(OUTPRE)des3.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
   $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
   $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
-  $(srcdir)/../../builtin/des/des_int.h $(srcdir)/../aead.h \
-  $(srcdir)/../cksumtypes.h des3.c
+  $(srcdir)/../des/des_int.h $(srcdir)/../../krb/aead.h \
+  $(srcdir)/../../krb/cksumtypes.h des3.c
 aes.so aes.po $(OUTPRE)aes.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
   $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \
@@ -32,8 +32,8 @@ aes.so aes.po $(OUTPRE)aes.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
   $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
   $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
-  $(srcdir)/../../builtin/aes/aes.h $(srcdir)/../../builtin/aes/uitypes.h \
-  $(srcdir)/../aead.h $(srcdir)/../cksumtypes.h aes.c \
+  $(srcdir)/../aes/aes.h $(srcdir)/../aes/uitypes.h \
+  $(srcdir)/../../krb/aead.h $(srcdir)/../../krb/cksumtypes.h aes.c \
   enc_provider.h
 rc4.so rc4.po $(OUTPRE)rc4.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
@@ -44,6 +44,6 @@ rc4.so rc4.po $(OUTPRE)rc4.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
   $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
   $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
-  $(srcdir)/../../builtin/arcfour/arcfour-int.h $(srcdir)/../../builtin/arcfour/arcfour.h \
-  $(srcdir)/../aead.h $(srcdir)/../cksumtypes.h enc_provider.h \
+  $(srcdir)/../arcfour/arcfour-int.h $(srcdir)/../arcfour/arcfour.h \
+  $(srcdir)/../../krb/aead.h $(srcdir)/../../krb/cksumtypes.h enc_provider.h \
   rc4.c

diff --git a/src/lib/crypto/krb/enc_provider/des.c b/src/lib/crypto/builtin/enc_provider/des.c
similarity index 100%
rename from src/lib/crypto/krb/enc_provider/des.c
rename to src/lib/crypto/builtin/enc_provider/des.c

diff --git a/src/lib/crypto/krb/enc_provider/des3.c b/src/lib/crypto/builtin/enc_provider/des3.c
similarity index 99%
rename from src/lib/crypto/krb/enc_provider/des3.c
rename to src/lib/crypto/builtin/enc_provider/des3.c
index 412c994a71686ec97229673ee3cf45bc47240f83..dc7c63338cbde05c43ce1c858aa2c0920828b5ec 100644 (file)
--- a/src/lib/crypto/krb/enc_provider/des3.c
+++ b/src/lib/crypto/builtin/enc_provider/des3.c
@@ -26,7 +26,7 @@
 
 #include "k5-int.h"
 #include "des_int.h"
-#include "../aead.h"
+#include <aead.h>
 
 static krb5_error_code
 validate_and_schedule(const krb5_keyblock *key, const krb5_data *ivec,

diff --git a/src/lib/crypto/krb/enc_provider/enc_provider.h b/src/lib/crypto/builtin/enc_provider/enc_provider.h
similarity index 100%
rename from src/lib/crypto/krb/enc_provider/enc_provider.h
rename to src/lib/crypto/builtin/enc_provider/enc_provider.h

diff --git a/src/lib/crypto/krb/enc_provider/rc4.c b/src/lib/crypto/builtin/enc_provider/rc4.c
similarity index 99%
rename from src/lib/crypto/krb/enc_provider/rc4.c
rename to src/lib/crypto/builtin/enc_provider/rc4.c
index b950a605b8ed12e9adbde3aa074edfafde914d48..d1dbb6cc3fb3259959b6b4ac0f8daddba07b7bd2 100644 (file)
--- a/src/lib/crypto/krb/enc_provider/rc4.c
+++ b/src/lib/crypto/builtin/enc_provider/rc4.c
@@ -9,7 +9,7 @@
 #include "k5-int.h"
 #include "arcfour-int.h"
 #include "enc_provider.h"
-#include "../aead.h"
+#include <aead.h>
 /* gets the next byte from the PRNG */
 #if ((__GNUC__ >= 2) )
 static __inline__ unsigned int k5_arcfour_byte(ArcfourContext *);

diff --git a/src/lib/crypto/builtin/md4/Makefile.in b/src/lib/crypto/builtin/md4/Makefile.in
index 78dd0534b50f468c0906b561ad9708757020913c..480906bc6bb10d6f31c020041f17b031c475cbdd 100644 (file)
--- a/src/lib/crypto/builtin/md4/Makefile.in
+++ b/src/lib/crypto/builtin/md4/Makefile.in
@@ -12,11 +12,11 @@ DEFS=
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
-STLIBOBJS= md4.o
+STLIBOBJS= ../../@CRYPTO_IMPL@/md4/md4.o
 
-OBJS= $(OUTPRE)md4.$(OBJEXT) 
+OBJS= $(OUTPRE)../../@CRYPTO_IMPL@/md4/md4.$(OBJEXT) 
 
-SRCS= $(srcdir)/md4.c
+SRCS= $(srcdir)/../../@CRYPTO_IMPL@/md4/md4.c
 
 ##DOS##LIBOBJS = $(OBJS)
 

diff --git a/src/lib/crypto/builtin/md5/Makefile.in b/src/lib/crypto/builtin/md5/Makefile.in
index 6da43749d472bf13c907c87aaa1316530b8a633f..929291906587b537355f7e381ef7c6accb412e58 100644 (file)
--- a/src/lib/crypto/builtin/md5/Makefile.in
+++ b/src/lib/crypto/builtin/md5/Makefile.in
@@ -11,11 +11,11 @@ DEFS=
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
-STLIBOBJS= md5.o
+STLIBOBJS= ../../@CRYPTO_IMPL@/md5/md5.o
 
-OBJS= $(OUTPRE)md5.$(OBJEXT) 
+OBJS= $(OUTPRE)../../@CRYPTO_IMPL@/md5/md5.$(OBJEXT) 
 
-SRCS= $(srcdir)/md5.c
+SRCS= $(srcdir)/../../@CRYPTO_IMPL@/md5/md5.c
 
 ##DOS##LIBOBJS = $(OBJS)
 

diff --git a/src/lib/crypto/builtin/sha1/Makefile.in b/src/lib/crypto/builtin/sha1/Makefile.in
index 81776f57bc399524b99dde4ca919a84bbffc6740..7610881881f40acfa05d2ccac335f425191d6163 100644 (file)
--- a/src/lib/crypto/builtin/sha1/Makefile.in
+++ b/src/lib/crypto/builtin/sha1/Makefile.in
@@ -11,11 +11,11 @@ DEFS=
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
-STLIBOBJS= shs.o
+STLIBOBJS= ../../@CRYPTO_IMPL@/sha1/shs.o
 
-OBJS= $(OUTPRE)shs.$(OBJEXT) 
+OBJS= $(OUTPRE)../../@CRYPTO_IMPL@/sha1/shs.$(OBJEXT) 
 
-SRCS= $(srcdir)/shs.c
+SRCS= $(srcdir)/../../@CRYPTO_IMPL@/sha1/shs.c
 
 ##DOS##LIBOBJS = $(OBJS)
 

diff --git a/src/lib/crypto/krb/Makefile.in b/src/lib/crypto/krb/Makefile.in
index 887fa160f0add6370a6db813fb9225a8374fc613..636d2c6cddd73aaa1da3400ffc12cf220455a21e 100644 (file)
--- a/src/lib/crypto/krb/Makefile.in
+++ b/src/lib/crypto/krb/Makefile.in
@@ -2,11 +2,11 @@ thisconfigdir=../../..
 myfulldir=lib/crypto/krb
 mydir=lib/crypto/krb
 BUILDTOP=$(REL)..$(S)..$(S)..
-SUBDIRS= crc32 dk enc_provider hash_provider keyhash_provider \
+SUBDIRS= crc32 dk hash_provider keyhash_provider \
         old raw yarrow 
-LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/enc_provider -I$(srcdir)/dk    \
-               -I$(srcdir)/hash_provider -I$(srcdir)/keyhash_provider  \
-               -I$(srcdir)/old -I$(srcdir)/raw -I$(srcdir)/yarrow      \
+LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../@CRYPTO_IMPL@/enc_provider -I$(srcdir)/dk   \
+               -I$(srcdir)/hash_provider -I$(srcdir)/keyhash_provider                  \
+               -I$(srcdir)/old -I$(srcdir)/raw -I$(srcdir)/yarrow                      \
                -I$(srcdir)/../@CRYPTO_IMPL@/ -I$(srcdir)/../@CRYPTO_IMPL@/des          \
                -I$(srcdir)/../@CRYPTO_IMPL@/aes -I$(srcdir)/../@CRYPTO_IMPL@/arcfour   \
                -I$(srcdir)/../@CRYPTO_IMPL@/sha1
@@ -149,11 +149,11 @@ SRCS=\
        $(srcdir)/verify_checksum.c     \
        $(srcdir)/verify_checksum_iov.c
 
-STOBJLISTS=crc32/OBJS.ST  dk/OBJS.ST enc_provider/OBJS.ST      \
+STOBJLISTS=crc32/OBJS.ST  dk/OBJS.ST                           \
        hash_provider/OBJS.ST keyhash_provider/OBJS.ST          \
        old/OBJS.ST raw/OBJS.ST  yarrow/OBJS.ST  OBJS.ST
 
-SUBDIROBJLISTS=crc32/OBJS.ST  dk/OBJS.ST enc_provider/OBJS.ST  \
+SUBDIROBJLISTS=crc32/OBJS.ST  dk/OBJS.ST                       \
        hash_provider/OBJS.ST keyhash_provider/OBJS.ST          \
        old/OBJS.ST raw/OBJS.ST  yarrow/OBJS.ST OBJS.ST 
 
@@ -173,9 +173,6 @@ all-windows::
        cd ..\dk
        @echo Making in crypto\dk
        $(MAKE) -$(MFLAGS)
-       cd ..\enc_provider
-       @echo Making in crypto\enc_provider
-       $(MAKE) -$(MFLAGS)
        cd ..\hash_provider
        @echo Making in crypto\hash_provider
        $(MAKE) -$(MFLAGS)
@@ -200,9 +197,6 @@ clean-windows::
        cd ..\dk
        @echo Making clean in crypto\dk
        $(MAKE) -$(MFLAGS) clean
-       cd ..\enc_provider
-       @echo Making clean in crypto\enc_provider
-       $(MAKE) -$(MFLAGS) clean
        cd ..\hash_provider
        @echo Making clean in crypto\hash_provider
        $(MAKE) -$(MFLAGS) clean
@@ -227,9 +221,6 @@ check-windows::
        cd ..\dk
        @echo Making check in crypto\dk
        $(MAKE) -$(MFLAGS) check
-       cd ..\enc_provider
-       @echo Making check in crypto\enc_provider
-       $(MAKE) -$(MFLAGS) check
        cd ..\hash_provider
        @echo Making check in crypto\hash_provider
        $(MAKE) -$(MFLAGS) check

diff --git a/src/lib/crypto/krb/deps b/src/lib/crypto/krb/deps
index fa65836789cab2f898da8e67e52fe78c93afca4e..a84ee03cbb5b73c3b4bbcddaa855e30e1c942bd0 100644 (file)
--- a/src/lib/crypto/krb/deps
+++ b/src/lib/crypto/krb/deps
@@ -192,7 +192,7 @@ etypes.so etypes.po $(OUTPRE)etypes.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
   $(srcdir)/../builtin/aes/aes_s2k.h $(srcdir)/../builtin/arcfour/arcfour.h \
   $(srcdir)/../builtin/des/des_int.h $(srcdir)/dk/dk.h \
-  $(srcdir)/enc_provider/enc_provider.h $(srcdir)/hash_provider/hash_provider.h \
+  $(srcdir)/../builtin/../builtin/enc_provider/enc_provider.h $(srcdir)/hash_provider/hash_provider.h \
   $(srcdir)/old/old.h $(srcdir)/raw/raw.h etypes.c etypes.h
 keyblocks.so keyblocks.po $(OUTPRE)keyblocks.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
@@ -326,7 +326,7 @@ prng.so prng.po $(OUTPRE)prng.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
   $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
   $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
-  $(srcdir)/../builtin/sha1/shs.h $(srcdir)/enc_provider/enc_provider.h \
+  $(srcdir)/../builtin/sha1/shs.h $(srcdir)/../builtin/enc_provider/enc_provider.h \
   $(srcdir)/yarrow/yarrow.h $(srcdir)/yarrow/ycipher.h \
   $(srcdir)/yarrow/yhash.h $(srcdir)/yarrow/ytypes.h \
   prng.c

diff --git a/src/lib/crypto/krb/enc_provider/Makefile.in b/src/lib/crypto/krb/enc_provider/Makefile.in
deleted file mode 100644 (file)
index 2eedf1d..0000000
--- a/src/lib/crypto/krb/enc_provider/Makefile.in
+++ /dev/null
@@ -1,41 +0,0 @@
-thisconfigdir=../../../..
-myfulldir=lib/crypto/krb/enc_provider
-mydir=lib/crypto/krb/enc_provider
-BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/../../@CRYPTO_IMPL@/des -I$(srcdir)/../../@CRYPTO_IMPL@/arcfour    \
-               -I$(srcdir)/../../@CRYPTO_IMPL@/aes -I$(srcdir)/.. -I$(srcdir)/../../@CRYPTO_IMPL@ 
-DEFS=
-
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=enc_provider
-##DOS##OBJFILE=..\$(OUTPRE)enc_prov.lst
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-STLIBOBJS= des.o des3.o rc4.o aes.o 
-
-OBJS= \
-       $(OUTPRE)des.$(OBJEXT) \
-       $(OUTPRE)des3.$(OBJEXT) \
-       $(OUTPRE)aes.$(OBJEXT) \
-       $(OUTPRE)rc4.$(OBJEXT)
-
-SRCS= \
-       $(srcdir)/des.c \
-       $(srcdir)/des3.c \
-       $(srcdir)/aes.c \
-       $(srcdir)/rc4.c
-
-##DOS##LIBOBJS = $(OBJS)
-
-all-unix:: all-libobjs
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
-@libobj_frag@
-

diff --git a/src/lib/crypto/krb/yarrow/Makefile.in b/src/lib/crypto/krb/yarrow/Makefile.in
index d7f01e4692f6c14b76a953ba251fd35cd5f2b81e..b246c6cc05e9b85cb40de4b31178393bf3f64577 100644 (file)
--- a/src/lib/crypto/krb/yarrow/Makefile.in
+++ b/src/lib/crypto/krb/yarrow/Makefile.in
@@ -2,7 +2,7 @@ thisconfigdir=../../../..
 myfulldir=lib/crypto/krb/yarrow
 mydir=lib/crypto/krb/yarrow
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../@CRYPTO_IMPL@ -I$(srcdir)/../../@CRYPTO_IMPL@/sha1 -I$(srcdir)/../enc_provider
+LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../@CRYPTO_IMPL@ -I$(srcdir)/../../@CRYPTO_IMPL@/sha1 -I$(srcdir)/../../@CRYPTO_IMPL@/enc_provider
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..

diff --git a/src/lib/crypto/krb/yarrow/deps b/src/lib/crypto/krb/yarrow/deps
index 8d69431f6191d938f473f1715d15a1030b94a90d..ed10e313735357defa8d7aba45e7a05ff090bb6d 100644 (file)
--- a/src/lib/crypto/krb/yarrow/deps
+++ b/src/lib/crypto/krb/yarrow/deps
@@ -21,5 +21,5 @@ ycipher.so ycipher.po $(OUTPRE)ycipher.$(OBJEXT): $(BUILDTOP)/include/autoconf.h
   $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \
   $(SRCTOP)/include/krb5/locate_plugin.h $(SRCTOP)/include/krb5/preauth_plugin.h \
   $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \
-  $(srcdir)/../../builtin/sha1/shs.h $(srcdir)/../enc_provider/enc_provider.h \
+  $(srcdir)/../../builtin/sha1/shs.h $(srcdir)/../../builtin/enc_provider/enc_provider.h \
   yarrow.h ycipher.c ycipher.h yhash.h ytypes.h