Flatten lib/crypto/krb, as its seven subdirectories only contained a

author Greg Hudson <ghudson@mit.edu>

Sat, 5 Mar 2011 13:31:02 +0000 (13:31 +0000)

committer Greg Hudson <ghudson@mit.edu>

Sat, 5 Mar 2011 13:31:02 +0000 (13:31 +0000)
author Greg Hudson <ghudson@mit.edu>
Sat, 5 Mar 2011 13:31:02 +0000 (13:31 +0000)
committer Greg Hudson <ghudson@mit.edu>
Sat, 5 Mar 2011 13:31:02 +0000 (13:31 +0000)
diff --git a/src/configure.in b/src/configure.in

index a3052e92bbad6e7af37fca24f1a4035113c8ac98..8bb6a10e3e616899bbb622fb86573fc38f15dd22 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -1115,17 +1115,14 @@ V5_AC_OUTPUT_MAKEFILE(.
  
         lib lib/kdb
  
-       lib/crypto lib/crypto/krb lib/crypto/krb/crc32 lib/crypto/$CRYPTO_IMPL/des
-       lib/crypto/krb/dk lib/crypto/$CRYPTO_IMPL/enc_provider
-       lib/crypto/$CRYPTO_IMPL/hash_provider lib/crypto/krb/checksum
-       lib/crypto/krb/prf lib/crypto/$CRYPTO_IMPL
+       lib/crypto lib/crypto/krb lib/crypto/$CRYPTO_IMPL
+       lib/crypto/$CRYPTO_IMPL/enc_provider
+       lib/crypto/$CRYPTO_IMPL/hash_provider
+       lib/crypto/$CRYPTO_IMPL/des
         lib/crypto/$CRYPTO_IMPL/md4 lib/crypto/$CRYPTO_IMPL/md5
-       lib/crypto/krb/old lib/crypto/krb/raw
-        lib/crypto/$CRYPTO_IMPL/sha1
-        lib/crypto/$CRYPTO_IMPL/sha2
-       lib/crypto/krb/arcfour
-       lib/crypto/$CRYPTO_IMPL/aes
-       lib/crypto/$CRYPTO_IMPL/camellia lib/crypto/crypto_tests
+        lib/crypto/$CRYPTO_IMPL/sha1 lib/crypto/$CRYPTO_IMPL/sha2
+       lib/crypto/$CRYPTO_IMPL/aes lib/crypto/$CRYPTO_IMPL/camellia
+       lib/crypto/crypto_tests
  
         lib/krb5 lib/krb5/error_tables lib/krb5/asn.1 lib/krb5/ccache
  dnl    lib/krb5/ccache/ccapi
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in

index ed09cf617cd0347aedf91151e58fc8e7dcca8d78..4d4fe942f6b1a08ce09a6ecea97de684d50dcccc 100644 (file)
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -18,28 +18,18 @@ LIBINITFUNC=cryptoint_initialize_library
  LIBFINIFUNC=cryptoint_cleanup_library
  RELDIR=crypto
  
-STOBJLISTS=krb/crc32/OBJS.ST krb/dk/OBJS.ST                            \
-       $(CRYPTO_IMPL)/enc_provider/OBJS.ST                             \
+STOBJLISTS=$(CRYPTO_IMPL)/enc_provider/OBJS.ST                         \
         $(CRYPTO_IMPL)/hash_provider/OBJS.ST                            \
-       krb/checksum/OBJS.ST krb/prf/OBJS.ST                            \
-       krb/old/OBJS.ST krb/raw/OBJS.ST                                 \
         $(CRYPTO_IMPL)/md4/OBJS.ST $(CRYPTO_IMPL)/md5/OBJS.ST           \
-       $(CRYPTO_IMPL)/sha1/OBJS.ST                                     \
-       $(CRYPTO_IMPL)/sha2/OBJS.ST                                     \
-       krb/arcfour/OBJS.ST                                             \
+       $(CRYPTO_IMPL)/sha1/OBJS.ST $(CRYPTO_IMPL)/sha2/OBJS.ST         \
         $(CRYPTO_IMPL)/aes/OBJS.ST $(CRYPTO_IMPL)/des/OBJS.ST           \
         $(CRYPTO_IMPL)/camellia/OBJS.ST krb/OBJS.ST                     \
         $(CRYPTO_IMPL)/OBJS.ST
  
-SUBDIROBJLISTS=krb/crc32/OBJS.ST krb/dk/OBJS.ST                                \
-       $(CRYPTO_IMPL)/enc_provider/OBJS.ST                             \
+SUBDIROBJLISTS=$(CRYPTO_IMPL)/enc_provider/OBJS.ST                     \
         $(CRYPTO_IMPL)/hash_provider/OBJS.ST                            \
-       krb/checksum/OBJS.ST krb/prf/OBJS.ST                            \
-       krb/old/OBJS.ST krb/raw/OBJS.ST                                 \
         $(CRYPTO_IMPL)/md4/OBJS.ST $(CRYPTO_IMPL)/md5/OBJS.ST           \
-       $(CRYPTO_IMPL)/sha1/OBJS.ST                                     \
-       $(CRYPTO_IMPL)/sha2/OBJS.ST                                     \
-       krb/arcfour/OBJS.ST                                             \
+       $(CRYPTO_IMPL)/sha1/OBJS.ST $(CRYPTO_IMPL)/sha2/OBJS.ST         \
         $(CRYPTO_IMPL)/aes/OBJS.ST $(CRYPTO_IMPL)/des/OBJS.ST           \
         $(CRYPTO_IMPL)/camellia/OBJS.ST krb/OBJS.ST                     \
         $(CRYPTO_IMPL)/OBJS.ST
@@ -57,8 +47,8 @@ SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
  SHLIB_RDIRS=$(KRB5_LIBDIR)
  
  ##DOS##LIBNAME=$(OUTPRE)crypto.lib
-##DOS##OBJFILEDEP=$(OUTPRE)crc32.lst $(OUTPRE)prf.lst $(OUTPRE)checksum.lst $(OUTPRE)krb.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)arcfour.lst $(OUTPRE)dk.lst $(OUTPRE)aes.lst $(OUTPRE)enc_provider.lst $(OUTPRE)des.lst $(OUTPRE)md5.lst $(OUTPRE)camellia.lst $(OUTPRE)md4.lst $(OUTPRE)hash_provider.lst $(OUTPRE)sha2.lst $(OUTPRE)sha1.lst $(OUTPRE)builtin.lst
-##DOS##OBJFILELIST=@$(OUTPRE)crc32.lst @$(OUTPRE)prf.lst @$(OUTPRE)checksum.lst @$(OUTPRE)krb.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)arcfour.lst @$(OUTPRE)dk.lst @$(OUTPRE)aes.lst @$(OUTPRE)enc_provider.lst @$(OUTPRE)des.lst @$(OUTPRE)md5.lst @$(OUTPRE)camellia.lst @$(OUTPRE)md4.lst @$(OUTPRE)hash_provider.lst @$(OUTPRE)sha2.lst @$(OUTPRE)sha1.lst @$(OUTPRE)builtin.lst
+##DOS##OBJFILEDEP=$(OUTPRE)krb.lst $(OUTPRE)aes.lst $(OUTPRE)enc_provider.lst $(OUTPRE)des.lst $(OUTPRE)md5.lst $(OUTPRE)camellia.lst $(OUTPRE)md4.lst $(OUTPRE)hash_provider.lst $(OUTPRE)sha2.lst $(OUTPRE)sha1.lst $(OUTPRE)builtin.lst
+##DOS##OBJFILELIST=@$(OUTPRE)krb.lst @$(OUTPRE)aes.lst @$(OUTPRE)enc_provider.lst @$(OUTPRE)des.lst @$(OUTPRE)md5.lst @$(OUTPRE)camellia.lst @$(OUTPRE)md4.lst @$(OUTPRE)hash_provider.lst @$(OUTPRE)sha2.lst @$(OUTPRE)sha1.lst @$(OUTPRE)builtin.lst
  
  all-unix:: all-liblinks
  install-unix:: install-libs
diff --git a/src/lib/crypto/krb/crc32/CRC.pm b/src/lib/crypto/crypto_tests/CRC.pm

similarity index 100%

rename from src/lib/crypto/krb/crc32/CRC.pm

rename to src/lib/crypto/crypto_tests/CRC.pm
diff --git a/src/lib/crypto/krb/crc32/Poly.pm b/src/lib/crypto/crypto_tests/Poly.pm

similarity index 100%

rename from src/lib/crypto/krb/crc32/Poly.pm

rename to src/lib/crypto/crypto_tests/Poly.pm
diff --git a/src/lib/crypto/krb/crc32/crc.pl b/src/lib/crypto/crypto_tests/crc.pl

similarity index 100%

rename from src/lib/crypto/krb/crc32/crc.pl

rename to src/lib/crypto/crypto_tests/crc.pl
diff --git a/src/lib/crypto/krb/Makefile.in b/src/lib/crypto/krb/Makefile.in

index 838f128f9e25ba72dffb9cc6057fed86d8568246..d1c4605ea5d34ded1a516157cd242fdc86d15b43 100644 (file)
--- a/src/lib/crypto/krb/Makefile.in
+++ b/src/lib/crypto/krb/Makefile.in
@@ -1,6 +1,5 @@
  mydir=lib$(S)crypto$(S)krb
  BUILDTOP=$(REL)..$(S)..$(S)..
-SUBDIRS= arcfour checksum crc32 dk prf old raw 
  LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../$(CRYPTO_IMPL)
  RUN_SETUP = @KRB5_RUN_ENV@
  PROG_LIBPATH=-L$(TOPLIBD)
@@ -18,20 +17,34 @@ STLIBOBJS=\
         aead.o                  \
         block_size.o            \
         cf2.o                   \
+       checksum_cbc.o          \
+       checksum_confounder.o   \
+       checksum_dk_cmac.o      \
+       checksum_dk_hmac.o      \
+       checksum_hmac_md5.o     \
+       checksum_unkeyed.o      \
         checksum_length.o       \
         cksumtype_to_string.o   \
         cksumtypes.o            \
+       cmac.o                  \
         coll_proof_cksum.o      \
         combine_keys.o          \
+       crc32.o                 \
         crypto_length.o         \
         crypto_libinit.o        \
         default_state.o         \
         decrypt.o               \
         decrypt_iov.o           \
+       derive.o                \
         encrypt.o               \
         encrypt_iov.o           \
         encrypt_length.o        \
         enctype_util.o          \
+       enc_dk_cmac.o           \
+       enc_dk_hmac.o           \
+       enc_old.o               \
+       enc_raw.o               \
+       enc_rc4.o               \
         etypes.o                \
         key.o                   \
         keyblocks.o             \
@@ -45,9 +58,16 @@ STLIBOBJS=\
         nfold.o                 \
         old_api_glue.o          \
         prf.o                   \
+       prf_cmac.o              \
+       prf_des.o               \
+       prf_dk.o                \
+       prf_rc4.o               \
         prng.o                  \
         prng_$(PRNG_ALG).o      \
         random_to_key.o         \
+       s2k_des.o               \
+       s2k_pbkdf2.o            \
+       s2k_rc4.o               \
         state.o                 \
         string_to_cksumtype.o   \
         string_to_key.o         \
@@ -64,6 +84,7 @@ OBJS=\
         $(OUTPRE)cksumtypes.$(OBJEXT)           \
         $(OUTPRE)coll_proof_cksum.$(OBJEXT)     \
         $(OUTPRE)combine_keys.$(OBJEXT)         \
+       $(OUTPRE)crc_32.$(OBJEXT)               \
         $(OUTPRE)crypto_length.$(OBJEXT)        \
         $(OUTPRE)crypto_libinit.$(OBJEXT)       \
         $(OUTPRE)default_state.$(OBJEXT)        \
@@ -72,7 +93,12 @@ OBJS=\
         $(OUTPRE)encrypt.$(OBJEXT)              \
         $(OUTPRE)encrypt_iov.$(OBJEXT)          \
         $(OUTPRE)encrypt_length.$(OBJEXT)       \
-       $(OUTPRE)enctype_util.$(OBJEXT) \
+       $(OUTPRE)enctype_util.$(OBJEXT)         \
+       $(OUTPRE)enc_dk_cmac.$(OBJEXT)          \
+       $(OUTPRE)enc_dk_hmac.$(OBJEXT)          \
+       $(OUTPRE)enc_old.$(OBJEXT)              \
+       $(OUTPRE)enc_raw.$(OBJEXT)              \
+       $(OUTPRE)enc_rc4.$(OBJEXT)              \
         $(OUTPRE)etypes.$(OBJEXT)               \
         $(OUTPRE)key.$(OBJEXT)                  \
         $(OUTPRE)keyblocks.$(OBJEXT)            \
@@ -85,10 +111,17 @@ OBJS=\
         $(OUTPRE)mandatory_sumtype.$(OBJEXT)    \
         $(OUTPRE)nfold.$(OBJEXT)                \
         $(OUTPRE)old_api_glue.$(OBJEXT)         \
-       $(OUTPRE)prf.$(OBJEXT)                  \
+       $(OUTPRE)prf.$(OBJEXT)                  \
+       $(OUTPRE)prf_cmac.$(OBJEXT)             \
+       $(OUTPRE)prf_des.$(OBJEXT)              \
+       $(OUTPRE)prf_dk.$(OBJEXT)               \
+       $(OUTPRE)prf_rc4.$(OBJEXT)              \
         $(OUTPRE)prng.$(OBJEXT)                 \
         $(OUTPRE)prng_$(PRNG_ALG).$(OBJEXT)     \
         $(OUTPRE)random_to_key.$(OBJEXT)        \
+       $(OUTPRE)s2k_des.$(OBJEXT)              \
+       $(OUTPRE)s2k_pbkdf2.$(OBJEXT)           \
+       $(OUTPRE)s2k_rc4.$(OBJEXT)              \
         $(OUTPRE)state.$(OBJEXT)                \
         $(OUTPRE)string_to_cksumtype.$(OBJEXT)  \
         $(OUTPRE)string_to_key.$(OBJEXT)        \
@@ -104,6 +137,7 @@ SRCS=\
         $(srcdir)/cksumtypes.c          \
         $(srcdir)/coll_proof_cksum.c    \
         $(srcdir)/combine_keys.c        \
+       $(srcdir)/crc32.c               \
         $(srcdir)/crypto_length.c       \
         $(srcdir)/crypto_libinit.c      \
         $(srcdir)/default_state.c       \
@@ -113,6 +147,11 @@ SRCS=\
         $(srcdir)/encrypt_iov.c         \
         $(srcdir)/encrypt_length.c      \
         $(srcdir)/enctype_util.c        \
+       $(srcdir)/enc_dk_cmac.c         \
+       $(srcdir)/enc_dk_hmac.c         \
+       $(srcdir)/enc_old.c             \
+       $(srcdir)/enc_raw.c             \
+       $(srcdir)/enc_rc4.c             \
         $(srcdir)/etypes.c              \
         $(srcdir)/key.c                 \
         $(srcdir)/keyblocks.c           \
@@ -125,11 +164,18 @@ SRCS=\
         $(srcdir)/mandatory_sumtype.c   \
         $(srcdir)/nfold.c               \
         $(srcdir)/old_api_glue.c        \
-       $(srcdir)/prf.c                 \
+       $(srcdir)/prf.c                 \
+       $(srcdir)/prf_cmac.c            \
+       $(srcdir)/prf_des.c             \
+       $(srcdir)/prf_dk.c              \
+       $(srcdir)/prf_rc4.c             \
         $(srcdir)/prng.c                \
         $(srcdir)/prng_$(PRNG_ALG).c    \
         $(srcdir)/cf2.c                 \
         $(srcdir)/random_to_key.c       \
+       $(srcdir)/s2k_des.c             \
+       $(srcdir)/s2k_pbkdf2.c          \
+       $(srcdir)/s2k_rc4.c             \
         $(srcdir)/state.c               \
         $(srcdir)/string_to_cksumtype.c \
         $(srcdir)/string_to_key.c       \
@@ -138,12 +184,6 @@ SRCS=\
         $(srcdir)/verify_checksum.c     \
         $(srcdir)/verify_checksum_iov.c
  
-STOBJLISTS=arcfour/OBJS.ST checksum/OBJS.ST crc32/OBJS.ST      \
-       dk/OBJS.ST prf/OBJS.ST old/OBJS.ST raw/OBJS.ST OBJS.ST
-
-SUBDIROBJLISTS=arcfour/OBJS.ST checksum/OBJS.ST crc32/OBJS.ST  \
-       dk/OBJS.ST prf/OBJS.ST old/OBJS.ST raw/OBJS.ST
-
  ##DOS##LIBOBJS = $(OBJS)
  
  all-unix:: all-libobjs
diff --git a/src/lib/crypto/krb/arcfour/Makefile.in b/src/lib/crypto/krb/arcfour/Makefile.in

deleted file mode 100644 (file)

index 6f217d6..0000000
--- a/src/lib/crypto/krb/arcfour/Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
-mydir=lib$(S)crypto$(S)krb$(S)arcfour
-BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../$(CRYPTO_IMPL)
-DEFS=
-
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR = krb\arcfour
-##DOS##OBJFILE = ..\..\$(OUTPRE)arcfour.lst
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-STLIBOBJS=\
-       arcfour.o       \
-       arcfour_s2k.o
-
-OBJS=\
-       $(OUTPRE)arcfour.$(OBJEXT)      \
-       $(OUTPRE)arcfour_s2k.$(OBJEXT)
-
-SRCS=\
-       $(srcdir)/arcfour.c     \
-       $(srcdir)/arcfour_s2k.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/arcfour/deps b/src/lib/crypto/krb/arcfour/deps

deleted file mode 100644 (file)

index b430d94..0000000
--- a/src/lib/crypto/krb/arcfour/deps
+++ /dev/null
@@ -1,30 +0,0 @@
-# 
-# Generated makefile dependencies follow.
-#
-arcfour.so arcfour.po $(OUTPRE)arcfour.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h \
-  $(srcdir)/../../builtin/aes/uitypes.h $(srcdir)/../../builtin/crypto_mod.h \
-  $(srcdir)/../../builtin/sha2/sha2.h $(srcdir)/../crypto_int.h \
-  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h arcfour.c
-arcfour_s2k.so arcfour_s2k.po $(OUTPRE)arcfour_s2k.$(OBJEXT): \
-  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
-  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h $(srcdir)/../../builtin/aes/uitypes.h \
-  $(srcdir)/../../builtin/crypto_mod.h $(srcdir)/../../builtin/sha2/sha2.h \
-  $(srcdir)/../crypto_int.h $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/k5-utf8.h $(top_srcdir)/include/krb5.h \
-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h arcfour_s2k.c
diff --git a/src/lib/crypto/krb/checksum/Makefile.in b/src/lib/crypto/krb/checksum/Makefile.in

deleted file mode 100644 (file)

index 9948f3e..0000000
--- a/src/lib/crypto/krb/checksum/Makefile.in
+++ /dev/null
@@ -1,34 +0,0 @@
-mydir=lib$(S)crypto$(S)krb$(S)checksum
-BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../$(CRYPTO_IMPL)
-DEFS=
-
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR = krb\checksum
-##DOS##OBJFILE = ..\..\$(OUTPRE)checksum.lst
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-STLIBOBJS= cbc.o cmac.o confounder.o hmac_md5.o unkeyed.o
-
-OBJS=  $(OUTPRE)cbc.$(OBJEXT) $(OUTPRE)cmac.$(OBJEXT) \
-       $(OUTPRE)confounder.$(OBJEXT) $(OUTPRE)hmac_md5.$(OBJEXT) \
-       $(OUTPRE)unkeyed.$(OBJEXT)
-
-SRCS=  $(srcdir)/cbc.c $(srcdir)/cmac.c \
-       $(srcdir)/confounder.c $(srcdir)/hmac_md5.c \
-       $(srcdir)/unkeyed.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/checksum/deps b/src/lib/crypto/krb/checksum/deps

deleted file mode 100644 (file)

index c755d25..0000000
--- a/src/lib/crypto/krb/checksum/deps
+++ /dev/null
@@ -1,70 +0,0 @@
-# 
-# Generated makefile dependencies follow.
-#
-cbc.so cbc.po $(OUTPRE)cbc.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h \
-  $(srcdir)/../../builtin/aes/uitypes.h $(srcdir)/../../builtin/crypto_mod.h \
-  $(srcdir)/../../builtin/sha2/sha2.h $(srcdir)/../crypto_int.h \
-  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h cbc.c
-cmac.so cmac.po $(OUTPRE)cmac.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h \
-  $(srcdir)/../../builtin/aes/uitypes.h $(srcdir)/../../builtin/crypto_mod.h \
-  $(srcdir)/../../builtin/sha2/sha2.h $(srcdir)/../crypto_int.h \
-  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h cmac.c
-confounder.so confounder.po $(OUTPRE)confounder.$(OBJEXT): \
-  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
-  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h $(srcdir)/../../builtin/aes/uitypes.h \
-  $(srcdir)/../../builtin/crypto_mod.h $(srcdir)/../../builtin/sha2/sha2.h \
-  $(srcdir)/../crypto_int.h $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
-  confounder.c
-hmac_md5.so hmac_md5.po $(OUTPRE)hmac_md5.$(OBJEXT): \
-  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
-  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h $(srcdir)/../../builtin/aes/uitypes.h \
-  $(srcdir)/../../builtin/crypto_mod.h $(srcdir)/../../builtin/sha2/sha2.h \
-  $(srcdir)/../crypto_int.h $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
-  hmac_md5.c
-unkeyed.so unkeyed.po $(OUTPRE)unkeyed.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h \
-  $(srcdir)/../../builtin/aes/uitypes.h $(srcdir)/../../builtin/crypto_mod.h \
-  $(srcdir)/../../builtin/sha2/sha2.h $(srcdir)/../crypto_int.h \
-  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h unkeyed.c
diff --git a/src/lib/crypto/krb/checksum/cbc.c b/src/lib/crypto/krb/checksum_cbc.c

similarity index 100%

rename from src/lib/crypto/krb/checksum/cbc.c

rename to src/lib/crypto/krb/checksum_cbc.c
diff --git a/src/lib/crypto/krb/checksum/confounder.c b/src/lib/crypto/krb/checksum_confounder.c

similarity index 100%

rename from src/lib/crypto/krb/checksum/confounder.c

rename to src/lib/crypto/krb/checksum_confounder.c
diff --git a/src/lib/crypto/krb/dk/checksum_cmac.c b/src/lib/crypto/krb/checksum_dk_cmac.c

similarity index 100%

rename from src/lib/crypto/krb/dk/checksum_cmac.c

rename to src/lib/crypto/krb/checksum_dk_cmac.c
diff --git a/src/lib/crypto/krb/dk/checksum_hmac.c b/src/lib/crypto/krb/checksum_dk_hmac.c

similarity index 100%

rename from src/lib/crypto/krb/dk/checksum_hmac.c

rename to src/lib/crypto/krb/checksum_dk_hmac.c
diff --git a/src/lib/crypto/krb/checksum/hmac_md5.c b/src/lib/crypto/krb/checksum_hmac_md5.c

similarity index 100%

rename from src/lib/crypto/krb/checksum/hmac_md5.c

rename to src/lib/crypto/krb/checksum_hmac_md5.c
diff --git a/src/lib/crypto/krb/checksum/unkeyed.c b/src/lib/crypto/krb/checksum_unkeyed.c

similarity index 100%

rename from src/lib/crypto/krb/checksum/unkeyed.c

rename to src/lib/crypto/krb/checksum_unkeyed.c
diff --git a/src/lib/crypto/krb/checksum/cmac.c b/src/lib/crypto/krb/cmac.c

similarity index 100%

rename from src/lib/crypto/krb/checksum/cmac.c

rename to src/lib/crypto/krb/cmac.c
diff --git a/src/lib/crypto/krb/crc32/crc32.c b/src/lib/crypto/krb/crc32.c

similarity index 100%

rename from src/lib/crypto/krb/crc32/crc32.c

rename to src/lib/crypto/krb/crc32.c
diff --git a/src/lib/crypto/krb/crc32/Makefile.in b/src/lib/crypto/krb/crc32/Makefile.in

deleted file mode 100644 (file)

index 2f117bf..0000000
--- a/src/lib/crypto/krb/crc32/Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
-mydir=lib$(S)crypto$(S)krb$(S)crc32
-BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-DEFS=
-LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../$(CRYPTO_IMPL)
-
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR = krb\crc32
-##DOS##OBJFILE = ..\..\$(OUTPRE)crc32.lst
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-
-STLIBOBJS= crc32.o
-
-OBJS= $(OUTPRE)crc32.$(OBJEXT) 
-
-SRCS= $(srcdir)/crc32.c
-
-##DOS##LIBOBJS = $(OBJS)
-
-all-unix:: all-libobjs
-
-includes:: depend
-
-depend:: $(SRCS)
-
-clean-unix:: clean-libobjs
-
-check-unix:: 
-
-@libobj_frag@
-
diff --git a/src/lib/crypto/krb/crc32/deps b/src/lib/crypto/krb/crc32/deps

deleted file mode 100644 (file)

index 3205566..0000000
--- a/src/lib/crypto/krb/crc32/deps
+++ /dev/null
@@ -1,16 +0,0 @@
-# 
-# Generated makefile dependencies follow.
-#
-crc32.so crc32.po $(OUTPRE)crc32.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h \
-  $(srcdir)/../../builtin/aes/uitypes.h $(srcdir)/../../builtin/crypto_mod.h \
-  $(srcdir)/../../builtin/sha2/sha2.h $(srcdir)/../crypto_int.h \
-  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h crc32.c
diff --git a/src/lib/crypto/krb/deps b/src/lib/crypto/krb/deps

index 4c87378870235116a0c5f759d82c7bf838fc0e63..3fd32a0072f19e0959951771e2be544113aa1c36 100644 (file)
--- a/src/lib/crypto/krb/deps
+++ b/src/lib/crypto/krb/deps
@@ -96,6 +96,19 @@ combine_keys.so combine_keys.po $(OUTPRE)combine_keys.$(OBJEXT): \
    $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
    $(top_srcdir)/include/socket-utils.h combine_keys.c \
    crypto_int.h
+crc32.so crc32.po $(OUTPRE)crc32.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../builtin/aes/aes.h \
+  $(srcdir)/../builtin/aes/uitypes.h $(srcdir)/../builtin/crypto_mod.h \
+  $(srcdir)/../builtin/sha2/sha2.h $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  crc32.c crypto_int.h
  crypto_length.so crypto_length.po $(OUTPRE)crypto_length.$(OBJEXT): \
    $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
    $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -382,6 +395,58 @@ prf.so prf.po $(OUTPRE)prf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
    $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
    $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
    crypto_int.h prf.c
+prf_cmac.so prf_cmac.po $(OUTPRE)prf_cmac.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
+  $(COM_ERR_DEPS) $(srcdir)/../builtin/aes/aes.h $(srcdir)/../builtin/aes/uitypes.h \
+  $(srcdir)/../builtin/crypto_mod.h $(srcdir)/../builtin/sha2/sha2.h \
+  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
+  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
+  $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+  $(top_srcdir)/include/socket-utils.h crypto_int.h prf_cmac.c
+prf_des.so prf_des.po $(OUTPRE)prf_des.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../builtin/aes/aes.h \
+  $(srcdir)/../builtin/aes/uitypes.h $(srcdir)/../builtin/crypto_mod.h \
+  $(srcdir)/../builtin/sha2/sha2.h $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  crypto_int.h prf_des.c
+prf_dk.so prf_dk.po $(OUTPRE)prf_dk.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../builtin/aes/aes.h \
+  $(srcdir)/../builtin/aes/uitypes.h $(srcdir)/../builtin/crypto_mod.h \
+  $(srcdir)/../builtin/sha2/sha2.h $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  crypto_int.h prf_dk.c
+prf_rc4.so prf_rc4.po $(OUTPRE)prf_rc4.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../builtin/aes/aes.h \
+  $(srcdir)/../builtin/aes/uitypes.h $(srcdir)/../builtin/crypto_mod.h \
+  $(srcdir)/../builtin/sha2/sha2.h $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
+  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  crypto_int.h prf_rc4.c
  prng.so prng.po $(OUTPRE)prng.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
    $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
    $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../builtin/aes/aes.h \
diff --git a/src/lib/crypto/krb/dk/derive.c b/src/lib/crypto/krb/derive.c

similarity index 100%

rename from src/lib/crypto/krb/dk/derive.c

rename to src/lib/crypto/krb/derive.c
diff --git a/src/lib/crypto/krb/dk/Makefile.in b/src/lib/crypto/krb/dk/Makefile.in

deleted file mode 100644 (file)

index 56ab164..0000000
--- a/src/lib/crypto/krb/dk/Makefile.in
+++ /dev/null
@@ -1,48 +0,0 @@
-mydir=lib$(S)crypto$(S)krb$(S)dk
-BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../$(CRYPTO_IMPL)
-DEFS=
-
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR = krb\dk
-##DOS##OBJFILE = ..\..\$(OUTPRE)dk.lst
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-STLIBOBJS=\
-       checksum_hmac.o \
-       checksum_cmac.o \
-       dk_aead.o       \
-       dk_cmac.o       \
-       derive.o        \
-       stringtokey.o
-
-OBJS=\
-       $(OUTPRE)checksum_hmac.$(OBJEXT)\
-       $(OUTPRE)checksum_cmac.$(OBJEXT)\
-       $(OUTPRE)dk_aead.$(OBJEXT)      \
-       $(OUTPRE)dk_cmac.$(OBJEXT)      \
-       $(OUTPRE)derive.$(OBJEXT)       \
-       $(OUTPRE)stringtokey.$(OBJEXT)
-
-SRCS=\
-       $(srcdir)/checksum_hmac.c       \
-       $(srcdir)/checksum_cmac.c       \
-       $(srcdir)/dk_aead.c     \
-       $(srcdir)/dk_cmac.c     \
-       $(srcdir)/derive.c      \
-       $(srcdir)/stringtokey.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/dk/deps b/src/lib/crypto/krb/dk/deps

deleted file mode 100644 (file)

index 7dbace5..0000000
--- a/src/lib/crypto/krb/dk/deps
+++ /dev/null
@@ -1,84 +0,0 @@
-# 
-# Generated makefile dependencies follow.
-#
-checksum_hmac.so checksum_hmac.po $(OUTPRE)checksum_hmac.$(OBJEXT): \
-  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
-  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h $(srcdir)/../../builtin/aes/uitypes.h \
-  $(srcdir)/../../builtin/crypto_mod.h $(srcdir)/../../builtin/sha2/sha2.h \
-  $(srcdir)/../crypto_int.h $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
-  checksum_hmac.c
-checksum_cmac.so checksum_cmac.po $(OUTPRE)checksum_cmac.$(OBJEXT): \
-  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
-  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h $(srcdir)/../../builtin/aes/uitypes.h \
-  $(srcdir)/../../builtin/crypto_mod.h $(srcdir)/../../builtin/sha2/sha2.h \
-  $(srcdir)/../crypto_int.h $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
-  checksum_cmac.c
-dk_aead.so dk_aead.po $(OUTPRE)dk_aead.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h \
-  $(srcdir)/../../builtin/aes/uitypes.h $(srcdir)/../../builtin/crypto_mod.h \
-  $(srcdir)/../../builtin/sha2/sha2.h $(srcdir)/../crypto_int.h \
-  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h dk_aead.c
-dk_cmac.so dk_cmac.po $(OUTPRE)dk_cmac.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h \
-  $(srcdir)/../../builtin/aes/uitypes.h $(srcdir)/../../builtin/crypto_mod.h \
-  $(srcdir)/../../builtin/sha2/sha2.h $(srcdir)/../crypto_int.h \
-  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h dk_cmac.c
-derive.so derive.po $(OUTPRE)derive.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h \
-  $(srcdir)/../../builtin/aes/uitypes.h $(srcdir)/../../builtin/crypto_mod.h \
-  $(srcdir)/../../builtin/sha2/sha2.h $(srcdir)/../crypto_int.h \
-  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h derive.c
-stringtokey.so stringtokey.po $(OUTPRE)stringtokey.$(OBJEXT): \
-  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
-  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h $(srcdir)/../../builtin/aes/uitypes.h \
-  $(srcdir)/../../builtin/crypto_mod.h $(srcdir)/../../builtin/sha2/sha2.h \
-  $(srcdir)/../crypto_int.h $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
-  stringtokey.c
diff --git a/src/lib/crypto/krb/dk/dk_cmac.c b/src/lib/crypto/krb/enc_dk_cmac.c

similarity index 100%

rename from src/lib/crypto/krb/dk/dk_cmac.c

rename to src/lib/crypto/krb/enc_dk_cmac.c
diff --git a/src/lib/crypto/krb/dk/dk_aead.c b/src/lib/crypto/krb/enc_dk_hmac.c

similarity index 100%

rename from src/lib/crypto/krb/dk/dk_aead.c

rename to src/lib/crypto/krb/enc_dk_hmac.c
diff --git a/src/lib/crypto/krb/old/old_aead.c b/src/lib/crypto/krb/enc_old.c

similarity index 100%

rename from src/lib/crypto/krb/old/old_aead.c

rename to src/lib/crypto/krb/enc_old.c
diff --git a/src/lib/crypto/krb/raw/raw_aead.c b/src/lib/crypto/krb/enc_raw.c

similarity index 100%

rename from src/lib/crypto/krb/raw/raw_aead.c

rename to src/lib/crypto/krb/enc_raw.c
diff --git a/src/lib/crypto/krb/arcfour/arcfour.c b/src/lib/crypto/krb/enc_rc4.c

similarity index 100%

rename from src/lib/crypto/krb/arcfour/arcfour.c

rename to src/lib/crypto/krb/enc_rc4.c
diff --git a/src/lib/crypto/krb/old/Makefile.in b/src/lib/crypto/krb/old/Makefile.in

deleted file mode 100644 (file)

index 0563f4c..0000000
--- a/src/lib/crypto/krb/old/Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-mydir=lib$(S)crypto$(S)krb$(S)old
-BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../$(CRYPTO_IMPL)
-DEFS=
-
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR = krb\old
-##DOS##OBJFILE = ..\..\$(OUTPRE)old.lst
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf
-
-STLIBOBJS= old_aead.o des_stringtokey.o
-
-OBJS= $(OUTPRE)des_stringtokey.$(OBJEXT) $(OUTPRE)old_aead.$(OBJEXT)
-
-SRCS= $(srcdir)/des_stringtokey.c $(srcdir)/old_aead.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/old/deps b/src/lib/crypto/krb/old/deps

deleted file mode 100644 (file)

index f8762e6..0000000
--- a/src/lib/crypto/krb/old/deps
+++ /dev/null
@@ -1,31 +0,0 @@
-# 
-# Generated makefile dependencies follow.
-#
-des_stringtokey.so des_stringtokey.po $(OUTPRE)des_stringtokey.$(OBJEXT): \
-  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
-  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h $(srcdir)/../../builtin/aes/uitypes.h \
-  $(srcdir)/../../builtin/crypto_mod.h $(srcdir)/../../builtin/sha2/sha2.h \
-  $(srcdir)/../crypto_int.h $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
-  des_stringtokey.c
-old_aead.so old_aead.po $(OUTPRE)old_aead.$(OBJEXT): \
-  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
-  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h $(srcdir)/../../builtin/aes/uitypes.h \
-  $(srcdir)/../../builtin/crypto_mod.h $(srcdir)/../../builtin/sha2/sha2.h \
-  $(srcdir)/../crypto_int.h $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
-  old_aead.c
diff --git a/src/lib/crypto/krb/prf/Makefile.in b/src/lib/crypto/krb/prf/Makefile.in

deleted file mode 100644 (file)

index f7b4ddc..0000000
--- a/src/lib/crypto/krb/prf/Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-mydir=lib$(S)crypto$(S)krb$(S)prf
-BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../$(CRYPTO_IMPL)
-DEFS=
-
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR = krb\prf
-##DOS##OBJFILE = ..\..\$(OUTPRE)prf.lst
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-STLIBOBJS= des_prf.o dk_prf.o rc4_prf.o cmac_prf.o
-
-OBJS=   $(OUTPRE)des_prf.$(OBJEXT) $(OUTPRE)dk_prf.$(OBJEXT) \
-       $(OUTPRE)rc4_prf.$(OBJEXT) $(OUTPRE)cmac_prf.$(OBJEXT)
-
-SRCS= $(srcdir)/des_prf.c $(srcdir)/dk_prf.c \
-       $(srcdir)/rc4_prf.c  $(srcdir)/cmac_prf.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/prf/deps b/src/lib/crypto/krb/prf/deps

deleted file mode 100644 (file)

index 40bba24..0000000
--- a/src/lib/crypto/krb/prf/deps
+++ /dev/null
@@ -1,56 +0,0 @@
-# 
-# Generated makefile dependencies follow.
-#
-des_prf.so des_prf.po $(OUTPRE)des_prf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h \
-  $(srcdir)/../../builtin/aes/uitypes.h $(srcdir)/../../builtin/crypto_mod.h \
-  $(srcdir)/../../builtin/sha2/sha2.h $(srcdir)/../crypto_int.h \
-  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h des_prf.c
-dk_prf.so dk_prf.po $(OUTPRE)dk_prf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h \
-  $(srcdir)/../../builtin/aes/uitypes.h $(srcdir)/../../builtin/crypto_mod.h \
-  $(srcdir)/../../builtin/sha2/sha2.h $(srcdir)/../crypto_int.h \
-  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h dk_prf.c
-rc4_prf.so rc4_prf.po $(OUTPRE)rc4_prf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
-  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
-  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h \
-  $(srcdir)/../../builtin/aes/uitypes.h $(srcdir)/../../builtin/crypto_mod.h \
-  $(srcdir)/../../builtin/sha2/sha2.h $(srcdir)/../crypto_int.h \
-  $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
-  $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
-  $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
-  $(top_srcdir)/include/socket-utils.h rc4_prf.c
-cmac_prf.so cmac_prf.po $(OUTPRE)cmac_prf.$(OBJEXT): \
-  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
-  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h $(srcdir)/../../builtin/aes/uitypes.h \
-  $(srcdir)/../../builtin/crypto_mod.h $(srcdir)/../../builtin/sha2/sha2.h \
-  $(srcdir)/../crypto_int.h $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
-  cmac_prf.c
diff --git a/src/lib/crypto/krb/prf/cmac_prf.c b/src/lib/crypto/krb/prf_cmac.c

similarity index 100%

rename from src/lib/crypto/krb/prf/cmac_prf.c

rename to src/lib/crypto/krb/prf_cmac.c
diff --git a/src/lib/crypto/krb/prf/des_prf.c b/src/lib/crypto/krb/prf_des.c

similarity index 100%

rename from src/lib/crypto/krb/prf/des_prf.c

rename to src/lib/crypto/krb/prf_des.c
diff --git a/src/lib/crypto/krb/prf/dk_prf.c b/src/lib/crypto/krb/prf_dk.c

similarity index 100%

rename from src/lib/crypto/krb/prf/dk_prf.c

rename to src/lib/crypto/krb/prf_dk.c
diff --git a/src/lib/crypto/krb/prf/rc4_prf.c b/src/lib/crypto/krb/prf_rc4.c

similarity index 100%

rename from src/lib/crypto/krb/prf/rc4_prf.c

rename to src/lib/crypto/krb/prf_rc4.c
diff --git a/src/lib/crypto/krb/raw/Makefile.in b/src/lib/crypto/krb/raw/Makefile.in

deleted file mode 100644 (file)

index f0b32b5..0000000
--- a/src/lib/crypto/krb/raw/Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-mydir=lib$(S)crypto$(S)krb$(S)raw
-BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../$(CRYPTO_IMPL)
-DEFS=
-
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR = krb\raw
-##DOS##OBJFILE = ..\..\$(OUTPRE)raw.lst
-
-PROG_LIBPATH=-L$(TOPLIBD)
-PROG_RPATH=$(KRB5_LIBDIR)
-
-RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf
-
-STLIBOBJS= raw_aead.o
-
-OBJS= $(OUTPRE)raw_aead.$(OBJEXT)
-
-SRCS= $(srcdir)/raw_aead.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/raw/deps b/src/lib/crypto/krb/raw/deps

deleted file mode 100644 (file)

index 2423c9f..0000000
--- a/src/lib/crypto/krb/raw/deps
+++ /dev/null
@@ -1,17 +0,0 @@
-# 
-# Generated makefile dependencies follow.
-#
-raw_aead.so raw_aead.po $(OUTPRE)raw_aead.$(OBJEXT): \
-  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
-  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
-  $(COM_ERR_DEPS) $(srcdir)/../../builtin/aes/aes.h $(srcdir)/../../builtin/aes/uitypes.h \
-  $(srcdir)/../../builtin/crypto_mod.h $(srcdir)/../../builtin/sha2/sha2.h \
-  $(srcdir)/../crypto_int.h $(top_srcdir)/include/k5-buf.h \
-  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
-  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
-  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
-  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-trace.h \
-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
-  $(top_srcdir)/include/krb5/plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
-  raw_aead.c
diff --git a/src/lib/crypto/krb/old/des_stringtokey.c b/src/lib/crypto/krb/s2k_des.c

similarity index 100%

rename from src/lib/crypto/krb/old/des_stringtokey.c

rename to src/lib/crypto/krb/s2k_des.c
diff --git a/src/lib/crypto/krb/dk/stringtokey.c b/src/lib/crypto/krb/s2k_pbkdf2.c

similarity index 100%

rename from src/lib/crypto/krb/dk/stringtokey.c

rename to src/lib/crypto/krb/s2k_pbkdf2.c
diff --git a/src/lib/crypto/krb/arcfour/arcfour_s2k.c b/src/lib/crypto/krb/s2k_rc4.c

similarity index 100%

rename from src/lib/crypto/krb/arcfour/arcfour_s2k.c

rename to src/lib/crypto/krb/s2k_rc4.c
author	Greg Hudson <ghudson@mit.edu>
	Sat, 5 Mar 2011 13:31:02 +0000 (13:31 +0000)
committer	Greg Hudson <ghudson@mit.edu>
	Sat, 5 Mar 2011 13:31:02 +0000 (13:31 +0000)
src/configure.in		patch \| blob \| history
src/lib/crypto/Makefile.in		patch \| blob \| history
src/lib/crypto/crypto_tests/CRC.pm	[moved from src/lib/crypto/krb/crc32/CRC.pm with 100% similarity]	patch \| blob \| history
src/lib/crypto/crypto_tests/Poly.pm	[moved from src/lib/crypto/krb/crc32/Poly.pm with 100% similarity]	patch \| blob \| history
src/lib/crypto/crypto_tests/crc.pl	[moved from src/lib/crypto/krb/crc32/crc.pl with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/Makefile.in		patch \| blob \| history
src/lib/crypto/krb/arcfour/Makefile.in	[deleted file]	patch \| blob \| history
src/lib/crypto/krb/arcfour/deps	[deleted file]	patch \| blob \| history
src/lib/crypto/krb/checksum/Makefile.in	[deleted file]	patch \| blob \| history
src/lib/crypto/krb/checksum/deps	[deleted file]	patch \| blob \| history
src/lib/crypto/krb/checksum_cbc.c	[moved from src/lib/crypto/krb/checksum/cbc.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/checksum_confounder.c	[moved from src/lib/crypto/krb/checksum/confounder.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/checksum_dk_cmac.c	[moved from src/lib/crypto/krb/dk/checksum_cmac.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/checksum_dk_hmac.c	[moved from src/lib/crypto/krb/dk/checksum_hmac.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/checksum_hmac_md5.c	[moved from src/lib/crypto/krb/checksum/hmac_md5.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/checksum_unkeyed.c	[moved from src/lib/crypto/krb/checksum/unkeyed.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/cmac.c	[moved from src/lib/crypto/krb/checksum/cmac.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/crc32.c	[moved from src/lib/crypto/krb/crc32/crc32.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/crc32/Makefile.in	[deleted file]	patch \| blob \| history
src/lib/crypto/krb/crc32/deps	[deleted file]	patch \| blob \| history
src/lib/crypto/krb/deps		patch \| blob \| history
src/lib/crypto/krb/derive.c	[moved from src/lib/crypto/krb/dk/derive.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/dk/Makefile.in	[deleted file]	patch \| blob \| history
src/lib/crypto/krb/dk/deps	[deleted file]	patch \| blob \| history
src/lib/crypto/krb/enc_dk_cmac.c	[moved from src/lib/crypto/krb/dk/dk_cmac.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/enc_dk_hmac.c	[moved from src/lib/crypto/krb/dk/dk_aead.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/enc_old.c	[moved from src/lib/crypto/krb/old/old_aead.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/enc_raw.c	[moved from src/lib/crypto/krb/raw/raw_aead.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/enc_rc4.c	[moved from src/lib/crypto/krb/arcfour/arcfour.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/old/Makefile.in	[deleted file]	patch \| blob \| history
src/lib/crypto/krb/old/deps	[deleted file]	patch \| blob \| history
src/lib/crypto/krb/prf/Makefile.in	[deleted file]	patch \| blob \| history
src/lib/crypto/krb/prf/deps	[deleted file]	patch \| blob \| history
src/lib/crypto/krb/prf_cmac.c	[moved from src/lib/crypto/krb/prf/cmac_prf.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/prf_des.c	[moved from src/lib/crypto/krb/prf/des_prf.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/prf_dk.c	[moved from src/lib/crypto/krb/prf/dk_prf.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/prf_rc4.c	[moved from src/lib/crypto/krb/prf/rc4_prf.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/raw/Makefile.in	[deleted file]	patch \| blob \| history
src/lib/crypto/krb/raw/deps	[deleted file]	patch \| blob \| history
src/lib/crypto/krb/s2k_des.c	[moved from src/lib/crypto/krb/old/des_stringtokey.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/s2k_pbkdf2.c	[moved from src/lib/crypto/krb/dk/stringtokey.c with 100% similarity]	patch \| blob \| history
src/lib/crypto/krb/s2k_rc4.c	[moved from src/lib/crypto/krb/arcfour/arcfour_s2k.c with 100% similarity]	patch \| blob \| history