joey Tue, 30 Mar 2010 10:10:20 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=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
