[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ crypt.c

[Stanislav Malyshev]

stas Mon, 12 Sep 2011 17:50:42 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=316564

Log:
MFB crypt fix

Changed paths:
U   php/php-src/trunk/ext/standard/crypt.c

Modified: php/php-src/trunk/ext/standard/crypt.c
===
--- php/php-src/trunk/ext/standard/crypt.c  2011-09-12 17:42:23 UTC (rev 
316563)
+++ php/php-src/trunk/ext/standard/crypt.c  2011-09-12 17:50:42 UTC (rev 
316564)
@@ -179,6 +179,8 @@
salt[2] = '\0';
 #endif
salt_in_len = strlen(salt);
+   } else {
+   salt_in_len = MIN(PHP_MAX_SALT_LEN, salt_in_len);
}

 /* Windows (win32/crypt) has a stripped down version of libxcrypt and

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ crypt.c

[Joey Smith]

joey Tue, 30 Mar 2010 10:10:20 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=297166

Log:
Don't assume the SHA-based crypt constants are registered
this is a partial fix for 51435.

Changed paths:
U   php/php-src/trunk/ext/standard/crypt.c

Modified: php/php-src/trunk/ext/standard/crypt.c
===
--- php/php-src/trunk/ext/standard/crypt.c  2010-03-30 10:09:34 UTC (rev 
297165)
+++ php/php-src/trunk/ext/standard/crypt.c  2010-03-30 10:10:20 UTC (rev 
297166)
@@ -107,10 +107,15 @@
REGISTER_LONG_CONSTANT(CRYPT_EXT_DES, PHP_EXT_DES_CRYPT, CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(CRYPT_MD5, PHP_MD5_CRYPT, CONST_CS | 
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(CRYPT_BLOWFISH, PHP_BLOWFISH_CRYPT, CONST_CS | 
CONST_PERSISTENT);
-   REGISTER_LONG_CONSTANT(CRYPT_SHA256, PHP_SHA256_CRYPT, CONST_CS | 
CONST_PERSISTENT);
-   REGISTER_LONG_CONSTANT(CRYPT_SHA512, PHP_SHA512_CRYPT, CONST_CS | 
CONST_PERSISTENT);

+#ifdef PHP_SHA256_CRYPT
+   REGISTER_LONG_CONSTANT(CRYPT_SHA256, PHP_SHA256_CRYPT, CONST_CS | 
CONST_PERSISTENT);
+#endif

+#ifdef PHP_SHA512_CRYPT
+   REGISTER_LONG_CONSTANT(CRYPT_SHA512, PHP_SHA512_CRYPT, CONST_CS | 
CONST_PERSISTENT);
+#endif
+
 #ifdef PHP_USE_PHP_CRYPT_R
php_init_crypt_r();
 #endif

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php