diff options
author | Sverker Eriksson <[email protected]> | 2011-09-28 11:49:47 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2011-09-28 11:49:47 +0200 |
commit | 2fa5d1e5146513f933c584c9bd444b7f03793820 (patch) | |
tree | 42bbdbdef3dd595609d7a75a1c85a757c7a2368e /lib/crypto/doc/src | |
parent | b83073436a39553da458b19ef572ded9cd051611 (diff) | |
parent | a474b24b6121ef411a3a3bda3e50cd69b5fbec17 (diff) | |
download | otp-2fa5d1e5146513f933c584c9bd444b7f03793820.tar.gz otp-2fa5d1e5146513f933c584c9bd444b7f03793820.tar.bz2 otp-2fa5d1e5146513f933c584c9bd444b7f03793820.zip |
Merge branch 'sverker/revert-md2-With-RSA-Encryption' into dev
* sverker/revert-md2-With-RSA-Encryption:
Revert "Prepare for release"
Revert "Support md2WithRSAEncryption certificates in public_key"
Revert "Support 'md2' hash in crypto:rsa_sign/3 and crypto:rsa_verify/4"
Diffstat (limited to 'lib/crypto/doc/src')
-rw-r--r-- | lib/crypto/doc/src/crypto.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml index b593958264..4c20f81cae 100644 --- a/lib/crypto/doc/src/crypto.xml +++ b/lib/crypto/doc/src/crypto.xml @@ -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 = md2 | md5 | sha</v> + <v>DigestType = 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 = md2 | md5 | sha</v> + <v>DigestType = md5 | sha</v> <d> The default <c>DigestType</c> is sha.</d> <v>Mpint = binary()</v> </type> |