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

diff --cc ext/openssl/openssl.c
index f7db37b065dbeb502bab301116091d62524abf22,4d482e8a279a8fbf1ba568f1249a57759bf6d30f..d0ed15e44bb6961e68be543c3dc2a857255a5809
--- 1/ext/openssl/openssl.c
--- 2/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)