summaryrefslogtreecommitdiff
path: root/ext/json/php_json.h
diff options
context:
space:
mode:
authorScott MacVicar <scottmac@php.net>2012-06-11 00:16:30 -0700
committerScott MacVicar <scottmac@php.net>2012-06-11 13:35:25 -0700
commitb5b8ea1050837fba5a6cee55e41b4574ed64158e (patch)
tree0bb6020faf9fbb968dcc25c7f197190be1914b0f /ext/json/php_json.h
parenta18cede1c5094d5255daeb99cd6debe09938399d (diff)
downloadphp-git-b5b8ea1050837fba5a6cee55e41b4574ed64158e.tar.gz
Add PBKDF2 support via openssl()
Summary: No easy way to put these in the hash extension since we don't really support optional parameters to certain algorithms. Implemented in openssl for now since it has it already and is pretty stable. Only SHA1 is confirmed to work as an algorithm but openssl has a parameter so it can be changed in the future. Will backport to 5.4 potentially with Stas' approval. Test Plan: Ran newly added tests which came from RFC 6070
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions