diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-06-10 09:48:21 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-06-10 09:48:21 +0200 |
| commit | 202016c4a726c83052d1fac489ac044dd6f5be46 (patch) | |
| tree | 6254210251bee1b9b63b70e8627e1176e7a014f8 /lib/public_key | |
| parent | 82c0b47317b4b71412d7ff7bd632b1f574d056c6 (diff) | |
| parent | 82a435ca0f91782ebd39b237d56426277ffeda80 (diff) | |
| download | otp-202016c4a726c83052d1fac489ac044dd6f5be46.tar.gz otp-202016c4a726c83052d1fac489ac044dd6f5be46.tar.bz2 otp-202016c4a726c83052d1fac489ac044dd6f5be46.zip | |
Merge branch 'ia/ssl/public_key/warnings' into maint
* ia/ssl/public_key/warnings:
ssl: Correct rebase mistakes
Diffstat (limited to 'lib/public_key')
| -rw-r--r-- | lib/public_key/src/public_key.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl index 3eea6f6ec4..cdbfe6e07c 100644 --- a/lib/public_key/src/public_key.erl +++ b/lib/public_key/src/public_key.erl @@ -252,8 +252,7 @@ decrypt_private(CipherText, Key) -> decrypt_private(CipherText, Key, []). decrypt_private(CipherText, - #'RSAPrivateKey'{modulus = N, publicExponent = E, - privateExponent = D} = Key, + #'RSAPrivateKey'{} = Key, Options) when is_binary(CipherText), is_list(Options) -> |