1 files changed, 6 insertions, 41 deletions

diff --git a/src/lib/libcrypto/evp/m_sha1.c b/src/lib/libcrypto/evp/m_sha1.c
index 396f00aa13..a6fb53641e 100644
--- a/src/lib/libcrypto/evp/m_sha1.c
+++ b/src/lib/libcrypto/evp/m_sha1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: m_sha1.c,v 1.18 2021/12/12 21:30:13 tb Exp $ */
+/* $OpenBSD: m_sha1.c,v 1.19 2022/01/14 08:38:06 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -94,19 +94,12 @@ static const EVP_MD sha1_md = {
         .type = NID_sha1,
         .pkey_type = NID_sha1WithRSAEncryption,
         .md_size = SHA_DIGEST_LENGTH,
-        .flags = EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
+        .flags = EVP_MD_FLAG_DIGALGID_ABSENT,
         .init = init,
         .update = update,
         .final = final,
         .copy = NULL,
         .cleanup = NULL,
-#ifndef OPENSSL_NO_RSA
-        .sign = (evp_sign_method *)RSA_sign,
-        .verify = (evp_verify_method *)RSA_verify,
-        .required_pkey_type = {
-                EVP_PKEY_RSA, EVP_PKEY_RSA2, 0, 0,
-        },
-#endif
         .block_size = SHA_CBLOCK,
         .ctx_size = sizeof(EVP_MD *) + sizeof(SHA_CTX),
 };
@@ -151,19 +144,12 @@ static const EVP_MD sha224_md = {
         .type = NID_sha224,
         .pkey_type = NID_sha224WithRSAEncryption,
         .md_size = SHA224_DIGEST_LENGTH,
-        .flags = EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
+        .flags = EVP_MD_FLAG_DIGALGID_ABSENT,
         .init = init224,
         .update = update256,
         .final = final256,
         .copy = NULL,
         .cleanup = NULL,
-#ifndef OPENSSL_NO_RSA
-        .sign = (evp_sign_method *)RSA_sign,
-        .verify = (evp_verify_method *)RSA_verify,
-        .required_pkey_type = {
-                EVP_PKEY_RSA, EVP_PKEY_RSA2, 0, 0,
-        },
-#endif
         .block_size = SHA256_CBLOCK,
         .ctx_size = sizeof(EVP_MD *) + sizeof(SHA256_CTX),
 };
@@ -178,19 +164,12 @@ static const EVP_MD sha256_md = {
         .type = NID_sha256,
         .pkey_type = NID_sha256WithRSAEncryption,
         .md_size = SHA256_DIGEST_LENGTH,
-        .flags = EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
+        .flags = EVP_MD_FLAG_DIGALGID_ABSENT,
         .init = init256,
         .update = update256,
         .final = final256,
         .copy = NULL,
         .cleanup = NULL,
-#ifndef OPENSSL_NO_RSA
-        .sign = (evp_sign_method *)RSA_sign,
-        .verify = (evp_verify_method *)RSA_verify,
-        .required_pkey_type = {
-                EVP_PKEY_RSA, EVP_PKEY_RSA2, 0, 0,
-        },
-#endif
         .block_size = SHA256_CBLOCK,
         .ctx_size = sizeof(EVP_MD *) + sizeof(SHA256_CTX),
 };
@@ -231,19 +210,12 @@ static const EVP_MD sha384_md = {
         .type = NID_sha384,
         .pkey_type = NID_sha384WithRSAEncryption,
         .md_size = SHA384_DIGEST_LENGTH,
-        .flags = EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
+        .flags = EVP_MD_FLAG_DIGALGID_ABSENT,
         .init = init384,
         .update = update512,
         .final = final512,
         .copy = NULL,
         .cleanup = NULL,
-#ifndef OPENSSL_NO_RSA
-        .sign = (evp_sign_method *)RSA_sign,
-        .verify = (evp_verify_method *)RSA_verify,
-        .required_pkey_type = {
-                EVP_PKEY_RSA, EVP_PKEY_RSA2, 0, 0,
-        },
-#endif
         .block_size = SHA512_CBLOCK,
         .ctx_size = sizeof(EVP_MD *) + sizeof(SHA512_CTX),
 };
@@ -258,19 +230,12 @@ static const EVP_MD sha512_md = {
         .type = NID_sha512,
         .pkey_type = NID_sha512WithRSAEncryption,
         .md_size = SHA512_DIGEST_LENGTH,
-        .flags = EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT,
+        .flags = EVP_MD_FLAG_DIGALGID_ABSENT,
         .init = init512,
         .update = update512,
         .final = final512,
         .copy = NULL,
         .cleanup = NULL,
-#ifndef OPENSSL_NO_RSA
-        .sign = (evp_sign_method *)RSA_sign,
-        .verify = (evp_verify_method *)RSA_verify,
-        .required_pkey_type = {
-                EVP_PKEY_RSA, EVP_PKEY_RSA2, 0, 0,
-        },
-#endif
         .block_size = SHA512_CBLOCK,
         .ctx_size = sizeof(EVP_MD *) + sizeof(SHA512_CTX),
 };