From: Joey Smith <joey@php.net>
Date: Tue, 30 Mar 2010 10:10:20 +0000 (+0000)
Subject: Don't assume the SHA-based crypt constants are registered
X-Git-Tag: php-5.4.0alpha1~191^2~1832
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6dbebc605b2f732c76fc08956f105f868fad73aa;p=php

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

diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
index a89fd5a10f..471daffbcd 100644
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@ -107,9 +107,14 @@ PHP_MINIT_FUNCTION(crypt) /* {{{ */
 	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();