diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-11-29 15:40:48 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-11-30 10:33:51 +0100 |
| commit | 3326cab005954dc6ba6c6596f77b5882b77f6be2 (patch) | |
| tree | 084e72999e75eabea8a9b24c009412adcd173931 /lib/public_key | |
| parent | 827dc3c7e13d4ce21315f441c4400fb575f41c20 (diff) | |
| download | otp-3326cab005954dc6ba6c6596f77b5882b77f6be2.tar.gz otp-3326cab005954dc6ba6c6596f77b5882b77f6be2.tar.bz2 otp-3326cab005954dc6ba6c6596f77b5882b77f6be2.zip | |
Fixed guard and test case
Data to sign and verify should be inputed as binaries.
Also cleaned up and moved some dialyzer specs.
Diffstat (limited to 'lib/public_key')
| -rw-r--r-- | lib/public_key/src/public_key.erl | 4 | ||||
| -rw-r--r-- | lib/public_key/test/public_key_SUITE.erl | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl index 64496d6f15..30398df9cc 100644 --- a/lib/public_key/src/public_key.erl +++ b/lib/public_key/src/public_key.erl @@ -287,8 +287,8 @@ encrypt_private(PlainText, #'RSAPrivateKey'{modulus = N, sign(PlainText, DigestType, #'RSAPrivateKey'{modulus = N, publicExponent = E, privateExponent = D}) when is_binary(PlainText), - DigestType == md5; - DigestType == sha -> + (DigestType == md5 orelse + DigestType == sha) -> crypto:rsa_sign(DigestType, sized_binary(PlainText), [crypto:mpint(E), crypto:mpint(N), diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl index 81e01f3a02..88cfbcf2b6 100644 --- a/lib/public_key/test/public_key_SUITE.erl +++ b/lib/public_key/test/public_key_SUITE.erl @@ -249,10 +249,8 @@ sign_verify(Config) when is_list(Config) -> true = public_key:pkix_verify(Cert2, {Y, #'Dss-Parms'{p=P, q=Q, g=G}}), %% RSA sign - Msg0 = lists:duplicate(5, "Foo bar 100"), - Msg = list_to_binary(Msg0), + Msg = list_to_binary(lists:duplicate(5, "Foo bar 100")), - RSASign = public_key:sign(Msg0, sha, PrivateRSA), RSASign = public_key:sign(Msg, sha, PrivateRSA), true = public_key:verify(Msg, sha, RSASign, PublicRSA), false = public_key:verify(<<1:8, Msg/binary>>, sha, RSASign, PublicRSA), |