generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adapt the rest of the source to the removal of (EVP_MD_CTX|HMAC_CTX)_cleanup

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2015-11-30 23:43:27 +01:00
parent 32fd54a9a3
commit eda34e4bef
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/cms/cms_sd.c
View File

@ -728,7 +728,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si)
goto err;
}
EVP_MD_CTX_cleanup(mctx);
EVP_MD_CTX_init(mctx);
ASN1_STRING_set0(si->signature, abuf, siglen);
@ -736,7 +736,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si)
err:
OPENSSL_free(abuf);
EVP_MD_CTX_cleanup(mctx);
EVP_MD_CTX_init(mctx);
return 0;
}
@ -780,7 +780,7 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si)
if (r <= 0)
CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY, CMS_R_VERIFICATION_FAILURE);
err:
EVP_MD_CTX_cleanup(mctx);
EVP_MD_CTX_init(mctx);
return r;
}

4
crypto/evp/p5_crpt2.c
View File

@ -134,7 +134,7 @@ int PKCS5_PBKDF2_HMAC(const char *pass, int passlen,
HMAC_CTX_free(hctx_tpl);
return 0;
}
HMAC_CTX_cleanup(hctx);
HMAC_CTX_init(hctx);
memcpy(p, digtmp, cplen);
for (j = 1; j < iter; j++) {
if (!HMAC_CTX_copy(hctx, hctx_tpl)) {
@ -148,7 +148,7 @@ int PKCS5_PBKDF2_HMAC(const char *pass, int passlen,
HMAC_CTX_free(hctx_tpl);
return 0;
}
HMAC_CTX_cleanup(hctx);
HMAC_CTX_init(hctx);
for (k = 0; k < cplen; k++)
p[k] ^= digtmp[k];
}

2
ssl/record/ssl3_record.c
View File

@ -875,7 +875,7 @@ 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_cleanup(md_ctx);
EVP_MD_CTX_init(md_ctx);
return -1;
}
md_size = md_size_u;

2
ssl/s3_enc.c
View File

@ -518,7 +518,7 @@ int ssl3_final_finish_mac(SSL *s, const char *sender, int len, unsigned char *p)
ret = EVP_MD_CTX_size(ctx);
if (ret < 0) {
EVP_MD_CTX_cleanup(ctx);
EVP_MD_CTX_init(ctx);
return 0;
}

2
test/hmactest.c
View File

@ -193,7 +193,6 @@ int main(int argc, char *argv[])
}
printf("test 4 ok\n");
test5:
HMAC_CTX_cleanup(ctx);
HMAC_CTX_init(ctx);
if (HMAC_Init_ex(ctx, test[4].key, test[4].key_len, NULL, NULL)) {
printf("Should fail to initialise HMAC with empty MD (test 5)\n");
@ -283,7 +282,6 @@ test5:
printf("test 5 ok\n");
}
test6:
HMAC_CTX_cleanup(ctx);
HMAC_CTX_init(ctx);
ctx2 = HMAC_CTX_new();
if (ctx2 == NULL) {

2
test/sha512t.c
View File

@ -132,7 +132,7 @@ int main(int argc, char **argv)
"aaaaaaaa" "aaaaaaaa" "aaaaaaaa" "aaaaaaaa",
(1000000 - i) < 288 ? 1000000 - i : 288);
EVP_DigestFinal_ex(evp, md, NULL);
EVP_MD_CTX_cleanup(evp);
EVP_MD_CTX_init(evp);
if (memcmp(md, app_c3, sizeof(app_c3))) {
fflush(stdout);