diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-12-02 00:49:35 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-12-07 17:40:20 +0100 |
| commit | bfb0641f932490c2e7fb5f9f7cb4a88017a5abfa (patch) | |
| tree | 6b6b0a9dfe55b4b3a2e5961ed1778dd156128f35 /ssl/record/ssl3_record.c | |
| parent | 959ed5316c84d0e12ad18acfd40cefe15603ddfb (diff) | |
| download | openssl-bfb0641f932490c2e7fb5f9f7cb4a88017a5abfa.zip openssl-bfb0641f932490c2e7fb5f9f7cb4a88017a5abfa.tar.gz openssl-bfb0641f932490c2e7fb5f9f7cb4a88017a5abfa.tar.bz2 | |
Cleanup: fix all sources that used EVP_MD_CTX_(create|init|destroy)
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl/record/ssl3_record.c')
| -rw-r--r-- | ssl/record/ssl3_record.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c index 02424f1..99c655e 100644 --- a/ssl/record/ssl3_record.c +++ b/ssl/record/ssl3_record.c @@ -854,7 +854,7 @@ int n_ssl3_mac(SSL *ssl, unsigned char *md, int send) } else { unsigned int md_size_u; /* Chop the digest off the end :-) */ - EVP_MD_CTX *md_ctx = EVP_MD_CTX_create(); + EVP_MD_CTX *md_ctx = EVP_MD_CTX_new(); if (md_ctx == NULL) return -1; @@ -875,12 +875,12 @@ int n_ssl3_mac(SSL *ssl, unsigned char *md, int send) || EVP_DigestUpdate(md_ctx, ssl3_pad_2, npad) <= 0 || EVP_DigestUpdate(md_ctx, md, md_size) <= 0 || EVP_DigestFinal_ex(md_ctx, md, &md_size_u) <= 0) { - EVP_MD_CTX_init(md_ctx); + EVP_MD_CTX_reset(md_ctx); return -1; } md_size = md_size_u; - EVP_MD_CTX_destroy(md_ctx); + EVP_MD_CTX_free(md_ctx); } ssl3_record_sequence_update(seq); @@ -918,7 +918,7 @@ int tls1_mac(SSL *ssl, unsigned char *md, int send) if (stream_mac) { mac_ctx = hash; } else { - hmac = EVP_MD_CTX_create(); + hmac = EVP_MD_CTX_new(); if (hmac == NULL || !EVP_MD_CTX_copy(hmac, hash)) return -1; @@ -957,14 +957,14 @@ int tls1_mac(SSL *ssl, unsigned char *md, int send) rec->length + md_size, rec->orig_len, ssl->s3->read_mac_secret, ssl->s3->read_mac_secret_size, 0) <= 0) { - EVP_MD_CTX_destroy(hmac); + EVP_MD_CTX_free(hmac); return -1; } } else { if (EVP_DigestSignUpdate(mac_ctx, header, sizeof(header)) <= 0 || EVP_DigestSignUpdate(mac_ctx, rec->input, rec->length) <= 0 || EVP_DigestSignFinal(mac_ctx, md, &md_size) <= 0) { - EVP_MD_CTX_destroy(hmac); + EVP_MD_CTX_free(hmac); return -1; } if (!send && !SSL_USE_ETM(ssl) && FIPS_mode()) @@ -973,7 +973,7 @@ int tls1_mac(SSL *ssl, unsigned char *md, int send) rec->length, rec->orig_len); } - EVP_MD_CTX_destroy(hmac); + EVP_MD_CTX_free(hmac); #ifdef TLS_DEBUG fprintf(stderr, "seq="); |