diff options
| author | Matt Caswell <matt@openssl.org> | 2020-06-26 13:05:18 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-07-06 09:26:09 +0100 |
| commit | b5588178232f5cbf32662dfa173c72a001d54aeb (patch) | |
| tree | 687f6d449c4b8e0d54e23a245c415e1c6e4a9468 /ssl/s3_enc.c | |
| parent | 63ee6ec17714f5446a3656083e438ec941bdd542 (diff) | |
Convert SSLv3 handling to use provider side CBC/MAC removal
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12288)
Diffstat (limited to 'ssl/s3_enc.c')
| -rw-r--r-- | ssl/s3_enc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index 5a807d6d57..36b7c7616e 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -241,6 +241,12 @@ int ssl3_change_cipher_state(SSL *s, int which) goto err; } + if (EVP_CIPHER_provider(c) != NULL + && !tls_provider_set_tls_params(s, dd, c, m)) { + /* SSLfatal already called */ + goto err; + } + s->statem.enc_write_state = ENC_WRITE_STATE_VALID; return 1; err: |