diff options
| -rw-r--r-- | ssl/record/ssl3_record.c | 4 | ||||
| -rw-r--r-- | ssl/s3_cbc.c | 18 | ||||
| -rw-r--r-- | ssl/ssl_local.h | 3 |
3 files changed, 16 insertions, 9 deletions
diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c index a5ef78dec9..23bbc952ee 100644 --- a/ssl/record/ssl3_record.c +++ b/ssl/record/ssl3_record.c @@ -1270,7 +1270,7 @@ int n_ssl3_mac(SSL *ssl, SSL3_RECORD *rec, unsigned char *md, int sending) header[j++] = (unsigned char)(rec->length & 0xff); /* Final param == is SSLv3 */ - if (ssl3_cbc_digest_record(hash, + if (ssl3_cbc_digest_record(ssl, hash, md, &md_size, header, rec->input, rec->length + md_size, rec->orig_len, @@ -1374,7 +1374,7 @@ int tls1_mac(SSL *ssl, SSL3_RECORD *rec, unsigned char *md, int sending) * are hashing because that gives an attacker a timing-oracle. */ /* Final param == not SSLv3 */ - if (ssl3_cbc_digest_record(mac_ctx, + if (ssl3_cbc_digest_record(ssl, mac_ctx, md, &md_size, header, rec->input, rec->length + md_size, rec->orig_len, diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c index 888ff3c2f6..bbc24cc6d1 100644 --- a/ssl/s3_cbc.c +++ b/ssl/s3_cbc.c @@ -131,7 +131,8 @@ char ssl3_cbc_record_digest_supported(const EVP_MD_CTX *ctx) * padding too. ) * Returns 1 on success or 0 on error */ -int ssl3_cbc_digest_record(const EVP_MD_CTX *ctx, +int ssl3_cbc_digest_record(SSL *s, + const EVP_MD_CTX *ctx, unsigned char *md_out, size_t *md_out_size, const unsigned char header[13], @@ -166,7 +167,8 @@ int ssl3_cbc_digest_record(const EVP_MD_CTX *ctx, */ size_t md_length_size = 8; char length_is_big_endian = 1; - int ret; + int ret = 0; + const EVP_MD *md = NULL; /* * This is a, hopefully redundant, check that allows us to forget about @@ -461,7 +463,11 @@ int ssl3_cbc_digest_record(const EVP_MD_CTX *ctx, md_ctx = EVP_MD_CTX_new(); if (md_ctx == NULL) goto err; - if (EVP_DigestInit_ex(md_ctx, EVP_MD_CTX_md(ctx), NULL /* engine */ ) <= 0) + md = ssl_evp_md_fetch(s->ctx->libctx, EVP_MD_type(EVP_MD_CTX_md(ctx)), + s->ctx->propq); + if (md == NULL) + goto err; + if (EVP_DigestInit_ex(md_ctx, md, NULL /* engine */ ) <= 0) goto err; if (is_sslv3) { /* We repurpose |hmac_pad| to contain the SSLv3 pad2 block. */ @@ -484,10 +490,10 @@ int ssl3_cbc_digest_record(const EVP_MD_CTX *ctx, ret = EVP_DigestFinal(md_ctx, md_out, &md_out_size_u); if (ret && md_out_size) *md_out_size = md_out_size_u; - EVP_MD_CTX_free(md_ctx); - return 1; + ret = 1; err: EVP_MD_CTX_free(md_ctx); - return 0; + ssl_evp_md_free(md); + return ret; } diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h index d8b25bb4e8..22cae481e1 100644 --- a/ssl/ssl_local.h +++ b/ssl/ssl_local.h @@ -2713,7 +2713,8 @@ __owur int ssl_log_secret(SSL *ssl, const char *label, /* s3_cbc.c */ __owur char ssl3_cbc_record_digest_supported(const EVP_MD_CTX *ctx); -__owur int ssl3_cbc_digest_record(const EVP_MD_CTX *ctx, +__owur int ssl3_cbc_digest_record(SSL *s, + const EVP_MD_CTX *ctx, unsigned char *md_out, size_t *md_out_size, const unsigned char header[13], |