summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorderaadt <>1996-07-02 23:05:55 +0000
committerderaadt <>1996-07-02 23:05:55 +0000
commit31eed230f17074fb3bb7df66b26f5b2eff23451a (patch)
tree5f62724944eca86729120480cf77cafabaeb51d7
parent487f172e43f88a67b7aae65cdb7057f7b56349f2 (diff)
downloadopenbsd-31eed230f17074fb3bb7df66b26f5b2eff23451a.tar.gz
openbsd-31eed230f17074fb3bb7df66b26f5b2eff23451a.tar.bz2
openbsd-31eed230f17074fb3bb7df66b26f5b2eff23451a.zip
for magic MD5 salt, call md5crypt()
Diffstat (limited to '')
-rw-r--r--src/lib/libc/crypt/crypt.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/libc/crypt/crypt.c b/src/lib/libc/crypt/crypt.c
index 38b690d866..074a40bde8 100644
--- a/src/lib/libc/crypt/crypt.c
+++ b/src/lib/libc/crypt/crypt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: crypt.c,v 1.4 1996/06/03 22:20:35 niklas Exp $ */ 1/* $OpenBSD: crypt.c,v 1.5 1996/07/02 23:05:55 deraadt Exp $ */
2 2
3/* 3/*
4 * FreeSec: libcrypt 4 * FreeSec: libcrypt
@@ -596,14 +596,17 @@ crypt(key, setting)
596 const char *setting; 596 const char *setting;
597{ 597{
598 int i; 598 int i;
599 u_int32_t count, salt, l, r0, r1, keybuf[2]; 599 u_int32_t count, salt, l, r0, r1, keybuf[2];
600 u_char *p, *q; 600 u_char *p, *q;
601 static u_char output[21]; 601 static u_char output[21];
602 extern char *md5crypt __P((const char *, const char *));
603
604 if (strncmp(setting, "$1$", sizeof("$1")) == 0)
605 return (md5crypt(key, setting));
602 606
603 if (!des_initialised) 607 if (!des_initialised)
604 des_init(); 608 des_init();
605 609
606
607 /* 610 /*
608 * Copy the key, shifting each character up by one bit 611 * Copy the key, shifting each character up by one bit
609 * and padding with zeros. 612 * and padding with zeros.