]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aadf59d bccd1e6)
Merge branch '5.4'
authorScott MacVicar <scottmac@php.net>
Mon, 11 Jun 2012 23:04:01 +0000 (16:04 -0700)
committerScott MacVicar <scottmac@php.net>
Mon, 11 Jun 2012 23:04:01 +0000 (16:04 -0700)
commitbcd671d999bcb9aac3691c59e632d91575ea87a0
tree14424500797042d71f8465ea6c688198ca53de50tree | snapshot
parentaadf59dfa4be09147671de33786dc157716705dfcommit | diff
parentbccd1e672fabc3c788e93075221d47d9f077b167commit | diff
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
ext/openssl/openssl.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.