[PHP-CVS] com php-src: Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell.: ext/openssl/CREDITS ext/openssl/openssl.c ext/openssl/php_openssl.h ext/openssl/tests/openssl_p
Commit:b481ebae5503c54f31d73ef0e2243f5ef9025d0d
Author:Scott MacVicar scott...@php.net Mon, 11 Jun 2012 12:38:54
-0700
Parents: 733aaf23b1ba58e1a6abb9c0d00aedf67d143167
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=b481ebae5503c54f31d73ef0e2243f5ef9025d0d
Log:
Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell.
Summary:
Stas pointed out that this is named pretty poorly. Go for openssl_pbkdf2()
Changed paths:
M ext/openssl/CREDITS
M ext/openssl/openssl.c
M ext/openssl/php_openssl.h
A ext/openssl/tests/openssl_pbkdf2.phpt
D ext/openssl/tests/openssl_pkcs5_pbkdf2_hmac.phpt
Diff:
diff --git a/ext/openssl/CREDITS b/ext/openssl/CREDITS
index c2f50d6..b685ce1 100644
--- a/ext/openssl/CREDITS
+++ b/ext/openssl/CREDITS
@@ -1,2 +1,2 @@
OpenSSL
-Stig Venaas, Wez Furlong, Sascha Kettler
+Stig Venaas, Wez Furlong, Sascha Kettler, Scott MacVicar
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 1f515c7..938e0e1 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -239,7 +239,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_openssl_pkey_get_details, 0)
ZEND_END_ARG_INFO()
#if OPENSSL_VERSION_NUMBER = 0x1000L
-ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs5_pbkdf2_hmac, 0, 0, 4)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pbkdf2, 0, 0, 4)
ZEND_ARG_INFO(0, password)
ZEND_ARG_INFO(0, salt)
ZEND_ARG_INFO(0, key_length)
@@ -435,7 +435,7 @@ const zend_function_entry openssl_functions[] = {
PHP_FE(openssl_open,arginfo_openssl_open)
#if OPENSSL_VERSION_NUMBER = 0x1000L
- PHP_FE(openssl_pkcs5_pbkdf2_hmac,
arginfo_openssl_pkcs5_pbkdf2_hmac)
+ PHP_FE(openssl_pbkdf2, arginfo_openssl_pbkdf2)
#endif
/* for S/MIME handling */
@@ -3329,9 +3329,9 @@ PHP_FUNCTION(openssl_pkey_get_details)
#if OPENSSL_VERSION_NUMBER = 0x1000L
-/* {{{ proto string openssl_pkcs5_pbkdf2_hmac(string password, string salt,
long key_length, long iterations [, string digest_method = sha1])
+/* {{{ proto string openssl_pbkdf2(string password, string salt, long
key_length, long iterations [, string digest_method = sha1])
Generates a PKCS5 v2 PBKDF2 string, defaults to sha1 */
-PHP_FUNCTION(openssl_pkcs5_pbkdf2_hmac)
+PHP_FUNCTION(openssl_pbkdf2)
{
long key_length = 0, iterations = 0;
char *password; int password_len;
diff --git a/ext/openssl/php_openssl.h b/ext/openssl/php_openssl.h
index 0dbe7d2..2de211a 100644
--- a/ext/openssl/php_openssl.h
+++ b/ext/openssl/php_openssl.h
@@ -52,7 +52,7 @@ PHP_FUNCTION(openssl_private_decrypt);
PHP_FUNCTION(openssl_public_encrypt);
PHP_FUNCTION(openssl_public_decrypt);
-PHP_FUNCTION(openssl_pkcs5_pbkdf2_hmac);
+PHP_FUNCTION(openssl_pbkdf2);
PHP_FUNCTION(openssl_pkcs7_verify);
PHP_FUNCTION(openssl_pkcs7_decrypt);
diff --git a/ext/openssl/tests/openssl_pbkdf2.phpt
b/ext/openssl/tests/openssl_pbkdf2.phpt
new file mode 100644
index 000..3ec4dce
--- /dev/null
+++ b/ext/openssl/tests/openssl_pbkdf2.phpt
@@ -0,0 +1,26 @@
+--TEST--
+openssl_pbkdf2() tests
+--SKIPIF--
+?php if (!extension_loaded(openssl) || !function_exists(openssl_pbkdf2))
print skip; ?
+--FILE--
+?php
+// official test vectors
+var_dump(bin2hex(openssl_pbkdf2('password', 'salt', 20, 1)));
+var_dump(bin2hex(openssl_pbkdf2('password', 'salt', 20, 2)));
+var_dump(bin2hex(openssl_pbkdf2('password', 'salt', 20, 4096)));
+
+/* really slow but should be:
+string(40) eefe3d61cd4da4e4e9945b3d6ba2158c2634e984
+var_dump(bin2hex(openssl_pbkdf2('password', 'salt', 20, 16777216)));
+*/
+
+var_dump(bin2hex(openssl_pbkdf2('passwordPASSWORDpassword',
'saltSALTsaltSALTsaltSALTsaltSALTsalt', 25, 4096)));
+var_dump(bin2hex(openssl_pbkdf2(pass\0word, sa\0lt, 16, 4096)));
+
+?
+--EXPECTF--
+string(40) 0c60c80f961f0e71f3a9b524af6012062fe037a6
+string(40) ea6c014dc72d6f8ccd1ed92ace1d41f0d8de8957
+string(40) 4b007901b765489abead49d926f721d065a429c1
+string(50) 3d2eec4fe41c849b80c8d83662c0e44a8b291a964cf2f07038
+string(32) 56fa6aa75548099dcc37d7f03425e0c3
diff --git a/ext/openssl/tests/openssl_pkcs5_pbkdf2_hmac.phpt
b/ext/openssl/tests/openssl_pkcs5_pbkdf2_hmac.phpt
deleted file mode 100644
index af1fcb1..000
--- a/ext/openssl/tests/openssl_pkcs5_pbkdf2_hmac.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-openssl_pkcs5_pbkdf2_hmac() tests
---SKIPIF--
-?php if (!extension_loaded(openssl) ||
!function_exists(openssl_pkcs5_pbkdf2_hmac)) print skip; ?
---FILE--
-?php
-// official test vectors
-var_dump(bin2hex(openssl_pkcs5_pbkdf2_hmac('password', 'salt', 20, 1)));
-var_dump(bin2hex(openssl_pkcs5_pbkdf2_hmac('password', 'salt', 20, 2)));
-var_dump(bin2hex(openssl_pkcs5_pbkdf2_hmac('password', 'salt', 20, 4096)));
-
-/* really slow but should be:
-string(40) eefe3d61cd4da4e4e9945b3d6ba2158c2634e984
-var_dump(bin2hex(openssl_pkcs5_pbkdf2_hmac('password', 'salt', 20, 16777216)));
-*/
-
[PHP-CVS] com php-src: Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell.: ext/openssl/CREDITS ext/openssl/openssl.c ext/openssl/php_openssl.h ext/openssl/tests/openssl_p
Commit:bccd1e672fabc3c788e93075221d47d9f077b167
Author:Scott MacVicar scott...@php.net Mon, 11 Jun 2012 12:38:54
-0700
Parents: b5b8ea1050837fba5a6cee55e41b4574ed64158e
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=bccd1e672fabc3c788e93075221d47d9f077b167
Log:
Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell.
Summary:
Stas pointed out that this is named pretty poorly. Go for openssl_pbkdf2()
Changed paths:
M ext/openssl/CREDITS
M ext/openssl/openssl.c
M ext/openssl/php_openssl.h
A ext/openssl/tests/openssl_pbkdf2.phpt
D ext/openssl/tests/openssl_pkcs5_pbkdf2_hmac.phpt
Diff:
diff --git a/ext/openssl/CREDITS b/ext/openssl/CREDITS
index c2f50d6..b685ce1 100644
--- a/ext/openssl/CREDITS
+++ b/ext/openssl/CREDITS
@@ -1,2 +1,2 @@
OpenSSL
-Stig Venaas, Wez Furlong, Sascha Kettler
+Stig Venaas, Wez Furlong, Sascha Kettler, Scott MacVicar
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 28f7618..4d482e8 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -243,7 +243,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_openssl_pkey_get_details, 0)
ZEND_END_ARG_INFO()
#if OPENSSL_VERSION_NUMBER = 0x1000L
-ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs5_pbkdf2_hmac, 0, 0, 4)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pbkdf2, 0, 0, 4)
ZEND_ARG_INFO(0, password)
ZEND_ARG_INFO(0, salt)
ZEND_ARG_INFO(0, key_length)
@@ -439,7 +439,7 @@ const zend_function_entry openssl_functions[] = {
PHP_FE(openssl_open,arginfo_openssl_open)
#if OPENSSL_VERSION_NUMBER = 0x1000L
- PHP_FE(openssl_pkcs5_pbkdf2_hmac,
arginfo_openssl_pkcs5_pbkdf2_hmac)
+ PHP_FE(openssl_pbkdf2, arginfo_openssl_pbkdf2)
#endif
/* for S/MIME handling */
@@ -,9 +,9 @@ PHP_FUNCTION(openssl_pkey_get_details)
#if OPENSSL_VERSION_NUMBER = 0x1000L
-/* {{{ proto string openssl_pkcs5_pbkdf2_hmac(string password, string salt,
long key_length, long iterations [, string digest_method = sha1])
+/* {{{ proto string openssl_pbkdf2(string password, string salt, long
key_length, long iterations [, string digest_method = sha1])
Generates a PKCS5 v2 PBKDF2 string, defaults to sha1 */
-PHP_FUNCTION(openssl_pkcs5_pbkdf2_hmac)
+PHP_FUNCTION(openssl_pbkdf2)
{
long key_length = 0, iterations = 0;
char *password; int password_len;
diff --git a/ext/openssl/php_openssl.h b/ext/openssl/php_openssl.h
index 0dbe7d2..2de211a 100644
--- a/ext/openssl/php_openssl.h
+++ b/ext/openssl/php_openssl.h
@@ -52,7 +52,7 @@ PHP_FUNCTION(openssl_private_decrypt);
PHP_FUNCTION(openssl_public_encrypt);
PHP_FUNCTION(openssl_public_decrypt);
-PHP_FUNCTION(openssl_pkcs5_pbkdf2_hmac);
+PHP_FUNCTION(openssl_pbkdf2);
PHP_FUNCTION(openssl_pkcs7_verify);
PHP_FUNCTION(openssl_pkcs7_decrypt);
diff --git a/ext/openssl/tests/openssl_pbkdf2.phpt
b/ext/openssl/tests/openssl_pbkdf2.phpt
new file mode 100644
index 000..3ec4dce
--- /dev/null
+++ b/ext/openssl/tests/openssl_pbkdf2.phpt
@@ -0,0 +1,26 @@
+--TEST--
+openssl_pbkdf2() tests
+--SKIPIF--
+?php if (!extension_loaded(openssl) || !function_exists(openssl_pbkdf2))
print skip; ?
+--FILE--
+?php
+// official test vectors
+var_dump(bin2hex(openssl_pbkdf2('password', 'salt', 20, 1)));
+var_dump(bin2hex(openssl_pbkdf2('password', 'salt', 20, 2)));
+var_dump(bin2hex(openssl_pbkdf2('password', 'salt', 20, 4096)));
+
+/* really slow but should be:
+string(40) eefe3d61cd4da4e4e9945b3d6ba2158c2634e984
+var_dump(bin2hex(openssl_pbkdf2('password', 'salt', 20, 16777216)));
+*/
+
+var_dump(bin2hex(openssl_pbkdf2('passwordPASSWORDpassword',
'saltSALTsaltSALTsaltSALTsaltSALTsalt', 25, 4096)));
+var_dump(bin2hex(openssl_pbkdf2(pass\0word, sa\0lt, 16, 4096)));
+
+?
+--EXPECTF--
+string(40) 0c60c80f961f0e71f3a9b524af6012062fe037a6
+string(40) ea6c014dc72d6f8ccd1ed92ace1d41f0d8de8957
+string(40) 4b007901b765489abead49d926f721d065a429c1
+string(50) 3d2eec4fe41c849b80c8d83662c0e44a8b291a964cf2f07038
+string(32) 56fa6aa75548099dcc37d7f03425e0c3
diff --git a/ext/openssl/tests/openssl_pkcs5_pbkdf2_hmac.phpt
b/ext/openssl/tests/openssl_pkcs5_pbkdf2_hmac.phpt
deleted file mode 100644
index af1fcb1..000
--- a/ext/openssl/tests/openssl_pkcs5_pbkdf2_hmac.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-openssl_pkcs5_pbkdf2_hmac() tests
---SKIPIF--
-?php if (!extension_loaded(openssl) ||
!function_exists(openssl_pkcs5_pbkdf2_hmac)) print skip; ?
---FILE--
-?php
-// official test vectors
-var_dump(bin2hex(openssl_pkcs5_pbkdf2_hmac('password', 'salt', 20, 1)));
-var_dump(bin2hex(openssl_pkcs5_pbkdf2_hmac('password', 'salt', 20, 2)));
-var_dump(bin2hex(openssl_pkcs5_pbkdf2_hmac('password', 'salt', 20, 4096)));
-
-/* really slow but should be:
-string(40) eefe3d61cd4da4e4e9945b3d6ba2158c2634e984
-var_dump(bin2hex(openssl_pkcs5_pbkdf2_hmac('password', 'salt', 20, 16777216)));
-*/
-
