diff options
author | Henrik Nord <[email protected]> | 2011-09-20 10:32:59 +0200 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2011-09-20 10:33:04 +0200 |
commit | 4b18ef90369c52a9344b851025519f397ccb8543 (patch) | |
tree | 59190f15bee6d38bcd9ca54974a429129c51aa1c /lib/public_key/doc | |
parent | 5b3f4c143cf7c9cd32437bfc9882f6ceb960648e (diff) | |
parent | 6cd2fa9346d51ab936873d96b5c96bf5c15ddcf0 (diff) | |
download | otp-4b18ef90369c52a9344b851025519f397ccb8543.tar.gz otp-4b18ef90369c52a9344b851025519f397ccb8543.tar.bz2 otp-4b18ef90369c52a9344b851025519f397ccb8543.zip |
Merge branch 'cr/md2-With-RSA-Encryption' into dev
* cr/md2-With-RSA-Encryption:
Document crypto:sha_mac_96/2 to compute an SHA MAC, not MD5
Support md2WithRSAEncryption certificates in public_key
Support 'md2' hash in crypto:rsa_sign/3 and crypto:rsa_verify/4
OTP-9554
Diffstat (limited to 'lib/public_key/doc')
-rw-r--r-- | lib/public_key/doc/src/public_key.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml index 9a3832c68b..b3ce49e2ca 100644 --- a/lib/public_key/doc/src/public_key.xml +++ b/lib/public_key/doc/src/public_key.xml @@ -79,7 +79,7 @@ <p><code> rsa_padding() = 'rsa_pkcs1_padding' | 'rsa_pkcs1_oaep_padding' | 'rsa_no_padding'</code></p> - <p><code> rsa_digest_type() = 'md5' | 'sha' </code></p> + <p><code> rsa_digest_type() = 'md2' | 'md5' | 'sha' </code></p> <p><code> dss_digest_type() = 'none' | 'sha' </code></p> |