Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove the option to build this against openssl - this hasn't been used 

in the NetBSD build
since the libc version of MD5Final zeroes out the context, replace
the bzero introduced in the previous commit by comments telling that
This commit is contained in:
drochner 2011-11-29 17:27:10 +00:00
parent dfffc92f05
commit 7babedb72c
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/libcrypt/md5crypt.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md5crypt.c,v 1.10 2011/11/29 13:18:52 drochner Exp $ */ /* $NetBSD: md5crypt.c,v 1.11 2011/11/29 17:27:10 drochner Exp $ */
/* /*
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
@ -15,38 +15,22 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#if !defined(lint) #if !defined(lint)
__RCSID("$NetBSD: md5crypt.c,v 1.10 2011/11/29 13:18:52 drochner Exp $"); __RCSID("$NetBSD: md5crypt.c,v 1.11 2011/11/29 17:27:10 drochner Exp $");
#endif /* not lint */ #endif /* not lint */
/*
* NOTE: We are also built for inclusion in libcrypto; when built for that
* environment, use the libcrypto versions of the MD5 routines, so save
* having to pull two versions into the same program.
*/
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#ifdef libcrypto
#include <openssl/md5.h>
#else
#include <md5.h> #include <md5.h>
#endif
#include "crypt.h" #include "crypt.h"
#define MD5_MAGIC "$1$" #define MD5_MAGIC "$1$"
#define MD5_MAGIC_LEN 3 #define MD5_MAGIC_LEN 3
#ifdef libcrypto
#define INIT(x) MD5_Init((x))
#define UPDATE(x, b, l) MD5_Update((x), (b), (l))
#define FINAL(v, x) MD5_Final((v), (x))
#else
#define INIT(x) MD5Init((x)) #define INIT(x) MD5Init((x))
#define UPDATE(x, b, l) MD5Update((x), (b), (l)) #define UPDATE(x, b, l) MD5Update((x), (b), (l))
#define FINAL(v, x) MD5Final((v), (x)) #define FINAL(v, x) MD5Final((v), (x))
#endif
/* /*
@ -117,8 +101,7 @@ __md5crypt(const char *pw, const char *salt)
FINAL(final, &ctx); FINAL(final, &ctx);
/* Don't leave anything around in vm they could use. */ /* memset(&ctx, 0, sizeof(ctx)); done by MD5Final() */
memset(&ctx, 0, sizeof(ctx));
/* /*
* And now, just to make sure things don't run too fast. On a 60 MHz * And now, just to make sure things don't run too fast. On a 60 MHz
@ -147,8 +130,7 @@ __md5crypt(const char *pw, const char *salt)
FINAL(final, &ctx1); FINAL(final, &ctx1);
} }
/* Don't leave anything around in vm they could use. */ /* memset(&ctx1, 0, sizeof(ctx1)); done by MD5Final() */
memset(&ctx1, 0, sizeof(ctx1));
p = passwd + sl + MD5_MAGIC_LEN + 1; p = passwd + sl + MD5_MAGIC_LEN + 1;