diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-11-12 09:41:35 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-11-12 09:41:35 +0100 |
| commit | f70d5092509583d77168b7a2210824d4a7555d18 (patch) | |
| tree | e3f2d48156a11d52d20f58c76c76be5d95dfe53e /lib/ssl/src | |
| parent | 3db47327bf8d58bb3d0f0e28334f156368811401 (diff) | |
| parent | 8cc880c2ef369ff0e2e395927ae71b591cd267c2 (diff) | |
| download | otp-f70d5092509583d77168b7a2210824d4a7555d18.tar.gz otp-f70d5092509583d77168b7a2210824d4a7555d18.tar.bz2 otp-f70d5092509583d77168b7a2210824d4a7555d18.zip | |
Merge branch 'ingela/ssl/rsa-kex-engine/ERIERL-268/OTP-15420' into maint
* ingela/ssl/rsa-kex-engine/ERIERL-268/OTP-15420:
ssl: Add engine handling clause to RSA key exchange
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index dc89fb0029..14df1d2e02 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -925,6 +925,13 @@ premaster_secret(EncSecret, #'RSAPrivateKey'{} = RSAPrivateKey) -> catch _:_ -> throw(?ALERT_REC(?FATAL, ?DECRYPT_ERROR)) + end; +premaster_secret(EncSecret, #{algorithm := rsa} = Engine) -> + try crypto:private_decrypt(rsa, EncSecret, maps:remove(algorithm, Engine), + [{rsa_pad, rsa_pkcs1_padding}]) + catch + _:_ -> + throw(?ALERT_REC(?FATAL, ?DECRYPT_ERROR)) end. %%==================================================================== %% Extensions handling |