diff options
| author | Matt Caswell <matt@openssl.org> | 2021-01-04 18:29:35 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2021-01-06 12:08:35 +0100 |
| commit | e260bee0a97d4e6de60eae2c86d7c11ed03f2010 (patch) | |
| tree | e51b058105c4ff2d0a47c70611d7609252418756 /providers/implementations | |
| parent | Mac M1 setting change proposal. (diff) | |
| download | openssl-e260bee0a97d4e6de60eae2c86d7c11ed03f2010.tar.xz openssl-e260bee0a97d4e6de60eae2c86d7c11ed03f2010.zip | |
Only perform special TLS handling if TLS has been configured
Skip over special TLS steps for stream ciphers if we haven't been
configured for TLS.
Fixes #12528
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/13774)
Diffstat (limited to 'providers/implementations')
| -rw-r--r-- | providers/implementations/ciphers/ciphercommon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/providers/implementations/ciphers/ciphercommon.c b/providers/implementations/ciphers/ciphercommon.c index 0941210f20..0e3e367dfc 100644 --- a/providers/implementations/ciphers/ciphercommon.c +++ b/providers/implementations/ciphers/ciphercommon.c @@ -429,7 +429,7 @@ int ossl_cipher_generic_stream_update(void *vctx, unsigned char *out, } *outl = inl; - if (!ctx->enc) { + if (!ctx->enc && ctx->tlsversion > 0) { /* * Remove any TLS padding. Only used by cipher_aes_cbc_hmac_sha1_hw.c and * cipher_aes_cbc_hmac_sha256_hw.c |