cvs: php4 / NEWS /main config.w32.h.in /win32 crypt_win32.c md5crypt.c md5crypt.h php4dllts.dsp

edink Fri May 10 00:58:06 2002 EDT Added files: /php4/win32 md5crypt.c md5crypt.h Modified files: /php4 NEWS /php4/main config.w32.h.in /php4/win32 crypt_win32.c php4dllts.dsp Log: Added MD5 support for crypt() on Windows.

Index: php4/NEWS diff -u php4/NEWS:1.976 php4/NEWS:1.977 --- php4/NEWS:1.976 Mon May 6 14:54:46 2002 +++ php4/NEWS Fri May 10 00:58:05 2002 @@ -1,6 +1,7 @@ PHP 4 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2002, Version 4.3.0 +- Added MD5 support for crypt() on Windows. (Edin) - Fixed resource bug in LDAP extension. (Stig Venaas) - Fixed output buffer crash when buffer is over written in callback. (Yasuo) - Added output_add_rewrite_var() and output_remove_rewrite_var() to inject Index: php4/main/config.w32.h.in diff -u php4/main/config.w32.h.in:1.1 php4/main/config.w32.h.in:1.2 --- php4/main/config.w32.h.in:1.1 Thu May 2 05:49:41 2002 +++ php4/main/config.w32.h.in Fri May 10 00:58:05 2002 @@ -2,7 +2,7 @@ Build Configuration for Win32. This has only been tested with MS VisualC++ 6 (and later). - $Id: config.w32.h.in,v 1.1 2002/05/02 09:49:41 sebastian Exp $ + $Id: config.w32.h.in,v 1.2 2002/05/10 04:58:05 edink Exp $ */ /* Default PHP / PEAR directories */ @@ -24,7 +24,7 @@ #define HAVE_CRYPT 1 #define PHP_STD_DES_CRYPT 1 #define PHP_EXT_DES_CRYPT 0 -#define PHP_MD5_CRYPT 0 +#define PHP_MD5_CRYPT 1 #define PHP_BLOWFISH_CRYPT 0 /* Enable / Disable CALENDAR extension (default: enabled) */ Index: php4/win32/crypt_win32.c diff -u php4/win32/crypt_win32.c:1.3 php4/win32/crypt_win32.c:1.4 --- php4/win32/crypt_win32.c:1.3 Mon Mar 18 17:13:14 2002 +++ php4/win32/crypt_win32.c Fri May 10 00:58:05 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: crypt_win32.c,v 1.3 2002/03/18 22:13:14 sebastian Exp $ */ +/* $Id: crypt_win32.c,v 1.4 2002/05/10 04:58:05 edink Exp $ */ /* This code is distributed under the PHP license with permission from the author Jochen Obalek <jochen.obalek@bigfoot.de> */ @@ -41,6 +41,7 @@ #include <time.h> #include <string.h> #include <stdlib.h> +#include "md5crypt.h" #define BS 64 #define BS2 32 @@ -271,7 +272,7 @@ } char * -crypt (const char *wort, const char *salt) +des_crypt (const char *wort, const char *salt) { static char retkey[14]; char key[BS + 2]; @@ -343,4 +344,12 @@ return retkey; } - +char * +crypt (const char *pw, const char *salt) +{ + if (strlen(salt)>MD5_MAGIC_LEN && strncmp(salt, MD5_MAGIC, MD5_MAGIC_LEN)==0) { + return md5_crypt(pw, salt); + } else { + return des_crypt(pw, salt); + } +} Index: php4/win32/php4dllts.dsp diff -u php4/win32/php4dllts.dsp:1.67 php4/win32/php4dllts.dsp:1.68 --- php4/win32/php4dllts.dsp:1.67 Thu May 2 06:15:27 2002 +++ php4/win32/php4dllts.dsp Fri May 10 00:58:05 2002 @@ -1,6 +1,6 @@ # Microsoft Developer Studio Project File - Name="php4dllts" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** NICHT BEARBEITEN ** +# ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 @@ -1920,6 +1920,10 @@ # End Source File # Begin Source File +SOURCE=.\md5crypt.c +# End Source File +# Begin Source File + SOURCE=..\win32\pwd.c # End Source File # Begin Source File @@ -1965,6 +1969,10 @@ # Begin Source File SOURCE=..\win32\grp.h +# End Source File +# Begin Source File + +SOURCE=.\md5crypt.h # End Source File # Begin Source File Index: php4/win32/md5crypt.c +++ php4/win32/md5crypt.c /* +----------------------------------------------------------------------+ | PHP Version 4 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2002 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 2.02 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available at through the world-wide-web at | | http://www.php.net/license/2_02.txt. | | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Author: Edin Kadribasic | +----------------------------------------------------------------------+ */ /* $Id: md5crypt.c,v 1.1 2002/05/10 04:58:05 edink Exp $ */ /* * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): * <phk@login.dknet.dk> wrote this file. As long as you retain this notice you * can do whatever you want with this stuff. If we meet some day, and you think * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * * from FreeBSD: crypt.c,v 1.5 1996/10/14 08:34:02 phk Exp * via OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey Exp * via NetBSD: md5crypt.c,v 1.4.2.1 2002/01/22 19:31:59 he Exp * */ #include "php.h" #include "ext/standard/md5.h" #include "md5crypt.h" static unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; static void to64(char *, php_uint32, int); static void to64(char *s, php_uint32 v, int n) { while (--n >= 0) { *s++ = itoa64[v & 0x3f]; v >>= 6; } } /* * MD5 password encryption. */ char * md5_crypt(const char *pw, const char *salt) { static char passwd[120], *p; const char *sp, *ep; unsigned char final[16]; unsigned int i, sl, pwl; PHP_MD5_CTX ctx, ctx1; php_uint32 l; int pl; pwl = strlen(pw); /* Refine the salt first */ sp = salt; /* If it starts with the magic string, then skip that */ if (strncmp(sp, MD5_MAGIC, MD5_MAGIC_LEN) == 0) sp += MD5_MAGIC_LEN; /* It stops at the first '$', max 8 chars */ for (ep = sp; *ep != '\0' && *ep != '$' && ep < (sp + 8); ep++) continue; /* get the length of the true salt */ sl = ep - sp; PHP_MD5Init(&ctx); /* The password first, since that is what is most unknown */ PHP_MD5Update(&ctx, (const unsigned char *)pw, pwl); /* Then our magic string */ PHP_MD5Update(&ctx, (const unsigned char *)MD5_MAGIC, MD5_MAGIC_LEN); /* Then the raw salt */ PHP_MD5Update(&ctx, (const unsigned char *)sp, sl); /* Then just as many characters of the MD5(pw,salt,pw) */ PHP_MD5Init(&ctx1); PHP_MD5Update(&ctx1, (const unsigned char *)pw, pwl); PHP_MD5Update(&ctx1, (const unsigned char *)sp, sl); PHP_MD5Update(&ctx1, (const unsigned char *)pw, pwl); PHP_MD5Final(final, &ctx1); for (pl = pwl; pl > 0; pl -= 16) PHP_MD5Update(&ctx, final, (unsigned int)(pl > 16 ? 16 : pl)); /* Don't leave anything around in vm they could use. */ memset(final, 0, sizeof(final)); /* Then something really weird... */ for (i = pwl; i != 0; i >>= 1) if ((i & 1) != 0) PHP_MD5Update(&ctx, final, 1); else PHP_MD5Update(&ctx, (const unsigned char *)pw, 1); /* Now make the output string */ memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN); strlcpy(passwd + MD5_MAGIC_LEN, sp, sl + 1); strcat(passwd, "$"); PHP_MD5Final(final, &ctx); /* * And now, just to make sure things don't run too fast. On a 60 MHz * Pentium this takes 34 msec, so you would need 30 seconds to build * a 1000 entry dictionary... */ for (i = 0; i < 1000; i++) { PHP_MD5Init(&ctx1); if ((i & 1) != 0) PHP_MD5Update(&ctx1, (const unsigned char *)pw, pwl); else PHP_MD5Update(&ctx1, final, 16); if ((i % 3) != 0) PHP_MD5Update(&ctx1, (const unsigned char *)sp, sl); if ((i % 7) != 0) PHP_MD5Update(&ctx1, (const unsigned char *)pw, pwl); if ((i & 1) != 0) PHP_MD5Update(&ctx1, final, 16); else PHP_MD5Update(&ctx1, (const unsigned char *)pw, pwl); PHP_MD5Final(final, &ctx1); } p = passwd + sl + MD5_MAGIC_LEN + 1; l = (final[ 0]<<16) | (final[ 6]<<8) | final[12]; to64(p,l,4); p += 4; l = (final[ 1]<<16) | (final[ 7]<<8) | final[13]; to64(p,l,4); p += 4; l = (final[ 2]<<16) | (final[ 8]<<8) | final[14]; to64(p,l,4); p += 4; l = (final[ 3]<<16) | (final[ 9]<<8) | final[15]; to64(p,l,4); p += 4; l = (final[ 4]<<16) | (final[10]<<8) | final[ 5]; to64(p,l,4); p += 4; l = final[11] ; to64(p,l,2); p += 2; *p = '\0'; /* Don't leave anything around in vm they could use. */ memset(final, 0, sizeof(final)); return (passwd); } Index: php4/win32/md5crypt.h +++ php4/win32/md5crypt.h /* +----------------------------------------------------------------------+ | PHP Version 4 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2002 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 2.02 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | | available at through the world-wide-web at | | http://www.php.net/license/2_02.txt. | | If you did not receive a copy of the PHP license and are unable to | | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Author: Edin Kadribasic | +----------------------------------------------------------------------+ */ /* $Id: md5crypt.h,v 1.1 2002/05/10 04:58:05 edink Exp $ */ #ifndef _MD5CRYPT_H_ #define _MD5CRYPT_H_ #ifdef __cplusplus extern "C" { #endif #define MD5_MAGIC "$1$" #define MD5_MAGIC_LEN 3 char *md5_crypt(const char *pw, const char *salt); #ifdef __cplusplus } #endif #endif /* _MD5CRYPT_H_ */