Commit: bcd671d999bcb9aac3691c59e632d91575ea87a0 Author: Scott MacVicar <scott...@php.net> Mon, 11 Jun 2012 16:04:01 -0700 Parents: aadf59dfa4be09147671de33786dc157716705df bccd1e672fabc3c788e93075221d47d9f077b167 Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bcd671d999bcb9aac3691c59e632d91575ea87a0 Log: Merge branch '5.4' * 5.4: Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell. Add PBKDF2 support via openssl() Conflicts: ext/openssl/openssl.c Changed paths: MM ext/openssl/openssl.c Diff: diff --cc ext/openssl/openssl.c index f7db37b,4d482e8..d0ed15e --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@@ -3328,6 -3332,7 +3328,10 @@@ PHP_FUNCTION(openssl_pkey_get_details /* }}} */ #if OPENSSL_VERSION_NUMBER >= 0x10000000L ++<<<<<<< HEAD ++======= + ++>>>>>>> 5.4 /* {{{ 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_pbkdf2) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
