Change name of des_set_key to des_set_key_schedule as to not interfere with

different implementation used by multiple binaries

4 files changed, 16 insertions, 16 deletions

diff --git a/kerberosIV/des/des_crypt.3 b/kerberosIV/des/des_crypt.3
index 41a572ed53b..cd15eb6d39c 100644
--- a/kerberosIV/des/des_crypt.3
+++ b/kerberosIV/des/des_crypt.3
@@ -3,10 +3,10 @@
 .\" For copying and distribution information,
 .\" please see the file <mit-copyright.h>.
 .\"
-.\"	$Id: des_crypt.3,v 1.1 1995/12/14 06:52:44 tholo Exp $
+.\"	$Id: des_crypt.3,v 1.2 1995/12/17 19:12:03 tholo Exp $
 .TH DES_CRYPT 3  "Kerberos Version 4.0" "MIT Project Athena"
 .SH NAME
-des_read_password, des_string_to_key, des_random_key, des_set_key,
+des_read_password, des_string_to_key, des_random_key, des_set_key_schedule,
 des_ecb_encrypt, des_cbc_encrypt, des_pcbc_encrypt, des_cbc_cksum,
 des_quad_cksum, \- (new) DES encryption
 .SH SYNOPSIS
@@ -31,7 +31,7 @@ int des_random_key(key)
 des_cblock *key;
 .PP
 .ft B
-int des_set_key(key,schedule)
+int des_set_key_schedule(key,schedule)
 des_cblock *key;
 des_key_schedule schedule;
 .PP
@@ -90,7 +90,7 @@ For each key that may be simultaneously active, create a
 struct,
 defined in "des.h". Next, create key schedules (from the 8-byte keys) as
 needed, via
-.I des_set_key,
+.I des_set_key_schedule ,
 prior to using the encryption or checksum routines. Then
 setup the input and output areas.  Make sure to note the restrictions
 on lengths being multiples of eight bytes. Finally, invoke the
@@ -175,13 +175,13 @@ then after calling
 .I des_random_key
 should
 call the
-.I des_set_key
+.I des_set_key_schedule
 routine when needed.
 No meaningful value is returned.  Void is not used for compatibility
 with other compilers.
 .PP
 .PP
-.I des_set_key
+.I des_set_key_schedule
 calculates a key schedule from all eight bytes of the input key, pointed
 to by the
 .I key
@@ -219,7 +219,7 @@ argument is non-zero, the
 (ciphertext) using the key_schedule specified by the
 .I schedule
 argument, previously set via
-.I des_set_key
+.I des_set_key_schedule
 .PP
 If encrypt is zero, the
 .I input
diff --git a/kerberosIV/des/random_key.c b/kerberosIV/des/random_key.c
index f878824e4f8..cca29fb33a3 100644
--- a/kerberosIV/des/random_key.c
+++ b/kerberosIV/des/random_key.c
@@ -1,4 +1,4 @@
-/*	$Id: random_key.c,v 1.1 1995/12/14 06:52:45 tholo Exp $	*/
+/*	$Id: random_key.c,v 1.2 1995/12/17 19:12:05 tholo Exp $	*/
 
 /* Copyright (C) 1992 Eric Young - see COPYING for more details */
 #include "des_locl.h"
@@ -21,7 +21,7 @@ des_cblock ret;
 	((u_int32_t *)key)[1]=(u_int32_t)((pid)|((c++)<<16));
 
 	des_set_odd_parity((des_cblock *)data);
-	des_set_key((des_cblock *)data,ks);
+	des_set_key_schedule((des_cblock *)data,ks);
 	des_cbc_cksum((des_cblock *)key,(des_cblock *)key,
 		(int32_t)sizeof(key),ks,(des_cblock *)data);
 	des_set_odd_parity((des_cblock *)key);
diff --git a/kerberosIV/des/set_key.c b/kerberosIV/des/set_key.c
index 8b46c1ce27b..87bb1597f75 100644
--- a/kerberosIV/des/set_key.c
+++ b/kerberosIV/des/set_key.c
@@ -1,4 +1,4 @@
-/*	$Id: set_key.c,v 1.1 1995/12/14 06:52:43 tholo Exp $	*/
+/*	$Id: set_key.c,v 1.2 1995/12/17 19:12:07 tholo Exp $	*/
 
 /* Copyright (C) 1993 Eric Young - see README for more details */
 /* set_key.c v 1.4 eay 24/9/91
@@ -95,7 +95,7 @@ static char shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};
  * return -1 if key parity error,
  * return -2 if illegal weak key.
  */
-int des_set_key(des_cblock (*key), struct des_ks_struct *schedule)
+int des_set_key_schedule(des_cblock (*key), struct des_ks_struct *schedule)
 {
   register u_int32_t c,d,t,s;
   register unsigned char *in;
@@ -175,5 +175,5 @@ int des_set_key(des_cblock (*key), struct des_ks_struct *schedule)
 
 int des_key_sched(des_cblock *key, des_key_schedule schedule)
 {
-  return(des_set_key(key, (struct des_ks_struct *)schedule));
+  return(des_set_key_schedule(key, (struct des_ks_struct *)schedule));
 }
diff --git a/kerberosIV/des/str2key.c b/kerberosIV/des/str2key.c
index da864f30dbd..0c0e26a1548 100644
--- a/kerberosIV/des/str2key.c
+++ b/kerberosIV/des/str2key.c
@@ -1,4 +1,4 @@
-/*	$Id: str2key.c,v 1.1 1995/12/14 06:52:45 tholo Exp $	*/
+/*	$Id: str2key.c,v 1.2 1995/12/17 19:12:08 tholo Exp $	*/
 
 /* Copyright (C) 1993 Eric Young - see README for more details */
 #include "des_locl.h"
@@ -35,7 +35,7 @@ int des_string_to_key(char *str, des_cblock (*key))
   des_set_odd_parity((des_cblock *)key);
   i=des_check_key;
   des_check_key=0;
-  des_set_key((des_cblock *)key,ks);
+  des_set_key_schedule((des_cblock *)key,ks);
   des_check_key=i;
   des_cbc_cksum((des_cblock *)str,(des_cblock *)key,(long)length,ks,
 		(des_cblock *)key);
@@ -99,10 +99,10 @@ int des_string_to_2keys(char *str, des_cblock (*key1), des_cblock (*key2))
   des_set_odd_parity((des_cblock *)key2);
   i=des_check_key;
   des_check_key=0;
-  des_set_key((des_cblock *)key1,ks);
+  des_set_key_schedule((des_cblock *)key1,ks);
   des_cbc_cksum((des_cblock *)str,(des_cblock *)key1,(long)length,ks,
 		(des_cblock *)key1);
-  des_set_key((des_cblock *)key2,ks);
+  des_set_key_schedule((des_cblock *)key2,ks);
   des_cbc_cksum((des_cblock *)str,(des_cblock *)key2,(long)length,ks,
 		(des_cblock *)key2);
   des_check_key=i;