[openssl] master update

[dev at ddvo.net]

The branch master has been updated
       via  1d8f18dce1c8ba99693dfaeb1696d625d9f4b7e0 (commit)
      from  352a0bcaab8eda18cce786d2871e8d4ec6f9cbfe (commit)


- Log -----------------------------------------------------------------
commit 1d8f18dce1c8ba99693dfaeb1696d625d9f4b7e0
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Thu Dec 30 09:30:18 2021 +0100

    ec.h: Explain use of strstr() for EVP_EC_gen() and add #include <string.h>
    
    Fixes #17362
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17380)

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/ec.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/openssl/ec.h b/include/openssl/ec.h
index f59b4f9288..4e65d84c45 100644
--- a/include/openssl/ec.h
+++ b/include/openssl/ec.h
@@ -20,6 +20,8 @@
 # include <openssl/opensslconf.h>
 # include <openssl/types.h>
 
+# include <string.h>
+
 # ifdef  __cplusplus
 extern "C" {
 # endif
@@ -1548,6 +1550,7 @@ OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_get_verify
 
 #  define EVP_EC_gen(curve) \
     EVP_PKEY_Q_keygen(NULL, NULL, "EC", (char *)(strstr(curve, "")))
+    /* strstr is used to enable type checking for the variadic string arg */
 #  define ECParameters_dup(x) ASN1_dup_of(EC_KEY, i2d_ECParameters, \
                                           d2i_ECParameters, x)