aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto/doc/src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-09-20 10:32:59 +0200
committerHenrik Nord <[email protected]>2011-09-20 10:33:04 +0200
commit4b18ef90369c52a9344b851025519f397ccb8543 (patch)
tree59190f15bee6d38bcd9ca54974a429129c51aa1c /lib/crypto/doc/src
parent5b3f4c143cf7c9cd32437bfc9882f6ceb960648e (diff)
parent6cd2fa9346d51ab936873d96b5c96bf5c15ddcf0 (diff)
downloadotp-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/crypto/doc/src')
-rw-r--r--lib/crypto/doc/src/crypto.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 96c4a072e1..b593958264 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -347,7 +347,7 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
</func>
<func>
<name>sha_mac_96(Key, Data) -> Mac</name>
- <fsummary>Compute an <c>MD5 MAC</c>message authentification code</fsummary>
+ <fsummary>Compute an <c>SHA MAC</c>message authentification code</fsummary>
<type>
<v>Key = Data = iolist() | binary()</v>
<v>Mac = binary()</v>
@@ -795,7 +795,7 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
<v>E, N, D = Mpint</v>
<d>Where <c>E</c> is the public exponent, <c>N</c> is public modulus and
<c>D</c> is the private exponent.</d>
- <v>DigestType = md5 | sha</v>
+ <v>DigestType = md2 | md5 | sha</v>
<d>The default <c>DigestType</c> is sha.</d>
<v>Mpint = binary()</v>
<v>Signature = binary()</v>
@@ -817,7 +817,7 @@ Mpint() = <![CDATA[<<ByteLen:32/integer-big, Bytes:ByteLen/binary>>]]>
<v>Key = [E, N]</v>
<v>E, N = Mpint</v>
<d>Where <c>E</c> is the public exponent and <c>N</c> is public modulus.</d>
- <v>DigestType = md5 | sha</v>
+ <v>DigestType = md2 | md5 | sha</v>
<d> The default <c>DigestType</c> is sha.</d>
<v>Mpint = binary()</v>
</type>