From ab0a14bbc7bc7cdda4cfb2b2a730804b3437429f Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 30 Nov 2015 10:25:36 +0100 Subject: [PATCH] Add inclusion of internal/evp_int.h to all crypto/ files that need it These are the files that add new EVP_MDs. Reviewed-by: Rich Salz --- crypto/asn1/a_sign.c | 1 + crypto/asn1/asn_mime.c | 1 + crypto/asn1/x_algor.c | 1 + crypto/evp/bio_md.c | 1 + crypto/evp/bio_ok.c | 1 + crypto/evp/digest.c | 1 + crypto/evp/m_md4.c | 1 + crypto/evp/m_md5.c | 1 + crypto/evp/m_md5_sha1.c | 1 + crypto/evp/m_mdc2.c | 1 + crypto/evp/m_null.c | 1 + crypto/evp/m_ripemd.c | 1 + crypto/evp/m_sha1.c | 1 + crypto/evp/m_wp.c | 1 + crypto/evp/names.c | 1 + crypto/evp/p_sign.c | 3 ++- crypto/evp/p_verify.c | 3 ++- 17 files changed, 19 insertions(+), 2 deletions(-) diff --git a/crypto/asn1/a_sign.c b/crypto/asn1/a_sign.c index a3abdc47fc..ee9f66c396 100644 --- a/crypto/asn1/a_sign.c +++ b/crypto/asn1/a_sign.c @@ -124,6 +124,7 @@ #include #include #include "internal/asn1_int.h" +#include "internal/evp_int.h" #ifndef NO_ASN1_OLD diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c index 12f6fd67af..53690999b4 100644 --- a/crypto/asn1/asn_mime.c +++ b/crypto/asn1/asn_mime.c @@ -60,6 +60,7 @@ #include #include #include +#include "internal/evp_int.h" #include "asn1_locl.h" /* diff --git a/crypto/asn1/x_algor.c b/crypto/asn1/x_algor.c index ca2749179f..5ad63eb90d 100644 --- a/crypto/asn1/x_algor.c +++ b/crypto/asn1/x_algor.c @@ -61,6 +61,7 @@ #include #include #include +#include "internal/evp_int.h" ASN1_SEQUENCE(X509_ALGOR) = { ASN1_SIMPLE(X509_ALGOR, algorithm, ASN1_OBJECT), diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c index 60e38fa15d..381ca599a7 100644 --- a/crypto/evp/bio_md.c +++ b/crypto/evp/bio_md.c @@ -61,6 +61,7 @@ #include "internal/cryptlib.h" #include #include +#include "internal/evp_int.h" #include "evp_locl.h" /* diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c index a2a66235bd..49105bd83c 100644 --- a/crypto/evp/bio_ok.c +++ b/crypto/evp/bio_ok.c @@ -125,6 +125,7 @@ #include #include #include +#include "internal/evp_int.h" static int ok_write(BIO *h, const char *buf, int num); static int ok_read(BIO *h, char *buf, int size); diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c index 49048e271e..47e987385a 100644 --- a/crypto/evp/digest.c +++ b/crypto/evp/digest.c @@ -116,6 +116,7 @@ #ifndef OPENSSL_NO_ENGINE # include #endif +#include "internal/evp_int.h" #include "evp_locl.h" void EVP_MD_CTX_init(EVP_MD_CTX *ctx) diff --git a/crypto/evp/m_md4.c b/crypto/evp/m_md4.c index 94310b41d3..8987c42d3a 100644 --- a/crypto/evp/m_md4.c +++ b/crypto/evp/m_md4.c @@ -68,6 +68,7 @@ # ifndef OPENSSL_NO_RSA # include # endif +# include "internal/evp_int.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/evp/m_md5.c b/crypto/evp/m_md5.c index b8f7a4a41d..ad26604595 100644 --- a/crypto/evp/m_md5.c +++ b/crypto/evp/m_md5.c @@ -68,6 +68,7 @@ # ifndef OPENSSL_NO_RSA # include # endif +# include "internal/evp_int.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/evp/m_md5_sha1.c b/crypto/evp/m_md5_sha1.c index dadb6c26b8..f5472a3777 100644 --- a/crypto/evp/m_md5_sha1.c +++ b/crypto/evp/m_md5_sha1.c @@ -60,6 +60,7 @@ # include # include # include "internal/cryptlib.h" +# include "internal/evp_int.h" # ifndef OPENSSL_NO_RSA # include # endif diff --git a/crypto/evp/m_mdc2.c b/crypto/evp/m_mdc2.c index 8184cbc56a..8934b549e8 100644 --- a/crypto/evp/m_mdc2.c +++ b/crypto/evp/m_mdc2.c @@ -68,6 +68,7 @@ # ifndef OPENSSL_NO_RSA # include # endif +# include "internal/evp_int.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/evp/m_null.c b/crypto/evp/m_null.c index c91f6cbd5a..b64911587f 100644 --- a/crypto/evp/m_null.c +++ b/crypto/evp/m_null.c @@ -61,6 +61,7 @@ #include #include #include +#include "internal/evp_int.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/evp/m_ripemd.c b/crypto/evp/m_ripemd.c index a8a35af434..faf09a15f2 100644 --- a/crypto/evp/m_ripemd.c +++ b/crypto/evp/m_ripemd.c @@ -68,6 +68,7 @@ # ifndef OPENSSL_NO_RSA # include # endif +# include "internal/evp_int.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/evp/m_sha1.c b/crypto/evp/m_sha1.c index c40849bd52..2f30c3c733 100644 --- a/crypto/evp/m_sha1.c +++ b/crypto/evp/m_sha1.c @@ -65,6 +65,7 @@ #ifndef OPENSSL_NO_RSA # include #endif +#include "internal/evp_int.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/evp/m_wp.c b/crypto/evp/m_wp.c index 47c4ceb2cf..0a4a3a98c2 100644 --- a/crypto/evp/m_wp.c +++ b/crypto/evp/m_wp.c @@ -9,6 +9,7 @@ # include # include # include +# include "internal/evp_int.h" static int init(EVP_MD_CTX *ctx) { diff --git a/crypto/evp/names.c b/crypto/evp/names.c index c7c4615c80..8d132e9af0 100644 --- a/crypto/evp/names.c +++ b/crypto/evp/names.c @@ -61,6 +61,7 @@ #include #include #include +#include "internal/evp_int.h" int EVP_add_cipher(const EVP_CIPHER *c) { diff --git a/crypto/evp/p_sign.c b/crypto/evp/p_sign.c index da17514df0..8ddb89f69e 100644 --- a/crypto/evp/p_sign.c +++ b/crypto/evp/p_sign.c @@ -61,6 +61,7 @@ #include #include #include +#include "internal/evp_int.h" int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen, EVP_PKEY *pkey) @@ -97,7 +98,7 @@ int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, goto err; if (EVP_PKEY_sign_init(pkctx) <= 0) goto err; - if (EVP_PKEY_CTX_set_signature_md(pkctx, ctx->digest) <= 0) + if (EVP_PKEY_CTX_set_signature_md(pkctx, EVP_MD_CTX_md(ctx)) <= 0) goto err; if (EVP_PKEY_sign(pkctx, sigret, &sltmp, m, m_len) <= 0) goto err; diff --git a/crypto/evp/p_verify.c b/crypto/evp/p_verify.c index 02c26631f0..c2328f2293 100644 --- a/crypto/evp/p_verify.c +++ b/crypto/evp/p_verify.c @@ -61,6 +61,7 @@ #include #include #include +#include "internal/evp_int.h" int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf, unsigned int siglen, EVP_PKEY *pkey) @@ -94,7 +95,7 @@ int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf, goto err; if (EVP_PKEY_verify_init(pkctx) <= 0) goto err; - if (EVP_PKEY_CTX_set_signature_md(pkctx, ctx->digest) <= 0) + if (EVP_PKEY_CTX_set_signature_md(pkctx, EVP_MD_CTX_md(ctx)) <= 0) goto err; i = EVP_PKEY_verify(pkctx, sigbuf, siglen, m, m_len); err: -- 2.40.0