diff options
| author | Micael Karlberg <[email protected]> | 2011-09-23 14:10:53 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-09-23 14:10:53 +0200 |
| commit | 524ad34276ef31fc5c306943539e3fe9bd19ad8c (patch) | |
| tree | b6d497f9461375b02527bc3d1f10c7a58f3e38e0 /lib/public_key/src/pubkey_cert.erl | |
| parent | 3f9de4601b8539eea14de2d1517f54956e05d03a (diff) | |
| parent | 92657321ac647f343c6b88985d66a2d611fd982d (diff) | |
| download | otp-524ad34276ef31fc5c306943539e3fe9bd19ad8c.tar.gz otp-524ad34276ef31fc5c306943539e3fe9bd19ad8c.tar.bz2 otp-524ad34276ef31fc5c306943539e3fe9bd19ad8c.zip | |
Merge branch 'major' of super:otp into bmk/inets/inets58_integration
Diffstat (limited to 'lib/public_key/src/pubkey_cert.erl')
| -rw-r--r-- | lib/public_key/src/pubkey_cert.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl index 5ab9642279..61082a1ec5 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()) -> {md5 | sha, binary(), binary()}. +-spec verify_data(DER::binary()) -> {md2 | md5 | sha, binary(), binary()}. %% %% Description: Extracts data from DerCert needed to call public_key:verify/4. %%-------------------------------------------------------------------- @@ -378,6 +378,8 @@ digest_type(?sha1WithRSAEncryption) -> sha; digest_type(?md5WithRSAEncryption) -> md5; +digest_type(?md2WithRSAEncryption) -> + md2; digest_type(?'id-dsa-with-sha1') -> sha. |