mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 18:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell."

Browse Source 
This reverts commit bccd1e672f.
Looks like we don't have agreement yet on this for 5.4. Let's keep it in 5.5 for now.
This commit is contained in:
Stanislav Malyshev 2012-06-12 11:21:54 -07:00
parent f8cc363841
commit a2bfad051d
5 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/openssl/CREDITS
View File

@ -1,2 +1,2 @@
OpenSSL
Stig Venaas, Wez Furlong, Sascha Kettler, Scott MacVicar
Stig Venaas, Wez Furlong, Sascha Kettler

8
ext/openssl/openssl.c
View File

@ -243,7 +243,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_openssl_pkey_get_details, 0)
ZEND_END_ARG_INFO()
#if OPENSSL_VERSION_NUMBER >= 0x10000000L
ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pbkdf2, 0, 0, 4)
ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs5_pbkdf2_hmac, 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 >= 0x10000000L
PHP_FE(openssl_pbkdf2, arginfo_openssl_pbkdf2)
PHP_FE(openssl_pkcs5_pbkdf2_hmac, arginfo_openssl_pkcs5_pbkdf2_hmac)
#endif
/* for S/MIME handling */
@ -3333,9 +3333,9 @@ PHP_FUNCTION(openssl_pkey_get_details)
#if OPENSSL_VERSION_NUMBER >= 0x10000000L
/* {{{ proto string openssl_pbkdf2(string password, string salt, long key_length, long iterations [, string digest_method = "sha1"])
/* {{{ proto string openssl_pkcs5_pbkdf2_hmac(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_pbkdf2)
PHP_FUNCTION(openssl_pkcs5_pbkdf2_hmac)
{
long key_length = 0, iterations = 0;
char *password; int password_len;

2
ext/openssl/php_openssl.h
View File

@ -52,7 +52,7 @@ PHP_FUNCTION(openssl_private_decrypt);
PHP_FUNCTION(openssl_public_encrypt);
PHP_FUNCTION(openssl_public_decrypt);
PHP_FUNCTION(openssl_pbkdf2);
PHP_FUNCTION(openssl_pkcs5_pbkdf2_hmac);
PHP_FUNCTION(openssl_pkcs7_verify);
PHP_FUNCTION(openssl_pkcs7_decrypt);

26
ext/openssl/tests/openssl_pbkdf2.phpt
View File

@ -1,26 +0,0 @@
--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"

26
ext/openssl/tests/openssl_pkcs5_pbkdf2_hmac.phpt Normal file
View File

@ -0,0 +1,26 @@
--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)));
*/
var_dump(bin2hex(openssl_pkcs5_pbkdf2_hmac('passwordPASSWORDpassword', 'saltSALTsaltSALTsaltSALTsaltSALTsalt', 25, 4096)));
var_dump(bin2hex(openssl_pkcs5_pbkdf2_hmac("pass\0word", "sa\0lt", 16, 4096)));
?>
--EXPECTF--
string(40) "0c60c80f961f0e71f3a9b524af6012062fe037a6"
string(40) "ea6c014dc72d6f8ccd1ed92ace1d41f0d8de8957"
string(40) "4b007901b765489abead49d926f721d065a429c1"
string(50) "3d2eec4fe41c849b80c8d83662c0e44a8b291a964cf2f07038"
string(32) "56fa6aa75548099dcc37d7f03425e0c3"