From e27ef2da0d513494c3e9926ce8d44b63e4236a32 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Fri, 26 Mar 2021 08:58:07 +0000 Subject: openssl: refresh patches Tidy up some patch fuzz. Signed-off-by: Kevin Darbyshire-Bryant --- ...10-eng_devcrypto-add-configuration-options.patch | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'package/libs/openssl/patches/410-eng_devcrypto-add-configuration-options.patch') diff --git a/package/libs/openssl/patches/410-eng_devcrypto-add-configuration-options.patch b/package/libs/openssl/patches/410-eng_devcrypto-add-configuration-options.patch index 8745364cf2..12fe7b4199 100644 --- a/package/libs/openssl/patches/410-eng_devcrypto-add-configuration-options.patch +++ b/package/libs/openssl/patches/410-eng_devcrypto-add-configuration-options.patch @@ -13,8 +13,6 @@ Reviewed-by: Matthias St. Pierre Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/7585) -diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c -index a2c9a966f7..5ec38ca8f3 100644 --- a/crypto/engine/eng_devcrypto.c +++ b/crypto/engine/eng_devcrypto.c @@ -16,6 +16,7 @@ @@ -80,7 +78,7 @@ index a2c9a966f7..5ec38ca8f3 100644 /* * Code further down must make sure that only NIDs in the table above -@@ -333,19 +367,40 @@ static int cipher_cleanup(EVP_CIPHER_CTX *ctx) +@@ -333,19 +367,40 @@ static int cipher_cleanup(EVP_CIPHER_CTX } /* @@ -186,7 +184,7 @@ index a2c9a966f7..5ec38ca8f3 100644 static const EVP_CIPHER *get_cipher_method(int nid) { size_t i = get_cipher_data_index(nid); -@@ -438,6 +520,36 @@ static int devcrypto_ciphers(ENGINE *e, const EVP_CIPHER **cipher, +@@ -438,6 +520,36 @@ static int devcrypto_ciphers(ENGINE *e, return *cipher != NULL; } @@ -247,7 +245,7 @@ index a2c9a966f7..5ec38ca8f3 100644 /* * Code further down must make sure that only NIDs in the table above -@@ -516,8 +637,8 @@ static const struct digest_data_st *get_digest_data(int nid) +@@ -516,8 +637,8 @@ static const struct digest_data_st *get_ } /* @@ -258,7 +256,7 @@ index a2c9a966f7..5ec38ca8f3 100644 */ static int digest_init(EVP_MD_CTX *ctx) -@@ -630,52 +751,94 @@ static int digest_cleanup(EVP_MD_CTX *ctx) +@@ -630,52 +751,94 @@ static int digest_cleanup(EVP_MD_CTX *ct return clean_devcrypto_session(&digest_ctx->sess); } @@ -403,7 +401,7 @@ index a2c9a966f7..5ec38ca8f3 100644 } } -@@ -739,8 +909,154 @@ static int devcrypto_digests(ENGINE *e, const EVP_MD **digest, +@@ -739,7 +909,153 @@ static int devcrypto_digests(ENGINE *e, return *digest != NULL; } @@ -479,8 +477,8 @@ index a2c9a966f7..5ec38ca8f3 100644 + "DIGESTS", + "either ALL, NONE, or a comma-separated list of digests to enable [default=ALL]", + ENGINE_CMD_FLAG_STRING}, - #endif - ++#endif ++ + {0, NULL, NULL, 0} +}; + @@ -504,7 +502,7 @@ index a2c9a966f7..5ec38ca8f3 100644 + use_softdrivers = i; +#ifdef IMPLEMENT_DIGEST + rebuild_known_digest_nids(e); -+#endif + #endif + rebuild_known_cipher_nids(e); + return 1; +#endif /* CIOCGSESSINFO */ @@ -554,10 +552,9 @@ index a2c9a966f7..5ec38ca8f3 100644 + } + return 0; +} -+ + /****************************************************************************** * - * LOAD / UNLOAD @@ -793,6 +1109,8 @@ void engine_load_devcrypto_int() if (!ENGINE_set_id(e, "devcrypto") -- cgit v1.2.3