Commit: 5b3c9f4fd1fbaa251beea37ff7870f6523320672 Author: Scott MacVicar <scott...@php.net> Mon, 11 Jun 2012 16:23:27 -0700 Parents: bcd671d999bcb9aac3691c59e632d91575ea87a0 Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5b3c9f4fd1fbaa251beea37ff7870f6523320672 Log: One more time Changed paths: M ext/openssl/openssl.c Diff: diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index d0ed15e..938e0e1 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -3328,10 +3328,7 @@ 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
