diff options
| author | tb <> | 2024-02-18 15:45:42 +0000 |
|---|---|---|
| committer | tb <> | 2024-02-18 15:45:42 +0000 |
| commit | ff3e386de60f6149938edb124d31bc2fd7ae04f6 (patch) | |
| tree | 9047d6e85fd9fcd495ed303a0ed1b208200ff841 /src/lib/libcrypto/pkcs7 | |
| parent | f941ba215d7859bf6c6225e88cbbe13260428b8c (diff) | |
| download | openbsd-ff3e386de60f6149938edb124d31bc2fd7ae04f6.tar.gz openbsd-ff3e386de60f6149938edb124d31bc2fd7ae04f6.tar.bz2 openbsd-ff3e386de60f6149938edb124d31bc2fd7ae04f6.zip | |
Use EVP_MD_CTX_legacy_clear() internally
ok jsing
Diffstat (limited to 'src/lib/libcrypto/pkcs7')
| -rw-r--r-- | src/lib/libcrypto/pkcs7/pk7_doit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c index ce0e99eec1..3cc7add66f 100644 --- a/src/lib/libcrypto/pkcs7/pk7_doit.c +++ b/src/lib/libcrypto/pkcs7/pk7_doit.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pk7_doit.c,v 1.55 2024/01/25 13:44:08 tb Exp $ */ | 1 | /* $OpenBSD: pk7_doit.c,v 1.56 2024/02/18 15:45:42 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -711,7 +711,7 @@ PKCS7_dataFinal(PKCS7 *p7, BIO *bio) | |||
| 711 | return 0; | 711 | return 0; |
| 712 | } | 712 | } |
| 713 | 713 | ||
| 714 | EVP_MD_CTX_init(&ctx_tmp); | 714 | EVP_MD_CTX_legacy_clear(&ctx_tmp); |
| 715 | i = OBJ_obj2nid(p7->type); | 715 | i = OBJ_obj2nid(p7->type); |
| 716 | p7->state = PKCS7_S_HEADER; | 716 | p7->state = PKCS7_S_HEADER; |
| 717 | 717 | ||
| @@ -879,7 +879,7 @@ PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si) | |||
| 879 | if (md == NULL) | 879 | if (md == NULL) |
| 880 | return 0; | 880 | return 0; |
| 881 | 881 | ||
| 882 | EVP_MD_CTX_init(&mctx); | 882 | EVP_MD_CTX_legacy_clear(&mctx); |
| 883 | if (EVP_DigestSignInit(&mctx, &pctx, md, NULL, si->pkey) <= 0) | 883 | if (EVP_DigestSignInit(&mctx, &pctx, md, NULL, si->pkey) <= 0) |
| 884 | goto err; | 884 | goto err; |
| 885 | 885 | ||
| @@ -997,7 +997,7 @@ PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si, X509 *x509) | |||
| 997 | BIO *btmp; | 997 | BIO *btmp; |
| 998 | EVP_PKEY *pkey; | 998 | EVP_PKEY *pkey; |
| 999 | 999 | ||
| 1000 | EVP_MD_CTX_init(&mdc_tmp); | 1000 | EVP_MD_CTX_legacy_clear(&mdc_tmp); |
| 1001 | 1001 | ||
| 1002 | if (!PKCS7_type_is_signed(p7) && | 1002 | if (!PKCS7_type_is_signed(p7) && |
| 1003 | !PKCS7_type_is_signedAndEnveloped(p7)) { | 1003 | !PKCS7_type_is_signedAndEnveloped(p7)) { |
