X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fdes%2Ffcrypt.c;h=88fbbcf25ff9dac9d62d32c9fb9d2ef7514b73f5;hb=a3fe382e2d2d794c598921cd39117581a2a8941b;hp=697167bd0ac627e8d5e10b22db7a0851c26f3a67;hpb=a53955d8abd68c604de02cc1e101c66169207fb7;p=oweals%2Fopenssl.git

diff --git a/crypto/des/fcrypt.c b/crypto/des/fcrypt.c
index 697167bd0a..88fbbcf25f 100644
--- a/crypto/des/fcrypt.c
+++ b/crypto/des/fcrypt.c
@@ -9,7 +9,7 @@
 #include <openssl/ebcdic.h>
 #endif
 
-/* This version of crypt has been developed from my MIT compatable
+/* This version of crypt has been developed from my MIT compatible
  * DES library.
  * The library is available at pub/Crypto/DES at ftp.psy.uq.oz.au
  * Eric Young (eay@cryptsoft.com)
@@ -19,7 +19,7 @@
  * I have included directive PARA for shared memory computers.
  * I have included a directive LONGCRYPT to using this routine to cipher
  * passwords with more then 8 bytes like HP-UX 10.x it used. The MAXPLEN
- * definition is the maximum of lenght of password and can changed. I have
+ * definition is the maximum of length of password and can changed. I have
  * defined 24.
  */
 
@@ -62,16 +62,14 @@ static unsigned const char cov_2char[64]={
 void fcrypt_body(DES_LONG *out,des_key_schedule ks,
 	DES_LONG Eswap0, DES_LONG Eswap1);
 
-#if defined(PERL5) || defined(__FreeBSD__)
-char *des_crypt(const char *buf,const char *salt);
-#else
-char *crypt(const char *buf,const char *salt);
-#endif
-#if defined(PERL5) || defined(__FreeBSD__)
-char *des_crypt(const char *buf, const char *salt)
-#else
+#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT)
 char *crypt(const char *buf, const char *salt)
+	{
+	return(des_crypt(buf, salt));
+	}
 #endif
+
+char *des_crypt(const char *buf, const char *salt)
 	{
 	static char buff[14];
 
@@ -126,8 +124,8 @@ char *des_fcrypt(const char *buf, const char *salt, char *ret)
 	 * returns *\0XXXXXXXXX
 	 * The \0 makes the string look like * so the pwd "*" would
 	 * crypt to "*".  This was found when replacing the crypt in
-	 * our shared libraries.  People found that the disbled
-	 * accounts effectivly had no passwd :-(. */
+	 * our shared libraries.  People found that the disabled
+	 * accounts effectively had no passwd :-(. */
 #ifndef CHARSET_EBCDIC
 	x=ret[0]=((salt[0] == '\0')?'A':salt[0]);
 	Eswap0=con_salt[x]<<2;
@@ -153,7 +151,7 @@ r=(r+7)/8;
 	for (; i<8; i++)
 		key[i]=0;
 
-	des_set_key(&key,ks);
+	des_set_key_unchecked(&key,ks);
 	fcrypt_body(&(out[0]),ks,Eswap0,Eswap1);
 
 	ll=out[0]; l2c(ll,b);