CVS update: php4/ext/standard
| From: | rasmus | Date: | Fri, 11 Jun 1999 12:48:23 +0000 |
| Subject: | CVS update: php4/ext/standard | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-1488@lists.php.net to get a copy of this message | ||
Date: Friday June 11, 1999 @ 8:48
Author: rasmus
Update of /repository/php4/ext/standard
In directory php:/tmp/cvs-serv18640/ext/standard
Modified Files:
crypt.c
Log Message:
Same Fix here
Index: php4/ext/standard/crypt.c
diff -u php4/ext/standard/crypt.c:1.2 php4/ext/standard/crypt.c:1.3
--- php4/ext/standard/crypt.c:1.2 Sun May 16 07:19:25 1999
+++ php4/ext/standard/crypt.c Fri Jun 11 08:48:22 1999
@@ -28,7 +28,7 @@
| Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
+----------------------------------------------------------------------+
*/
-/* $Id: crypt.c,v 1.2 1999/05/16 11:19:25 sas Exp $ */
+/* $Id: crypt.c,v 1.3 1999/06/11 12:48:22 rasmus Exp $ */
#include <stdlib.h>
#include "php.h"
@@ -75,26 +75,26 @@
PHP3_EXT_DES_CRYPT, PHP3_MD5_CRYPT and PHP3_BLOWFISH_CRYPT as appropriate
for the target platform
*/
-#ifdef PHP3_STD_DES_CRYPT
+#if PHP3_STD_DES_CRYPT
#define PHP3_MAX_SALT_LEN 2
#endif
-#ifdef PHP3_EXT_DES_CRYPT
+#if PHP3_EXT_DES_CRYPT
#undef PHP3_MAX_SALT_LEN
#define PHP3_MAX_SALT_LEN 9
#endif
-#ifdef PHP3_MD5_CRYPT
+#if PHP3_MD5_CRYPT
#undef PHP3_MAX_SALT_LEN
#define PHP3_MAX_SALT_LEN 12
#endif
-#ifdef PHP3_BLOWFISH_CRYPT
+#if PHP3_BLOWFISH_CRYPT
#undef PHP3_MAX_SALT_LEN
#define PHP3_MAX_SALT_LEN 17
#endif
-#ifdef HAVE_LRAND48
+#if HAVE_LRAND48
#define PHP3_CRYPT_RAND lrand48()
#else
-#ifdef HAVE_RANDOM
+#if HAVE_RANDOM
#define PHP3_CRYPT_RAND random()
#else
#define PHP3_CRYPT_RAND rand()
@@ -105,7 +105,7 @@
{
ELS_FETCH();
-#ifdef PHP3_STD_DES_CRYPT
+#if PHP3_STD_DES_CRYPT
REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", 2, CONST_CS | CONST_PERSISTENT);
#else
#if PHP3_MD5_CRYPT
@@ -156,17 +156,17 @@
/* The automatic salt generation only covers standard DES and md5-crypt */
if(!*salt) {
-#ifdef HAVE_SRAND48
+#if HAVE_SRAND48
srand48((unsigned int) time(0) * getpid());
#else
-#ifdef HAVE_SRANDOM
+#if HAVE_SRANDOM
srandom((unsigned int) time(0) * getpid());
#else
srand((unsigned int) time(0) * getpid());
#endif
#endif
-#ifdef PHP3_STD_DES_CRYPT
+#if PHP3_STD_DES_CRYPT
php3i_to64(&salt[0], PHP3_CRYPT_RAND, 2);
salt[2] = '\0';
#else