aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/src/public_key.erl
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2011-09-20 20:40:49 +0200
committerSverker Eriksson <[email protected]>2011-09-21 16:08:04 +0200
commit88653c79b3a6b8fe51e60d4b300ded1db041c181 (patch)
tree77e2cfefc2339a9a4ed900165ef7066b6a2ffb22 /lib/public_key/src/public_key.erl
parent8d44ffaa66bf096a6679a7720f1f85af33f82668 (diff)
downloadotp-88653c79b3a6b8fe51e60d4b300ded1db041c181.tar.gz
otp-88653c79b3a6b8fe51e60d4b300ded1db041c181.tar.bz2
otp-88653c79b3a6b8fe51e60d4b300ded1db041c181.zip
Revert "Support md2WithRSAEncryption certificates in public_key"
This reverts commit c7e5f7576e213060cbb332be64a7c3798f6a2cc2.
Diffstat (limited to 'lib/public_key/src/public_key.erl')
-rw-r--r--lib/public_key/src/public_key.erl10
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index 940efffcd0..33fcce2c44 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -55,7 +55,7 @@
-type rsa_padding() :: 'rsa_pkcs1_padding' | 'rsa_pkcs1_oaep_padding'
| 'rsa_no_padding'.
-type public_crypt_options() :: [{rsa_pad, rsa_padding()}].
--type rsa_digest_type() :: 'md2' | 'md5' | 'sha'.
+-type rsa_digest_type() :: 'md5' | 'sha'.
-type dss_digest_type() :: 'none' | 'sha'.
-define(UINT32(X), X:32/unsigned-big-integer).
@@ -307,8 +307,7 @@ encrypt_private(PlainText, #'RSAPrivateKey'{modulus = N,
sign(PlainText, DigestType, #'RSAPrivateKey'{modulus = N, publicExponent = E,
privateExponent = D})
when is_binary(PlainText),
- (DigestType == md2 orelse
- DigestType == md5 orelse
+ (DigestType == md5 orelse
DigestType == sha) ->
crypto:rsa_sign(DigestType, sized_binary(PlainText), [crypto:mpint(E),
@@ -336,10 +335,7 @@ sign(PlainText, sha, #'DSAPrivateKey'{p = P, q = Q, g = G, x = X})
%%--------------------------------------------------------------------
verify(PlainText, DigestType, Signature,
#'RSAPublicKey'{modulus = Mod, publicExponent = Exp})
- when is_binary(PlainText),
- (DigestType == md2 orelse
- DigestType == md5 orelse
- DigestType == sha) ->
+ when is_binary (PlainText), DigestType == sha; DigestType == md5 ->
crypto:rsa_verify(DigestType,
sized_binary(PlainText),
sized_binary(Signature),