oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Move call of md5_crypt from des_fcrypt to (des_)crypt where it belongs.

Browse Source 
Only include md5_crypt suport for FreeBSD, other systems have already
fix the export problems of UNIX crypt.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3352 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Björn Groenvall
1997-09-03 14:34:29 +00:00
parent 229316b6de
commit 0bb59d1e91
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/des/fcrypt.c
View File

@@ -99,9 +99,10 @@
#define STATIC static #define STATIC static
#endif #endif
/* It is really only FreeBSD that still suffers from MD5 based crypts, /* It is really only FreeBSD that still suffers from MD5 based crypts */
* for now let all platforms support it. */ #ifdef __FreeBSD__
#define MD5_CRYPT_SUPPORT 1 #define MD5_CRYPT_SUPPORT 1
#endif
#if MD5_CRYPT_SUPPORT #if MD5_CRYPT_SUPPORT
/* /*
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
@@ -319,6 +320,11 @@ const char *salt;
{ {
static char buff[14]; static char buff[14];
#if MD5_CRYPT_SUPPORT
if (!strncmp(salt, "$1$", 3))
return crypt_md5(buf, salt);
#endif
return(des_fcrypt(buf,salt,buff)); return(des_fcrypt(buf,salt,buff));
} }
@@ -337,11 +343,6 @@ char *ret;
unsigned char *b=bb; unsigned char *b=bb;
unsigned char c,u; unsigned char c,u;
#if MD5_CRYPT_SUPPORT
if (!strncmp(salt, "$1$", 3))
return crypt_md5(buf, salt);
#endif
/* eay 25/08/92 /* eay 25/08/92
* If you call crypt("pwd","*") as often happens when you * If you call crypt("pwd","*") as often happens when you
* have * as the pwd field in /etc/passwd, the function * have * as the pwd field in /etc/passwd, the function