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/public_key/src/pubkey_cert.erl | |
| 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/public_key/src/pubkey_cert.erl')
| -rw-r--r-- | lib/public_key/src/pubkey_cert.erl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl index 61082a1ec5..5ab9642279 100644 --- a/lib/public_key/src/pubkey_cert.erl +++ b/lib/public_key/src/pubkey_cert.erl @@ -38,7 +38,7 @@ %%==================================================================== %%-------------------------------------------------------------------- --spec verify_data(DER::binary()) -> {md2 | md5 | sha, binary(), binary()}. +-spec verify_data(DER::binary()) -> {md5 | sha, binary(), binary()}. %% %% Description: Extracts data from DerCert needed to call public_key:verify/4. %%-------------------------------------------------------------------- @@ -378,8 +378,6 @@ digest_type(?sha1WithRSAEncryption) -> sha; digest_type(?md5WithRSAEncryption) -> md5; -digest_type(?md2WithRSAEncryption) -> - md2; digest_type(?'id-dsa-with-sha1') -> sha. |