summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott MacVicar <scottmac@php.net>2012-06-11 23:04:01 (GMT)
committerScott MacVicar <scottmac@php.net>2012-06-11 23:04:01 (GMT)
commitbcd671d999bcb9aac3691c59e632d91575ea87a0 (patch)
tree14424500797042d71f8465ea6c688198ca53de50
parentaadf59dfa4be09147671de33786dc157716705df (diff)
parentbccd1e672fabc3c788e93075221d47d9f077b167 (diff)
downloadphp-bcd671d999bcb9aac3691c59e632d91575ea87a0.tar.gz
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
-rw-r--r--ext/openssl/openssl.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index f7db37b..d0ed15e 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -3328,6 +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)