From 9d93f27329372e68682819911c1e89467694ad93 Mon Sep 17 00:00:00 2001
From: tedu <>
Date: Mon, 12 May 2014 19:13:14 +0000
Subject: remove md5crypt. while changing things, add a crypt_checkpass wrapper
 that handles most of the edge cases. (not quite ready for production,
 though.) ok deraadt

---
 src/lib/libc/crypt/crypt.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/lib/libc/crypt/crypt.c')

diff --git a/src/lib/libc/crypt/crypt.c b/src/lib/libc/crypt/crypt.c
index 15a784532d..ad8140e302 100644
--- a/src/lib/libc/crypt/crypt.c
+++ b/src/lib/libc/crypt/crypt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crypt.c,v 1.20 2005/08/08 08:05:33 espie Exp $	*/
+/*	$OpenBSD: crypt.c,v 1.21 2014/05/12 19:13:14 tedu Exp $	*/
 
 /*
  * FreeSec: libcrypt
@@ -576,15 +576,14 @@ crypt(const char *key, const char *setting)
 	u_int32_t	count, salt, l, r0, r1, keybuf[2];
 	u_char		*p, *q;
 	static u_char	output[21];
-	extern char	*md5crypt(const char *, const char *);
 	extern char	*bcrypt(const char *, const char *);
 
 	if (setting[0] == '$') {
 		switch (setting[1]) {
-		case '1':
-			return (md5crypt(key, setting));
-		default:
+		case '2':
 			return bcrypt(key, setting);
+		default:
+			return (NULL);
 		}
 	}
 
-- 
cgit v1.2.3-55-g6feb