Makefile.in (STLIBOBJS): Nothing uses des_stringtokey.o, drop it

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

5 files changed, 25 insertions, 28 deletions

diff --git a/src/lib/crypto/old/ChangeLog b/src/lib/crypto/old/ChangeLog
index b859386af..f1a8fb8d7 100644
--- a/src/lib/crypto/old/ChangeLog
+++ b/src/lib/crypto/old/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (STLIBOBJS): Nothing uses des_stringtokey.o, drop
+	it.
+
 2001-03-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* des_stringtokey.c, old.h, old_decrypt.c, old_encrypt.c: Use
diff --git a/src/lib/crypto/old/Makefile.in b/src/lib/crypto/old/Makefile.in
index cab1b3511..4be348203 100644
--- a/src/lib/crypto/old/Makefile.in
+++ b/src/lib/crypto/old/Makefile.in
@@ -14,7 +14,7 @@ PROG_RPATH=$(KRB5_LIBDIR)
 
 RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf
 
-STLIBOBJS= des_stringtokey.o old_decrypt.o old_encrypt.o
+STLIBOBJS= old_decrypt.o old_encrypt.o
 
 OBJS= $(OUTPRE)des_stringtokey.$(OBJEXT) $(OUTPRE)old_decrypt.$(OBJEXT) $(OUTPRE)old_encrypt.$(OBJEXT)
 
diff --git a/src/lib/crypto/old/des_stringtokey.c b/src/lib/crypto/old/des_stringtokey.c
index 3369442bc..3b4f627a4 100644
--- a/src/lib/crypto/old/des_stringtokey.c
+++ b/src/lib/crypto/old/des_stringtokey.c
@@ -1,3 +1,4 @@
+/* THIS FILE DOESN'T GET COMPILED.  AUDIT BEFORE USE.  */
 /*
  * Copyright (C) 1998 by the FundsXpress, INC.
  * 
diff --git a/src/lib/crypto/old/old_decrypt.c b/src/lib/crypto/old/old_decrypt.c
index 6606be754..38c1c2446 100644
--- a/src/lib/crypto/old/old_decrypt.c
+++ b/src/lib/crypto/old/old_decrypt.c
@@ -27,21 +27,14 @@
 #include "k5-int.h"
 #include "old.h"
 
-#ifndef HAVE_MEMMOVE
-#ifdef HAVE_BCOPY
-#define memmove(dst,src,size) bcopy(src,dst,size)
-#endif
-#endif
-
 krb5_error_code
-krb5_old_decrypt(enc, hash, key, usage, ivec, input, arg_output)
-     const struct krb5_enc_provider *enc;
-     const struct krb5_hash_provider *hash;
-     const krb5_keyblock *key;
-     krb5_keyusage usage;
-     const krb5_data *ivec;
-     const krb5_data *input;
-     krb5_data *arg_output;
+krb5_old_decrypt(const struct krb5_enc_provider *enc,
+		 const struct krb5_hash_provider *hash,
+		 const krb5_keyblock *key,
+		 krb5_keyusage usage,
+		 const krb5_data *ivec,
+		 const krb5_data *input,
+		 krb5_data *arg_output)
 {
     krb5_error_code ret;
     size_t blocksize, hashsize, plainsize;
diff --git a/src/lib/crypto/old/old_encrypt.c b/src/lib/crypto/old/old_encrypt.c
index 374bbad08..8ed8d769b 100644
--- a/src/lib/crypto/old/old_encrypt.c
+++ b/src/lib/crypto/old/old_encrypt.c
@@ -28,11 +28,10 @@
 #include "old.h"
 
 void
-krb5_old_encrypt_length(enc, hash, inputlen, length)
-     const struct krb5_enc_provider *enc;
-     const struct krb5_hash_provider *hash;
-     size_t inputlen;
-     size_t *length;
+krb5_old_encrypt_length(const struct krb5_enc_provider *enc,
+			const struct krb5_hash_provider *hash,
+			size_t inputlen,
+			size_t *length)
 {
     size_t blocksize, hashsize;
 
@@ -43,14 +42,13 @@ krb5_old_encrypt_length(enc, hash, inputlen, length)
 }
 
 krb5_error_code
-krb5_old_encrypt(enc, hash, key, usage, ivec, input, output)
-     const struct krb5_enc_provider *enc;
-     const struct krb5_hash_provider *hash;
-     const krb5_keyblock *key;
-     krb5_keyusage usage;
-     const krb5_data *ivec;
-     const krb5_data *input;
-     krb5_data *output;
+krb5_old_encrypt(const struct krb5_enc_provider *enc,
+		 const struct krb5_hash_provider *hash,
+		 const krb5_keyblock *key,
+		 krb5_keyusage usage,
+		 const krb5_data *ivec,
+		 const krb5_data *input,
+		 krb5_data *output)
 {
     krb5_error_code ret;
     size_t blocksize, hashsize, enclen;