diff options
| author | Stanislav Malyshev <stas@php.net> | 2012-06-12 11:21:54 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2012-06-12 11:21:54 -0700 |
| commit | a2bfad051df022058f19afc5f09fd835cbbcf145 (patch) | |
| tree | cf16283f3987a8ffffe57c3340a3095eaf1dd6db /ext/openssl/php_openssl.h | |
| parent | f8cc363841ecd126c0c43f2773e4d85a54b8484c (diff) | |
| download | php-git-a2bfad051df022058f19afc5f09fd835cbbcf145.tar.gz | |
Revert "Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell."
This reverts commit bccd1e672fabc3c788e93075221d47d9f077b167.
Looks like we don't have agreement yet on this for 5.4. Let's keep it in 5.5 for now.
Diffstat (limited to 'ext/openssl/php_openssl.h')
| -rw-r--r-- | ext/openssl/php_openssl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/php_openssl.h b/ext/openssl/php_openssl.h index 2de211a64c..0dbe7d2887 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_pbkdf2); +PHP_FUNCTION(openssl_pkcs5_pbkdf2_hmac); PHP_FUNCTION(openssl_pkcs7_verify); PHP_FUNCTION(openssl_pkcs7_decrypt); |