diff options
author | Sverker Eriksson <[email protected]> | 2011-09-28 11:59:22 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2011-09-28 11:59:22 +0200 |
commit | 0843769ab9c3263b368b49b95a8b97478a82dbea (patch) | |
tree | 817ec4dd451b4ce9c8aeb50a1280ba2ef3d187b9 /lib/public_key/src/pubkey_cert.erl | |
parent | df20d15f2229fa5da1c9b7ab8b41b2d706d586f8 (diff) | |
parent | 2fa5d1e5146513f933c584c9bd444b7f03793820 (diff) | |
download | otp-0843769ab9c3263b368b49b95a8b97478a82dbea.tar.gz otp-0843769ab9c3263b368b49b95a8b97478a82dbea.tar.bz2 otp-0843769ab9c3263b368b49b95a8b97478a82dbea.zip |
Merge branch 'dev' into major
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. |