diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-06-22 18:11:03 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-06-23 23:00:36 +0200 |
| commit | 21dfdbef4965d95d65bfc942aafafd342cb61e4c (patch) | |
| tree | 0109e97fe55d84ca320052636c173d847b2fa134 /ssl/tls13_enc.c | |
| parent | 006de7670a12dff617e86a55b6db7c6e3b1f8fef (diff) | |
Adapt other parts of the source to the changed EVP_Q_digest() and EVP_Q_mac()
Fixes #15839
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15861)
Diffstat (limited to 'ssl/tls13_enc.c')
| -rw-r--r-- | ssl/tls13_enc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c index 11e39715d8..91c4248117 100644 --- a/ssl/tls13_enc.c +++ b/ssl/tls13_enc.c @@ -309,8 +309,7 @@ size_t tls13_final_finish_mac(SSL *s, const char *str, size_t slen, unsigned char hash[EVP_MAX_MD_SIZE]; unsigned char finsecret[EVP_MAX_MD_SIZE]; unsigned char *key = NULL; - unsigned int len = 0; - size_t hashlen, ret = 0; + size_t len = 0, hashlen; OSSL_PARAM params[2], *p = params; /* Safe to cast away const here since we're not "getting" any data */ @@ -345,10 +344,9 @@ size_t tls13_final_finish_mac(SSL *s, const char *str, size_t slen, goto err; } - ret = len; err: OPENSSL_cleanse(finsecret, sizeof(finsecret)); - return ret; + return len; } /* |