diff -up openssl-1.1.1g/crypto/ec/ec_asn1.c.explicit-params openssl-1.1.1g/crypto/ec/ec_asn1.c

--- openssl-1.1.1g/crypto/ec/ec_asn1.c.explicit-params	2020-04-21 14:22:39.000000000 +0200

+++ openssl-1.1.1g/crypto/ec/ec_asn1.c	2020-10-23 15:27:31.304312344 +0200

@@ -137,6 +137,12 @@ struct ec_parameters_st {

     ASN1_INTEGER *cofactor;

 } /* ECPARAMETERS */ ;

+typedef enum {

+    ECPKPARAMETERS_TYPE_NAMED = 0,

+    ECPKPARAMETERS_TYPE_EXPLICIT,

+    ECPKPARAMETERS_TYPE_IMPLICIT

+} ecpk_parameters_type_t;

+

 struct ecpk_parameters_st {

     int type;

     union {

@@ -535,9 +541,10 @@ ECPKPARAMETERS *EC_GROUP_get_ecpkparamet

             return NULL;

         }

     } else {

-        if (ret->type == 0)

+        if (ret->type == ECPKPARAMETERS_TYPE_NAMED)

             ASN1_OBJECT_free(ret->value.named_curve);

-        else if (ret->type == 1 && ret->value.parameters)

+        else if (ret->type == ECPKPARAMETERS_TYPE_EXPLICIT

+                 && ret->value.parameters != NULL)

             ECPARAMETERS_free(ret->value.parameters);

     }

@@ -547,7 +554,7 @@ ECPKPARAMETERS *EC_GROUP_get_ecpkparamet

          */

         tmp = EC_GROUP_get_curve_name(group);

         if (tmp) {

-            ret->type = 0;

+            ret->type = ECPKPARAMETERS_TYPE_NAMED;

             if ((ret->value.named_curve = OBJ_nid2obj(tmp)) == NULL)

                 ok = 0;

         } else

@@ -555,7 +562,7 @@ ECPKPARAMETERS *EC_GROUP_get_ecpkparamet

             ok = 0;

     } else {

         /* use the ECPARAMETERS structure */

-        ret->type = 1;

+        ret->type = ECPKPARAMETERS_TYPE_EXPLICIT;

         if ((ret->value.parameters =

              EC_GROUP_get_ecparameters(group, NULL)) == NULL)

             ok = 0;

@@ -894,7 +901,8 @@ EC_GROUP *EC_GROUP_new_from_ecpkparamete

         return NULL;

     }

-    if (params->type == 0) {    /* the curve is given by an OID */

+    if (params->type == ECPKPARAMETERS_TYPE_NAMED) {

+        /* the curve is given by an OID */

         tmp = OBJ_obj2nid(params->value.named_curve);

         if ((ret = EC_GROUP_new_by_curve_name(tmp)) == NULL) {

             ECerr(EC_F_EC_GROUP_NEW_FROM_ECPKPARAMETERS,

@@ -902,15 +910,16 @@ EC_GROUP *EC_GROUP_new_from_ecpkparamete

             return NULL;

         }

         EC_GROUP_set_asn1_flag(ret, OPENSSL_EC_NAMED_CURVE);

-    } else if (params->type == 1) { /* the parameters are given by a

-                                     * ECPARAMETERS structure */

+    } else if (params->type == ECPKPARAMETERS_TYPE_EXPLICIT) {

+        /* the parameters are given by an ECPARAMETERS structure */

         ret = EC_GROUP_new_from_ecparameters(params->value.parameters);

         if (!ret) {

             ECerr(EC_F_EC_GROUP_NEW_FROM_ECPKPARAMETERS, ERR_R_EC_LIB);

             return NULL;

         }

         EC_GROUP_set_asn1_flag(ret, OPENSSL_EC_EXPLICIT_CURVE);

-    } else if (params->type == 2) { /* implicitlyCA */

+    } else if (params->type == ECPKPARAMETERS_TYPE_IMPLICIT) {

+        /* implicit parameters inherited from CA - unsupported */

         return NULL;

     } else {

         ECerr(EC_F_EC_GROUP_NEW_FROM_ECPKPARAMETERS, EC_R_ASN1_ERROR);

@@ -940,6 +949,9 @@ EC_GROUP *d2i_ECPKParameters(EC_GROUP **

         return NULL;

     }

+    if (params->type == ECPKPARAMETERS_TYPE_EXPLICIT)

+        group->decoded_from_explicit_params = 1;

+

     if (a) {

         EC_GROUP_free(*a);

         *a = group;

@@ -991,6 +1003,9 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, con

     if (priv_key->parameters) {

         EC_GROUP_free(ret->group);

         ret->group = EC_GROUP_new_from_ecpkparameters(priv_key->parameters);

+        if (ret->group != NULL

+            && priv_key->parameters->type == ECPKPARAMETERS_TYPE_EXPLICIT)

+            ret->group->decoded_from_explicit_params = 1;

     }

     if (ret->group == NULL) {

diff -up openssl-1.1.1g/crypto/ec/ec_key.c.explicit-params openssl-1.1.1g/crypto/ec/ec_key.c

--- openssl-1.1.1g/crypto/ec/ec_key.c.explicit-params	2020-10-23 15:27:31.296312275 +0200

+++ openssl-1.1.1g/crypto/ec/ec_key.c	2020-10-23 15:27:31.304312344 +0200

@@ -566,6 +566,13 @@ void EC_KEY_clear_flags(EC_KEY *key, int

     key->flags &= ~flags;

 }

+int EC_KEY_decoded_from_explicit_params(const EC_KEY *key)

+{

+    if (key == NULL || key->group == NULL)

+        return -1;

+    return key->group->decoded_from_explicit_params;

+}

+

 size_t EC_KEY_key2buf(const EC_KEY *key, point_conversion_form_t form,

                         unsigned char **pbuf, BN_CTX *ctx)

 {

diff -up openssl-1.1.1g/crypto/ec/ec_lib.c.explicit-params openssl-1.1.1g/crypto/ec/ec_lib.c

--- openssl-1.1.1g/crypto/ec/ec_lib.c.explicit-params	2020-04-21 14:22:39.000000000 +0200

+++ openssl-1.1.1g/crypto/ec/ec_lib.c	2020-10-23 15:27:31.304312344 +0200

@@ -211,6 +211,7 @@ int EC_GROUP_copy(EC_GROUP *dest, const

     dest->asn1_flag = src->asn1_flag;

     dest->asn1_form = src->asn1_form;

+    dest->decoded_from_explicit_params = src->decoded_from_explicit_params;

     if (src->seed) {

         OPENSSL_free(dest->seed);

diff -up openssl-1.1.1g/crypto/ec/ec_local.h.explicit-params openssl-1.1.1g/crypto/ec/ec_local.h

--- openssl-1.1.1g/crypto/ec/ec_local.h.explicit-params	2020-10-23 15:27:31.281312147 +0200

+++ openssl-1.1.1g/crypto/ec/ec_local.h	2020-10-23 15:27:31.304312344 +0200

@@ -217,6 +217,8 @@ struct ec_group_st {

     BIGNUM *order, *cofactor;

     int curve_name;             /* optional NID for named curve */

     int asn1_flag;              /* flag to control the asn1 encoding */

+    int decoded_from_explicit_params; /* set if decoded from explicit

+                                       * curve parameters encoding */

     point_conversion_form_t asn1_form;

     unsigned char *seed;        /* optional seed for parameters (appears in

                                  * ASN1) */

diff -up openssl-1.1.1g/crypto/x509/x509_txt.c.explicit-params openssl-1.1.1g/crypto/x509/x509_txt.c

--- openssl-1.1.1g/crypto/x509/x509_txt.c.explicit-params	2020-04-21 14:22:39.000000000 +0200

+++ openssl-1.1.1g/crypto/x509/x509_txt.c	2020-10-23 15:27:31.305312352 +0200

@@ -174,6 +174,8 @@ const char *X509_verify_cert_error_strin

         return "OCSP verification failed";

     case X509_V_ERR_OCSP_CERT_UNKNOWN:

         return "OCSP unknown cert";

+    case X509_V_ERR_EC_KEY_EXPLICIT_PARAMS:

+        return "Certificate public key has explicit ECC parameters";

     default:

         /* Printing an error number into a static buffer is not thread-safe */

diff -up openssl-1.1.1g/crypto/x509/x509_vfy.c.explicit-params openssl-1.1.1g/crypto/x509/x509_vfy.c

--- openssl-1.1.1g/crypto/x509/x509_vfy.c.explicit-params	2020-10-23 15:27:31.252311900 +0200

+++ openssl-1.1.1g/crypto/x509/x509_vfy.c	2020-10-23 15:27:31.305312352 +0200

@@ -80,6 +80,7 @@ static int get_issuer_sk(X509 **issuer,

 static int check_dane_issuer(X509_STORE_CTX *ctx, int depth);

 static int check_key_level(X509_STORE_CTX *ctx, X509 *cert);

 static int check_sig_level(X509_STORE_CTX *ctx, X509 *cert);

+static int check_curve(X509 *cert);

 static int get_crl_score(X509_STORE_CTX *ctx, X509 **pissuer,

                          unsigned int *preasons, X509_CRL *crl, X509 *x);

@@ -508,6 +509,14 @@ static int check_chain_extensions(X509_S

                 ret = 1;

             break;

         }

+        if ((ctx->param->flags & X509_V_FLAG_X509_STRICT) && num > 1) {

+            /* Check for presence of explicit elliptic curve parameters */

+            ret = check_curve(x);

+            if (ret < 0)

+                ctx->error = X509_V_ERR_UNSPECIFIED;

+            else if (ret == 0)

+                ctx->error = X509_V_ERR_EC_KEY_EXPLICIT_PARAMS;

+        }

         if ((x->ex_flags & EXFLAG_CA) == 0

             && x->ex_pathlen != -1

             && (ctx->param->flags & X509_V_FLAG_X509_STRICT)) {

@@ -3259,6 +3268,32 @@ static int check_key_level(X509_STORE_CT

 }

 /*

+ * Check whether the public key of ``cert`` does not use explicit params

+ * for an elliptic curve.

+ *

+ * Returns 1 on success, 0 if check fails, -1 for other errors.

+ */

+static int check_curve(X509 *cert)

+{

+#ifndef OPENSSL_NO_EC

+    EVP_PKEY *pkey = X509_get0_pubkey(cert);

+

+    /* Unsupported or malformed key */

+    if (pkey == NULL)

+        return -1;

+

+    if (EVP_PKEY_id(pkey) == EVP_PKEY_EC) {

+        int ret;

+

+        ret = EC_KEY_decoded_from_explicit_params(EVP_PKEY_get0_EC_KEY(pkey));

+        return ret < 0 ? ret : !ret;

+    }

+#endif

+

+    return 1;

+}

+

+/*

  * Check whether the signature digest algorithm of ``cert`` meets the security

  * level of ``ctx``.  Should not be checked for trust anchors (whether

  * self-signed or otherwise).

diff -up openssl-1.1.1g/doc/man3/EC_KEY_new.pod.explicit-params openssl-1.1.1g/doc/man3/EC_KEY_new.pod

--- openssl-1.1.1g/doc/man3/EC_KEY_new.pod.explicit-params	2020-04-21 14:22:39.000000000 +0200

+++ openssl-1.1.1g/doc/man3/EC_KEY_new.pod	2020-10-23 15:27:31.305312352 +0200

@@ -9,7 +9,8 @@ EC_KEY_get0_engine,

 EC_KEY_get0_group, EC_KEY_set_group, EC_KEY_get0_private_key,

 EC_KEY_set_private_key, EC_KEY_get0_public_key, EC_KEY_set_public_key,

 EC_KEY_get_conv_form,

-EC_KEY_set_conv_form, EC_KEY_set_asn1_flag, EC_KEY_precompute_mult,

+EC_KEY_set_conv_form, EC_KEY_set_asn1_flag,

+EC_KEY_decoded_from_explicit_params, EC_KEY_precompute_mult,

 EC_KEY_generate_key, EC_KEY_check_key, EC_KEY_set_public_key_affine_coordinates,

 EC_KEY_oct2key, EC_KEY_key2buf, EC_KEY_oct2priv, EC_KEY_priv2oct,

 EC_KEY_priv2buf - Functions for creating, destroying and manipulating

@@ -38,6 +39,7 @@ EC_KEY objects

  point_conversion_form_t EC_KEY_get_conv_form(const EC_KEY *key);

  void EC_KEY_set_conv_form(EC_KEY *eckey, point_conversion_form_t cform);

  void EC_KEY_set_asn1_flag(EC_KEY *eckey, int asn1_flag);

+ int EC_KEY_decoded_from_explicit_params(const EC_KEY *key);

  int EC_KEY_precompute_mult(EC_KEY *key, BN_CTX *ctx);

  int EC_KEY_generate_key(EC_KEY *key);

  int EC_KEY_check_key(const EC_KEY *key);

@@ -118,6 +120,10 @@ EC_KEY_set_asn1_flag() sets the asn1_fla

 (if set). Refer to L<EC_GROUP_copy(3)> for further information on the

 asn1_flag.

+EC_KEY_decoded_from_explicit_params() returns 1 if the group of the I<key> was

+decoded from data with explicitly encoded group parameters, -1 if the I<key>

+is NULL or the group parameters are missing, and 0 otherwise.

+

 EC_KEY_precompute_mult() stores multiples of the underlying EC_GROUP generator

 for faster point multiplication. See also L<EC_POINT_add(3)>.

diff -up openssl-1.1.1g/include/openssl/ec.h.explicit-params openssl-1.1.1g/include/openssl/ec.h

--- openssl-1.1.1g/include/openssl/ec.h.explicit-params	2020-04-21 14:22:39.000000000 +0200

+++ openssl-1.1.1g/include/openssl/ec.h	2020-10-23 15:27:31.305312352 +0200

@@ -829,6 +829,8 @@ void EC_KEY_set_flags(EC_KEY *key, int f

 void EC_KEY_clear_flags(EC_KEY *key, int flags);

+int EC_KEY_decoded_from_explicit_params(const EC_KEY *key);

+

 /** Creates a new EC_KEY object using a named curve as underlying

  *  EC_GROUP object.

  *  \param  nid  NID of the named curve.

diff -up openssl-1.1.1g/include/openssl/x509_vfy.h.explicit-params openssl-1.1.1g/include/openssl/x509_vfy.h

--- openssl-1.1.1g/include/openssl/x509_vfy.h.explicit-params	2020-04-21 14:22:39.000000000 +0200

+++ openssl-1.1.1g/include/openssl/x509_vfy.h	2020-10-23 15:27:31.305312352 +0200

@@ -184,6 +184,7 @@ void X509_STORE_CTX_set_depth(X509_STORE

 # define         X509_V_ERR_OCSP_VERIFY_NEEDED                   73  /* Need OCSP verification */

 # define         X509_V_ERR_OCSP_VERIFY_FAILED                   74  /* Couldn't verify cert through OCSP */

 # define         X509_V_ERR_OCSP_CERT_UNKNOWN                    75  /* Certificate wasn't recognized by the OCSP responder */

+# define         X509_V_ERR_EC_KEY_EXPLICIT_PARAMS               79

 /* Certificate verify flags */

diff -up openssl-1.1.1g/ssl/statem/statem_lib.c.explicit-params openssl-1.1.1g/ssl/statem/statem_lib.c

--- openssl-1.1.1g/ssl/statem/statem_lib.c.explicit-params	2020-10-23 15:27:31.249311874 +0200

+++ openssl-1.1.1g/ssl/statem/statem_lib.c	2020-10-23 15:27:31.305312352 +0200

@@ -1341,6 +1341,7 @@ int tls_get_message_body(SSL *s, size_t

 static const X509ERR2ALERT x509table[] = {

     {X509_V_ERR_APPLICATION_VERIFICATION, SSL_AD_HANDSHAKE_FAILURE},

     {X509_V_ERR_CA_KEY_TOO_SMALL, SSL_AD_BAD_CERTIFICATE},

+    {X509_V_ERR_EC_KEY_EXPLICIT_PARAMS, SSL_AD_BAD_CERTIFICATE},

     {X509_V_ERR_CA_MD_TOO_WEAK, SSL_AD_BAD_CERTIFICATE},

     {X509_V_ERR_CERT_CHAIN_TOO_LONG, SSL_AD_UNKNOWN_CA},

     {X509_V_ERR_CERT_HAS_EXPIRED, SSL_AD_CERTIFICATE_EXPIRED},

diff -up openssl-1.1.1g/test/certs/ca-cert-ec-explicit.pem.explicit-params openssl-1.1.1g/test/certs/ca-cert-ec-explicit.pem

--- openssl-1.1.1g/test/certs/ca-cert-ec-explicit.pem.explicit-params	2020-10-23 15:27:31.306312361 +0200

+++ openssl-1.1.1g/test/certs/ca-cert-ec-explicit.pem	2020-10-23 15:27:31.305312352 +0200

@@ -0,0 +1,19 @@

+-----BEGIN CERTIFICATE-----

+MIIDGDCCAgCgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdSb290

+IENBMCAXDTIwMDkxNTEzMDY0MVoYDzIxMjAwOTE2MTMwNjQxWjANMQswCQYDVQQD

+DAJDQTCCAUswggEDBgcqhkjOPQIBMIH3AgEBMCwGByqGSM49AQECIQD/////AAAA

+AQAAAAAAAAAAAAAAAP///////////////zBbBCD/////AAAAAQAAAAAAAAAAAAAA

+AP///////////////AQgWsY12Ko6k+ez671VdpiGvGUdBrDMU7D2O848PifSYEsD

+FQDEnTYIhucEk2pmeOETnSa3gZ9+kARBBGsX0fLhLEJH+Lzm5WOkQPJ3A32BLesz

+oPShOUXYmMKWT+NC4v4af5uO5+tKfA+eFivOM1drMV7Oy7ZAaDe/UfUCIQD/////

+AAAAAP//////////vOb6racXnoTzucrC/GMlUQIBAQNCAASlXna3kSD/Yol3RA5I

+icjIxYb9UJoCTzb/LsxjlOvIS5OqCTzpqP0p3JrnvLPsbzq7Cf/g0bNlxAGs1iVM

+5NDco1MwUTAdBgNVHQ4EFgQUFk6ucH6gMXeadmuV7a1iWEnU/CIwHwYDVR0jBBgw

+FoAUjvUlrx6ba4Q9fICayVOcTXL3o1IwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG

+9w0BAQsFAAOCAQEAdyUgfT0eAsZzoHFXoWN5uqi0MHuhLI37TEzkH5h7iTpDQJTQ

+F0SjbawfM/nxxUekRW3mjFu3lft+VA7yC0OTNBLffan/vTh+HGOvvYZSMJYgKrMG

+PRWgDId+n9RTcQCf+91cISvOazHixRiJG7JfRLdNZsAE+miw4HgPLFboTwpxtTDJ

+zJ4ssBC6P+5IHwBCtNMiilJMMMzuSaZa5iSo6M9AdXWfcQN3uhW1lgQOLOlKLcbo

+3UhW1GMMhTTeytM5aylbKhRsnL7ozmS44zsKZ25YaQxgjdKitFjVN6j7eyQ7C9J2

+bLXgl3APweLQbGGs0zv08Ad0SCCKYLHK6mMJqg==

+-----END CERTIFICATE-----

diff -up openssl-1.1.1g/test/certs/ca-cert-ec-named.pem.explicit-params openssl-1.1.1g/test/certs/ca-cert-ec-named.pem

--- openssl-1.1.1g/test/certs/ca-cert-ec-named.pem.explicit-params	2020-10-23 15:27:31.306312361 +0200

+++ openssl-1.1.1g/test/certs/ca-cert-ec-named.pem	2020-10-23 15:27:31.306312361 +0200

@@ -0,0 +1,14 @@

+-----BEGIN CERTIFICATE-----

+MIICJDCCAQygAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdSb290

+IENBMCAXDTIwMDkxNTEzMDY1MFoYDzIxMjAwOTE2MTMwNjUwWjANMQswCQYDVQQD

+DAJDQTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABPt+MXCi9+wztEvmdG2EVSk7

+bAiJMXJXW/u0NbcGCrrbhO1NJSHHV3Lks888sqeSPh/bif/ASJ0HX+VarMUoFIKj

+UzBRMB0GA1UdDgQWBBRjigU5REz8Lwf1iD6mALVhsHIanjAfBgNVHSMEGDAWgBSO

+9SWvHptrhD18gJrJU5xNcvejUjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB

+CwUAA4IBAQCQs9wpblefb2C9a7usGL1DJjWJQIFHtUf+6p/KPgEV7LF138ECjL5s

+0AWRd8Q8SbsBH49j2r3LLLMkvFglyRaN+FF+TCC/UQtclTb4+HgLsUT2xSU8U2cY

+SOnzNB5AX/qAAsdOGqOjivPtGXcXFexDKPsw3n+3rJgymBP6hbLagb47IabNhot5

+bMM6S+bmfpMwfsm885zr5vG2Gg9FjjH94Vx4I7eRLkjCS88gkIR1J35ecHFteOdo

+idOaCHQddYiKukBzgdjtTxSDXKffkaybylrwOZ8VBlQd3zC7s02d+riHCnroLnnE

+cwYLlJ5z6jN7zoPZ55yX/EmA0RVny2le

+-----END CERTIFICATE-----

diff -up openssl-1.1.1g/test/certs/ca-key-ec-explicit.pem.explicit-params openssl-1.1.1g/test/certs/ca-key-ec-explicit.pem

--- openssl-1.1.1g/test/certs/ca-key-ec-explicit.pem.explicit-params	2020-10-23 15:27:31.306312361 +0200

+++ openssl-1.1.1g/test/certs/ca-key-ec-explicit.pem	2020-10-23 15:27:31.306312361 +0200

@@ -0,0 +1,10 @@

+-----BEGIN PRIVATE KEY-----

+MIIBeQIBADCCAQMGByqGSM49AgEwgfcCAQEwLAYHKoZIzj0BAQIhAP////8AAAAB

+AAAAAAAAAAAAAAAA////////////////MFsEIP////8AAAABAAAAAAAAAAAAAAAA

+///////////////8BCBaxjXYqjqT57PrvVV2mIa8ZR0GsMxTsPY7zjw+J9JgSwMV

+AMSdNgiG5wSTamZ44ROdJreBn36QBEEEaxfR8uEsQkf4vOblY6RA8ncDfYEt6zOg

+9KE5RdiYwpZP40Li/hp/m47n60p8D54WK84zV2sxXs7LtkBoN79R9QIhAP////8A

+AAAA//////////+85vqtpxeehPO5ysL8YyVRAgEBBG0wawIBAQQgdEf20fpuqEZU

+tZ4ORoq4vb5ETV4a6QOl/iGnDQt++/ihRANCAASlXna3kSD/Yol3RA5IicjIxYb9

+UJoCTzb/LsxjlOvIS5OqCTzpqP0p3JrnvLPsbzq7Cf/g0bNlxAGs1iVM5NDc

+-----END PRIVATE KEY-----

diff -up openssl-1.1.1g/test/certs/ca-key-ec-named.pem.explicit-params openssl-1.1.1g/test/certs/ca-key-ec-named.pem

--- openssl-1.1.1g/test/certs/ca-key-ec-named.pem.explicit-params	2020-10-23 15:27:31.306312361 +0200

+++ openssl-1.1.1g/test/certs/ca-key-ec-named.pem	2020-10-23 15:27:31.306312361 +0200

@@ -0,0 +1,5 @@

+-----BEGIN PRIVATE KEY-----

+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgCTrYrMKcyV49+w4B

+TWr2WTZsMM4aFpaYulKAuhiuQ7mhRANCAAT7fjFwovfsM7RL5nRthFUpO2wIiTFy

+V1v7tDW3Bgq624TtTSUhx1dy5LPPPLKnkj4f24n/wEidB1/lWqzFKBSC

+-----END PRIVATE KEY-----

diff -up openssl-1.1.1g/test/certs/ee-cert-ec-explicit.pem.explicit-params openssl-1.1.1g/test/certs/ee-cert-ec-explicit.pem

--- openssl-1.1.1g/test/certs/ee-cert-ec-explicit.pem.explicit-params	2020-10-23 15:27:31.306312361 +0200

+++ openssl-1.1.1g/test/certs/ee-cert-ec-explicit.pem	2020-10-23 15:27:31.306312361 +0200

@@ -0,0 +1,16 @@

+-----BEGIN CERTIFICATE-----

+MIIChzCCAi6gAwIBAgIBAjAKBggqhkjOPQQDAjANMQswCQYDVQQDDAJDQTAgFw0y

+MDA5MTUxMzE0MzlaGA8yMTIwMDkxNjEzMTQzOVowGTEXMBUGA1UEAwwOc2VydmVy

+LmV4YW1wbGUwggFLMIIBAwYHKoZIzj0CATCB9wIBATAsBgcqhkjOPQEBAiEA////

+/wAAAAEAAAAAAAAAAAAAAAD///////////////8wWwQg/////wAAAAEAAAAAAAAA

+AAAAAAD///////////////wEIFrGNdiqOpPns+u9VXaYhrxlHQawzFOw9jvOPD4n

+0mBLAxUAxJ02CIbnBJNqZnjhE50mt4GffpAEQQRrF9Hy4SxCR/i85uVjpEDydwN9

+gS3rM6D0oTlF2JjClk/jQuL+Gn+bjufrSnwPnhYrzjNXazFezsu2QGg3v1H1AiEA

+/////wAAAAD//////////7zm+q2nF56E87nKwvxjJVECAQEDQgAE+7TDP7C9VqQP

+TnqoJc/Fvf/N45BX+lBfmfiGBeRKtSsvrERUlymzQ4/nxVtymozAgFxQ0my998HH

+TSVCj7Sq56N9MHswHQYDVR0OBBYEFKKwEfKYhNv6fbQf0Xd0te7J3GZdMB8GA1Ud

+IwQYMBaAFGOKBTlETPwvB/WIPqYAtWGwchqeMAkGA1UdEwQCMAAwEwYDVR0lBAww

+CgYIKwYBBQUHAwEwGQYDVR0RBBIwEIIOc2VydmVyLmV4YW1wbGUwCgYIKoZIzj0E

+AwIDRwAwRAIgb4UITAOFlATeaayWQX9r5gf61qcnzT7TjXCekf7ww9oCIBDltg/u

+ZvS9gqviMFuPjTuk/FhsCTAUzTT7WmgcWeH7

+-----END CERTIFICATE-----

diff -up openssl-1.1.1g/test/certs/ee-cert-ec-named-explicit.pem.explicit-params openssl-1.1.1g/test/certs/ee-cert-ec-named-explicit.pem

--- openssl-1.1.1g/test/certs/ee-cert-ec-named-explicit.pem.explicit-params	2020-10-23 15:27:31.306312361 +0200

+++ openssl-1.1.1g/test/certs/ee-cert-ec-named-explicit.pem	2020-10-23 15:27:31.306312361 +0200

@@ -0,0 +1,11 @@

+-----BEGIN CERTIFICATE-----

+MIIBlDCCATqgAwIBAgIBAjAKBggqhkjOPQQDAjANMQswCQYDVQQDDAJDQTAgFw0y

+MDA5MTUxMzE0NDVaGA8yMTIwMDkxNjEzMTQ0NVowGTEXMBUGA1UEAwwOc2VydmVy

+LmV4YW1wbGUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQv5PnMStW/Wx9lpvjl

+JTsFIjc2wBv14sNuMh1hfNX8ZJcoCfAAKYu6ujxXt328GWBMaubRbBjOd/eqpEst

+tYKzo30wezAdBgNVHQ4EFgQUmb/qcE413hkpmtjEMyRZZFcN1TYwHwYDVR0jBBgw

+FoAUFk6ucH6gMXeadmuV7a1iWEnU/CIwCQYDVR0TBAIwADATBgNVHSUEDDAKBggr

+BgEFBQcDATAZBgNVHREEEjAQgg5zZXJ2ZXIuZXhhbXBsZTAKBggqhkjOPQQDAgNI

+ADBFAiEA9y6J8rdAbO0mDZscIb8rIn6HgxBW4WAqTlFeZeHjjOYCIAmt2ldyObOL

+tXaiaxYX3WAOR1vmfzsdrkCAOCfAkpbo

+-----END CERTIFICATE-----

diff -up openssl-1.1.1g/test/certs/ee-cert-ec-named-named.pem.explicit-params openssl-1.1.1g/test/certs/ee-cert-ec-named-named.pem

--- openssl-1.1.1g/test/certs/ee-cert-ec-named-named.pem.explicit-params	2020-10-23 15:27:31.306312361 +0200

+++ openssl-1.1.1g/test/certs/ee-cert-ec-named-named.pem	2020-10-23 15:27:31.306312361 +0200

@@ -0,0 +1,11 @@

+-----BEGIN CERTIFICATE-----

+MIIBkzCCATqgAwIBAgIBAjAKBggqhkjOPQQDAjANMQswCQYDVQQDDAJDQTAgFw0y

+MDA5MTUxNDEwNDhaGA8yMTIwMDkxNjE0MTA0OFowGTEXMBUGA1UEAwwOc2VydmVy

+LmV4YW1wbGUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS0YU57+RFRWxr/frnL

++vOYkY3h9roKnvxCG07wK5tevEYtSdKz0KsHvDBDatw1r3JNv+m2p54/3AqFPAZ3

+5b0Po30wezAdBgNVHQ4EFgQUypypuZrUl0BEmbuhfJpo3QFNIvUwHwYDVR0jBBgw

+FoAUY4oFOURM/C8H9Yg+pgC1YbByGp4wCQYDVR0TBAIwADATBgNVHSUEDDAKBggr

+BgEFBQcDATAZBgNVHREEEjAQgg5zZXJ2ZXIuZXhhbXBsZTAKBggqhkjOPQQDAgNH

+ADBEAiAEkKD7H5uxQ4YbQOiN4evbu5RCV5W7TVE80iBfcY5u4wIgGcwr++lVNX0Q

+CTT+M3ukDjOA8OEvKUz1TiDuRAQ29qU=

+-----END CERTIFICATE-----

diff -up openssl-1.1.1g/test/certs/ee-key-ec-explicit.pem.explicit-params openssl-1.1.1g/test/certs/ee-key-ec-explicit.pem

--- openssl-1.1.1g/test/certs/ee-key-ec-explicit.pem.explicit-params	2020-10-23 15:27:31.306312361 +0200

+++ openssl-1.1.1g/test/certs/ee-key-ec-explicit.pem	2020-10-23 15:27:31.306312361 +0200

@@ -0,0 +1,10 @@

+-----BEGIN PRIVATE KEY-----

+MIIBeQIBADCCAQMGByqGSM49AgEwgfcCAQEwLAYHKoZIzj0BAQIhAP////8AAAAB

+AAAAAAAAAAAAAAAA////////////////MFsEIP////8AAAABAAAAAAAAAAAAAAAA

+///////////////8BCBaxjXYqjqT57PrvVV2mIa8ZR0GsMxTsPY7zjw+J9JgSwMV

+AMSdNgiG5wSTamZ44ROdJreBn36QBEEEaxfR8uEsQkf4vOblY6RA8ncDfYEt6zOg

+9KE5RdiYwpZP40Li/hp/m47n60p8D54WK84zV2sxXs7LtkBoN79R9QIhAP////8A

+AAAA//////////+85vqtpxeehPO5ysL8YyVRAgEBBG0wawIBAQQg0cmpcTcEYG5G

+ZaVkGjtsBc3sLZn1EuV9qNK2qx6iNzmhRANCAAT7tMM/sL1WpA9Oeqglz8W9/83j

+kFf6UF+Z+IYF5Eq1Ky+sRFSXKbNDj+fFW3KajMCAXFDSbL33wcdNJUKPtKrn

+-----END PRIVATE KEY-----

diff -up openssl-1.1.1g/test/certs/ee-key-ec-named-explicit.pem.explicit-params openssl-1.1.1g/test/certs/ee-key-ec-named-explicit.pem

--- openssl-1.1.1g/test/certs/ee-key-ec-named-explicit.pem.explicit-params	2020-10-23 15:27:31.306312361 +0200

+++ openssl-1.1.1g/test/certs/ee-key-ec-named-explicit.pem	2020-10-23 15:27:31.306312361 +0200

@@ -0,0 +1,5 @@

+-----BEGIN PRIVATE KEY-----

+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg2ue+X5ZFJPJPQG2E

+WQY4ALv2PkPp2Gy6KrMiokgmjkehRANCAAQv5PnMStW/Wx9lpvjlJTsFIjc2wBv1

+4sNuMh1hfNX8ZJcoCfAAKYu6ujxXt328GWBMaubRbBjOd/eqpEsttYKz

+-----END PRIVATE KEY-----

diff -up openssl-1.1.1g/test/certs/ee-key-ec-named-named.pem.explicit-params openssl-1.1.1g/test/certs/ee-key-ec-named-named.pem

--- openssl-1.1.1g/test/certs/ee-key-ec-named-named.pem.explicit-params	2020-10-23 15:27:31.306312361 +0200

+++ openssl-1.1.1g/test/certs/ee-key-ec-named-named.pem	2020-10-23 15:27:31.306312361 +0200

@@ -0,0 +1,5 @@

+-----BEGIN PRIVATE KEY-----

+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgGSoneIKG3//ujXGu

+/EoJdNhpKZj026EF/YQ5FblUBWahRANCAAS0YU57+RFRWxr/frnL+vOYkY3h9roK

+nvxCG07wK5tevEYtSdKz0KsHvDBDatw1r3JNv+m2p54/3AqFPAZ35b0P

+-----END PRIVATE KEY-----

diff -up openssl-1.1.1g/test/certs/setup.sh.explicit-params openssl-1.1.1g/test/certs/setup.sh

--- openssl-1.1.1g/test/certs/setup.sh.explicit-params	2020-04-21 14:22:39.000000000 +0200

+++ openssl-1.1.1g/test/certs/setup.sh	2020-10-23 15:27:31.306312361 +0200

@@ -116,6 +116,10 @@ openssl x509 -in ca-cert-md5.pem -trusto

 # CA has 768-bit key

 OPENSSL_KEYBITS=768 \

 ./mkcert.sh genca "CA" ca-key-768 ca-cert-768 root-key root-cert

+# EC cert with explicit curve

+./mkcert.sh genca "CA" ca-key-ec-explicit ca-cert-ec-explicit root-key root-cert

+# EC cert with named curve

+./mkcert.sh genca "CA" ca-key-ec-named ca-cert-ec-named root-key root-cert

 # client intermediate ca: cca-cert

 # trust variants: +serverAuth, -serverAuth, +clientAuth, -clientAuth

@@ -184,6 +188,14 @@ OPENSSL_SIGALG=md5 \

 # 768-bit leaf key

 OPENSSL_KEYBITS=768 \

 ./mkcert.sh genee server.example ee-key-768 ee-cert-768 ca-key ca-cert

+# EC cert with explicit curve signed by named curve ca

+./mkcert.sh genee server.example ee-key-ec-explicit ee-cert-ec-explicit ca-key-ec-named ca-cert-ec-named

+# EC cert with named curve signed by explicit curve ca

+./mkcert.sh genee server.example ee-key-ec-named-explicit \

+    ee-cert-ec-named-explicit ca-key-ec-explicit ca-cert-ec-explicit

+# EC cert with named curve signed by named curve ca

+./mkcert.sh genee server.example ee-key-ec-named-named \

+    ee-cert-ec-named-named ca-key-ec-named ca-cert-ec-named

 # Proxy certificates, off of ee-client

 # Start with some good ones

diff -up openssl-1.1.1g/test/ec_internal_test.c.explicit-params openssl-1.1.1g/test/ec_internal_test.c

--- openssl-1.1.1g/test/ec_internal_test.c.explicit-params	2020-04-21 14:22:39.000000000 +0200

+++ openssl-1.1.1g/test/ec_internal_test.c	2020-10-23 15:27:31.306312361 +0200

@@ -183,6 +183,106 @@ static int field_tests_default(int n)

     return ret;

 }

+/*

+ * Tests behavior of the decoded_from_explicit_params flag and API

+ */

+static int decoded_flag_test(void)

+{

+    EC_GROUP *grp;

+    EC_GROUP *grp_copy = NULL;

+    ECPARAMETERS *ecparams = NULL;

+    ECPKPARAMETERS *ecpkparams = NULL;

+    EC_KEY *key = NULL;

+    unsigned char *encodedparams = NULL;

+    const unsigned char *encp;

+    int encodedlen;

+    int testresult = 0;

+

+    /* Test EC_GROUP_new not setting the flag */

+    grp = EC_GROUP_new(EC_GFp_simple_method());

+    if (!TEST_ptr(grp)

+        || !TEST_int_eq(grp->decoded_from_explicit_params, 0))

+        goto err;

+    EC_GROUP_free(grp);

+

+    /* Test EC_GROUP_new_by_curve_name not setting the flag */

+    grp = EC_GROUP_new_by_curve_name(NID_X9_62_prime256v1);

+    if (!TEST_ptr(grp)

+        || !TEST_int_eq(grp->decoded_from_explicit_params, 0))

+        goto err;

+

+    /* Test EC_GROUP_new_from_ecparameters not setting the flag */

+    if (!TEST_ptr(ecparams = EC_GROUP_get_ecparameters(grp, NULL))

+        || !TEST_ptr(grp_copy = EC_GROUP_new_from_ecparameters(ecparams))

+        || !TEST_int_eq(grp_copy->decoded_from_explicit_params, 0))

+        goto err;

+    EC_GROUP_free(grp_copy);

+    grp_copy = NULL;

+    ECPARAMETERS_free(ecparams);

+    ecparams = NULL;

+

+    /* Test EC_GROUP_new_from_ecpkparameters not setting the flag */

+    if (!TEST_int_eq(EC_GROUP_get_asn1_flag(grp), OPENSSL_EC_NAMED_CURVE)

+        || !TEST_ptr(ecpkparams = EC_GROUP_get_ecpkparameters(grp, NULL))

+        || !TEST_ptr(grp_copy = EC_GROUP_new_from_ecpkparameters(ecpkparams))

+        || !TEST_int_eq(grp_copy->decoded_from_explicit_params, 0)

+        || !TEST_ptr(key = EC_KEY_new())

+    /* Test EC_KEY_decoded_from_explicit_params on key without a group */

+        || !TEST_int_eq(EC_KEY_decoded_from_explicit_params(key), -1)

+        || !TEST_int_eq(EC_KEY_set_group(key, grp_copy), 1)

+    /* Test EC_KEY_decoded_from_explicit_params negative case */

+        || !TEST_int_eq(EC_KEY_decoded_from_explicit_params(key), 0))

+        goto err;

+    EC_GROUP_free(grp_copy);

+    grp_copy = NULL;

+    ECPKPARAMETERS_free(ecpkparams);

+    ecpkparams = NULL;

+

+    /* Test d2i_ECPKParameters with named params not setting the flag */

+    if (!TEST_int_gt(encodedlen = i2d_ECPKParameters(grp, &encodedparams), 0)

+        || !TEST_ptr(encp = encodedparams)

+        || !TEST_ptr(grp_copy = d2i_ECPKParameters(NULL, &encp, encodedlen))

+        || !TEST_int_eq(grp_copy->decoded_from_explicit_params, 0))

+        goto err;

+    EC_GROUP_free(grp_copy);

+    grp_copy = NULL;

+    OPENSSL_free(encodedparams);

+    encodedparams = NULL;

+

+    /* Asn1 flag stays set to explicit with EC_GROUP_new_from_ecpkparameters */

+    EC_GROUP_set_asn1_flag(grp, OPENSSL_EC_EXPLICIT_CURVE);

+    if (!TEST_ptr(ecpkparams = EC_GROUP_get_ecpkparameters(grp, NULL))

+        || !TEST_ptr(grp_copy = EC_GROUP_new_from_ecpkparameters(ecpkparams))

+        || !TEST_int_eq(EC_GROUP_get_asn1_flag(grp_copy), OPENSSL_EC_EXPLICIT_CURVE)

+        || !TEST_int_eq(grp_copy->decoded_from_explicit_params, 0))

+        goto err;

+    EC_GROUP_free(grp_copy);

+    grp_copy = NULL;

+

+    /* Test d2i_ECPKParameters with explicit params setting the flag */

+    if (!TEST_int_gt(encodedlen = i2d_ECPKParameters(grp, &encodedparams), 0)

+        || !TEST_ptr(encp = encodedparams)

+        || !TEST_ptr(grp_copy = d2i_ECPKParameters(NULL, &encp, encodedlen))

+        || !TEST_int_eq(EC_GROUP_get_asn1_flag(grp_copy), OPENSSL_EC_EXPLICIT_CURVE)

+        || !TEST_int_eq(grp_copy->decoded_from_explicit_params, 1)

+        || !TEST_int_eq(EC_KEY_set_group(key, grp_copy), 1)

+    /* Test EC_KEY_decoded_from_explicit_params positive case */

+        || !TEST_int_eq(EC_KEY_decoded_from_explicit_params(key), 1))

+        goto err;

+

+    testresult = 1;

+

+ err:

+    EC_KEY_free(key);

+    EC_GROUP_free(grp);

+    EC_GROUP_free(grp_copy);

+    ECPARAMETERS_free(ecparams);

+    ECPKPARAMETERS_free(ecpkparams);

+    OPENSSL_free(encodedparams);

+

+    return testresult;

+}

+

 int setup_tests(void)

 {

     crv_len = EC_get_builtin_curves(NULL, 0);

@@ -196,6 +296,7 @@ int setup_tests(void)

     ADD_TEST(field_tests_ec2_simple);

 #endif

     ADD_ALL_TESTS(field_tests_default, crv_len);

+    ADD_TEST(decoded_flag_test);

     return 1;

 }

diff -up openssl-1.1.1g/test/recipes/25-test_verify.t.explicit-params openssl-1.1.1g/test/recipes/25-test_verify.t

--- openssl-1.1.1g/test/recipes/25-test_verify.t.explicit-params	2020-10-23 15:27:31.253311908 +0200

+++ openssl-1.1.1g/test/recipes/25-test_verify.t	2020-10-23 15:27:31.306312361 +0200

@@ -27,7 +27,7 @@ sub verify {

     run(app([@args]));

 }

-plan tests => 137;

+plan tests => 142;

 # Canonical success

 ok(verify("ee-cert", "sslserver", ["root-cert"], ["ca-cert"]),

@@ -280,6 +280,27 @@ ok(verify("ee-cert-md5", "sslserver", ["

 ok(!verify("ee-cert-md5", "sslserver", ["root-cert"], ["ca-cert"]),

    "reject md5 leaf at auth level 1");

+# Explicit vs named curve tests

+SKIP: {

+    skip "EC is not supported by this OpenSSL build", 5

+        if disabled("ec");

+    ok(verify("ee-cert-ec-explicit", "sslserver", ["root-cert"],

+               ["ca-cert-ec-named"]),

+        "accept explicit curve leaf with named curve intermediate without strict");

+    ok(verify("ee-cert-ec-named-explicit", "sslserver", ["root-cert"],

+               ["ca-cert-ec-explicit"]),

+        "accept named curve leaf with explicit curve intermediate without strict");

+    ok(!verify("ee-cert-ec-explicit", "sslserver", ["root-cert"],

+               ["ca-cert-ec-named"], "-x509_strict"),

+        "reject explicit curve leaf with named curve intermediate with strict");

+    ok(!verify("ee-cert-ec-named-explicit", "sslserver", ["root-cert"],

+               ["ca-cert-ec-explicit"], "-x509_strict"),

+        "reject named curve leaf with explicit curve intermediate with strict");

+    ok(verify("ee-cert-ec-named-named", "sslserver", ["root-cert"],

+              ["ca-cert-ec-named"], "-x509_strict"),

+        "accept named curve leaf with named curve intermediate with strict");

+}

+

 # Depth tests, note the depth limit bounds the number of CA certificates

 # between the trust-anchor and the leaf, so, for example, with a root->ca->leaf

 # chain, depth = 1 is sufficient, but depth == 0 is not.

diff -up openssl-1.1.1g/util/libcrypto.num.explicit-params openssl-1.1.1g/util/libcrypto.num

--- openssl-1.1.1g/util/libcrypto.num.explicit-params	2020-10-23 15:27:31.265312011 +0200

+++ openssl-1.1.1g/util/libcrypto.num	2020-10-23 15:31:37.424413877 +0200

@@ -4587,6 +4587,7 @@ EVP_PKEY_meth_set_digestverify

 EVP_PKEY_meth_get_digestverify          4541	1_1_1e	EXIST::FUNCTION:

 EVP_PKEY_meth_get_digestsign            4542	1_1_1e	EXIST::FUNCTION:

 RSA_get0_pss_params                     4543	1_1_1e	EXIST::FUNCTION:RSA

+EC_KEY_decoded_from_explicit_params     4547	1_1_1h	EXIST::FUNCTION:EC

 FIPS_drbg_reseed                        6348	1_1_0g	EXIST::FUNCTION:

 FIPS_selftest_check                     6349	1_1_0g	EXIST::FUNCTION:

 FIPS_rand_set_method                    6350	1_1_0g	EXIST::FUNCTION: