diff options
| author | Scott MacVicar <scottmac@php.net> | 2012-06-11 16:04:01 -0700 |
|---|---|---|
| committer | Scott MacVicar <scottmac@php.net> | 2012-06-11 16:04:01 -0700 |
| commit | bcd671d999bcb9aac3691c59e632d91575ea87a0 (patch) | |
| tree | 14424500797042d71f8465ea6c688198ca53de50 /ext/json/php_json.h | |
| parent | aadf59dfa4be09147671de33786dc157716705df (diff) | |
| parent | bccd1e672fabc3c788e93075221d47d9f077b167 (diff) | |
| download | php-git-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
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions