[Pkg-php-commits] [php/debian-squeeze] Fix regression with missing CRYPT_SALT_LENGTH (Closes: #603012)
Ondřej Surý
ondrej at sury.org
Sat May 14 09:35:41 UTC 2011
---
debian/patches/php_crypt_revamped.patch | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/debian/patches/php_crypt_revamped.patch b/debian/patches/php_crypt_revamped.patch
index adea8b5..4499a19 100644
--- a/debian/patches/php_crypt_revamped.patch
+++ b/debian/patches/php_crypt_revamped.patch
@@ -183,7 +183,7 @@
#endif
#if TM_IN_SYS_TIME
#include <sys/time.h>
-@@ -64,56 +63,49 @@
+@@ -64,56 +63,50 @@
* PHP_EXT_DES_CRYPT, PHP_MD5_CRYPT and PHP_BLOWFISH_CRYPT as appropriate
* for the target platform. */
@@ -236,7 +236,7 @@
-#define PHP_STD_DES_CRYPT 1
-#endif
+/*
-+ * Maximum salt length is from Blowfish
++ * Maximum salt length is from SHA512
+ * Maximum hash length is from SHA512
+ */
+#define PHP_MAX_SALT_LEN 37
@@ -246,7 +246,7 @@
PHP_MINIT_FUNCTION(crypt) /* {{{ */
{
-- REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", PHP_MAX_SALT_LEN, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", PHP_MAX_SALT_LEN, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("CRYPT_STD_DES", PHP_STD_DES_CRYPT, CONST_CS | CONST_PERSISTENT);
- 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);
@@ -267,7 +267,7 @@
#endif
#if PHP_USE_PHP_CRYPT_R
-@@ -124,15 +116,15 @@ PHP_MINIT_FUNCTION(crypt) /* {{{ */
+@@ -124,15 +117,15 @@ PHP_MINIT_FUNCTION(crypt) /* {{{ */
}
/* }}} */
@@ -285,7 +285,7 @@
static unsigned char itoa64[] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-@@ -150,158 +142,171 @@ static void php_to64(char *s, long v, in
+@@ -150,158 +143,171 @@ static void php_to64(char *s, long v, in
PHP_FUNCTION(crypt)
{
char salt[PHP_MAX_SALT_LEN + 1];
--
1.7.1
More information about the Pkg-php-commits
mailing list