From: Scott MacVicar <scottmac@php.net>
Date: Mon, 11 Jun 2012 23:04:01 +0000 (-0700)
Subject: Merge branch '5.4'
X-Git-Tag: php-5.5.0alpha1~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bcd671d999bcb9aac3691c59e632d91575ea87a0;p=php

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
---

bcd671d999bcb9aac3691c59e632d91575ea87a0
diff --cc ext/openssl/openssl.c
index f7db37b065,4d482e8a27..d0ed15e44b
--- 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)