diff --git a/patches/boringssl/.patches b/patches/boringssl/.patches index 419ee092c98e..07c69fae2e1b 100644 --- a/patches/boringssl/.patches +++ b/patches/boringssl/.patches @@ -1,3 +1,2 @@ expose_ripemd160.patch expose_aes-cfb.patch -fix_add_RSA-PSS_keygen_functions.patch diff --git a/patches/boringssl/fix_add_RSA-PSS_keygen_functions.patch b/patches/boringssl/fix_add_RSA-PSS_keygen_functions.patch deleted file mode 100644 index 36313c23fee9..000000000000 --- a/patches/boringssl/fix_add_RSA-PSS_keygen_functions.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shelley Vohr -Date: Wed, 23 Oct 2019 12:54:32 -0700 -Subject: fix: add RSA-PSS keygen functions - -This adds support for missing RSA_PSS key generation functions. -Refs https://github.com/nodejs/node/pull/26960. - -Upstreamed at https://boringssl-review.googlesource.com/c/boringssl/+/38524. - -diff --git a/include/openssl/evp.h b/include/openssl/evp.h -index fe6c8b6adb3ec1259f1d66d7b77da3577cbaf2dc..d15cbdc394fbd0944314375115e38380462d17f4 100644 ---- a/include/openssl/evp.h -+++ b/include/openssl/evp.h -@@ -723,6 +723,18 @@ OPENSSL_EXPORT int EVP_PKEY_CTX_set_rsa_padding(EVP_PKEY_CTX *ctx, int padding); - OPENSSL_EXPORT int EVP_PKEY_CTX_get_rsa_padding(EVP_PKEY_CTX *ctx, - int *out_padding); - -+// EVP_PKEY_CTX_set_rsa_pss_keygen_md() always returns 0. -+OPENSSL_EXPORT int EVP_PKEY_CTX_set_rsa_pss_keygen_md(EVP_PKEY_CTX *ctx, -+ const EVP_MD *md); -+ -+// EVP_PKEY_CTX_set_rsa_pss_keygen_saltlen() always returns 0. -+OPENSSL_EXPORT int EVP_PKEY_CTX_set_rsa_pss_keygen_saltlen(EVP_PKEY_CTX *ctx, -+ int salt_len); -+ -+// EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md() always returns 0. -+OPENSSL_EXPORT int EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md(EVP_PKEY_CTX *ctx, -+ const EVP_MD *md); -+ - // EVP_PKEY_CTX_set_rsa_pss_saltlen sets the length of the salt in a PSS-padded - // signature. A value of -1 cause the salt to be the same length as the digest - // in the signature. A value of -2 causes the salt to be the maximum length