From: tholo <tholo@openbsd.org>
Date: Sat, 15 Feb 1997 19:56:58 +0000 (+0000)
Subject: Rename crypt() entry in libdes to des_crypt
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=99b467811d45dd702e37ebffee108e577f166adf;p=openbsd

Rename crypt() entry in libdes to des_crypt
---

diff --git a/kerberosIV/des/fcrypt.c b/kerberosIV/des/fcrypt.c
index 2452c7a90d6..d43d0d72853 100644
--- a/kerberosIV/des/fcrypt.c
+++ b/kerberosIV/des/fcrypt.c
@@ -532,24 +532,12 @@ static unsigned const char cov_2char[64]={
 };
 
 #ifdef _DES_PROTO
-#if defined(PERL5) || defined(lint)
 char *des_crypt(char *buf,char *salt);
 #else
-char *crypt(char *buf,char *salt);
-#endif
-#else
-#ifdef PERL5
 char *des_crypt();
-#else
-char *crypt();
-#endif
 #endif
 
-#if defined(PERL5) || defined(lint)
 char *des_crypt(buf,salt)
-#else
-char *crypt(buf,salt)
-#endif
 char *buf;
 char *salt;
 	{
@@ -564,7 +552,7 @@ char *salt;
 	unsigned char c,u;
 
 	/* eay 25/08/92
-	 * If you call crypt("pwd","*") as often happens when you
+	 * If you call des_crypt("pwd","*") as often happens when you
 	 * have * as the pwd field in /etc/passwd, the function
 	 * returns *\0XXXXXXXXX
 	 * The \0 makes the string look like * so the pwd "*" would
diff --git a/kerberosIV/des/shlib_version b/kerberosIV/des/shlib_version
index 890c57389b5..3066b9771e7 100644
--- a/kerberosIV/des/shlib_version
+++ b/kerberosIV/des/shlib_version
@@ -1,2 +1,2 @@
-major=4
-minor=1
+major=5
+minor=0
diff --git a/kerberosIV/include/kerberosIV/des.h b/kerberosIV/include/kerberosIV/des.h
index cc95f574c8f..fb48c6f4b47 100644
--- a/kerberosIV/include/kerberosIV/des.h
+++ b/kerberosIV/include/kerberosIV/des.h
@@ -149,17 +149,7 @@ int des_enc_read(int fd,char *buf,int len,des_key_schedule sched,
 	des_cblock *iv);
 int des_enc_write(int fd,char *buf,int len,des_key_schedule sched,
 	des_cblock *iv);
-#ifdef PERL5
 char *des_crypt(const char *buf,const char *salt);
-#else
-/* some stupid compilers complain because I have declared char instead
- * of const char */
-#ifdef HEADER_DES_LOCL_H
-char *crypt(const char *buf,const char *salt);
-#else
-char *crypt();
-#endif
-#endif
 void des_ofb_encrypt(unsigned char *in,unsigned char *out,
 	int numbits,long length,des_key_schedule schedule,des_cblock *ivec);
 void des_pcbc_encrypt(des_cblock *input,des_cblock *output,long length,
diff --git a/kerberosIV/krb/str2key.c b/kerberosIV/krb/str2key.c
index ecab2caaed5..ba6076a1ca4 100644
--- a/kerberosIV/krb/str2key.c
+++ b/kerberosIV/krb/str2key.c
@@ -56,7 +56,7 @@ afs_cmu_StringToKey (str, cell, key)
 
     /* crypt only considers the first 8 characters of password but for some
        reason returns eleven characters of result (plus the two salt chars). */
-    strncpy((void *)key, (char *)crypt(password, "#~") + 2, sizeof(des_cblock));
+    strncpy((void *)key, (char *)des_crypt(password, "#~") + 2, sizeof(des_cblock));
 
     /* parity is inserted into the LSB so leftshift each byte up one bit.  This
        allows ascii characters with a zero MSB to retain as much significance