4 files changed, 401 insertions, 23 deletions

diff --git a/src/lib/libcrypto/ec/ec.h b/src/lib/libcrypto/ec/ec.h
index d9df48603a..1173459dae 100644
--- a/src/lib/libcrypto/ec/ec.h
+++ b/src/lib/libcrypto/ec/ec.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec.h,v 1.13 2018/05/19 10:37:02 tb Exp $ */
+/* $OpenBSD: ec.h,v 1.14 2019/01/19 01:07:00 tb Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -705,6 +705,7 @@ int     ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off);
 /********************************************************************/
 
 typedef struct ec_key_st EC_KEY;
+typedef struct ec_key_method_st EC_KEY_METHOD;
 
 /* some values for the encoding_flag */
 #define EC_PKEY_NO_PARAMETERS   0x001
@@ -945,6 +946,34 @@ int	ECParameters_print_fp(FILE *fp, const EC_KEY *key);
  */
 int     EC_KEY_print_fp(FILE *fp, const EC_KEY *key, int off);
 
+#define EC_KEY_get_ex_new_index(l, p, newf, dupf, freef) \
+    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_EC_KEY, l, p, newf, dupf, freef)
+int EC_KEY_set_ex_data(EC_KEY *key, int idx, void *arg);
+void *EC_KEY_get_ex_data(const EC_KEY *key, int idx);
+
+const EC_KEY_METHOD *EC_KEY_OpenSSL(void);
+const EC_KEY_METHOD *EC_KEY_get_default_method(void);
+void EC_KEY_set_default_method(const EC_KEY_METHOD *meth);
+const EC_KEY_METHOD *EC_KEY_get_method(const EC_KEY *key);
+int EC_KEY_set_method(EC_KEY *key, const EC_KEY_METHOD *meth);
+EC_KEY *EC_KEY_new_method(ENGINE *engine);
+EC_KEY_METHOD *EC_KEY_METHOD_new(const EC_KEY_METHOD *meth);
+void EC_KEY_METHOD_free(EC_KEY_METHOD *meth);
+void EC_KEY_METHOD_set_init(EC_KEY_METHOD *meth,
+    int (*init)(EC_KEY *key),
+    void (*finish)(EC_KEY *key),
+    int (*copy)(EC_KEY *dest, const EC_KEY *src),
+    int (*set_group)(EC_KEY *key, const EC_GROUP *grp),
+    int (*set_private)(EC_KEY *key, const BIGNUM *priv_key),
+    int (*set_public)(EC_KEY *key, const EC_POINT *pub_key));
+void EC_KEY_METHOD_get_init(EC_KEY_METHOD *meth,
+    int (**pinit)(EC_KEY *key),
+    void (**pfinish)(EC_KEY *key),
+    int (**pcopy)(EC_KEY *dest, const EC_KEY *src),
+    int (**pset_group)(EC_KEY *key, const EC_GROUP *grp),
+    int (**pset_private)(EC_KEY *key, const BIGNUM *priv_key),
+    int (**pset_public)(EC_KEY *key, const EC_POINT *pub_key));
+
 EC_KEY *ECParameters_dup(EC_KEY *key);
 
 #ifndef __cplusplus
diff --git a/src/lib/libcrypto/ec/ec_key.c b/src/lib/libcrypto/ec/ec_key.c
index fcdf461d20..f57e078c7f 100644
--- a/src/lib/libcrypto/ec/ec_key.c
+++ b/src/lib/libcrypto/ec/ec_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_key.c,v 1.22 2018/11/09 23:39:45 tb Exp $ */
+/* $OpenBSD: ec_key.c,v 1.23 2019/01/19 01:07:00 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -65,30 +65,18 @@
 
 #include <openssl/opensslconf.h>
 
+#ifndef OPENSSL_NO_ENGINE
+#include <openssl/engine.h>
+#endif
+#include <openssl/err.h>
+
 #include "bn_lcl.h"
 #include "ec_lcl.h"
-#include <openssl/err.h>
 
 EC_KEY *
 EC_KEY_new(void)
 {
-        EC_KEY *ret;
-
-        ret = malloc(sizeof(EC_KEY));
-        if (ret == NULL) {
-                ECerror(ERR_R_MALLOC_FAILURE);
-                return (NULL);
-        }
-        ret->version = 1;
-        ret->flags = 0;
-        ret->group = NULL;
-        ret->pub_key = NULL;
-        ret->priv_key = NULL;
-        ret->enc_flag = 0;
-        ret->conv_form = POINT_CONVERSION_UNCOMPRESSED;
-        ret->references = 1;
-        ret->method_data = NULL;
-        return (ret);
+        return EC_KEY_new_method(NULL);
 }
 
 EC_KEY *
@@ -102,6 +90,11 @@ EC_KEY_new_by_curve_name(int nid)
                 EC_KEY_free(ret);
                 return NULL;
         }
+        if (ret->meth->set_group != NULL &&
+            ret->meth->set_group(ret, ret->group) == 0) {
+                EC_KEY_free(ret);
+                return NULL;
+        }
         return ret;
 }
 
@@ -117,6 +110,14 @@ EC_KEY_free(EC_KEY * r)
         if (i > 0)
                 return;
 
+        if (r->meth != NULL && r->meth->finish != NULL)
+                r->meth->finish(r);
+
+#ifndef OPENSSL_NO_ENGINE
+        ENGINE_finish(r->engine);
+#endif
+        CRYPTO_free_ex_data(CRYPTO_EX_INDEX_EC_KEY, r, &r->ex_data);
+
         EC_GROUP_free(r->group);
         EC_POINT_free(r->pub_key);
         BN_clear_free(r->priv_key);
@@ -135,6 +136,15 @@ EC_KEY_copy(EC_KEY * dest, const EC_KEY * src)
                 ECerror(ERR_R_PASSED_NULL_PARAMETER);
                 return NULL;
         }
+        if (src->meth != dest->meth) {
+                if (dest->meth != NULL && dest->meth->finish != NULL)
+                        dest->meth->finish(dest);
+#ifndef OPENSSL_NO_ENGINE
+                if (ENGINE_finish(dest->engine) == 0)
+                        return 0;
+                dest->engine = NULL;
+#endif
+        }
         /* copy the parameters */
         if (src->group) {
                 const EC_METHOD *meth = EC_GROUP_method_of(src->group);
@@ -184,14 +194,32 @@ EC_KEY_copy(EC_KEY * dest, const EC_KEY * src)
         dest->version = src->version;
         dest->flags = src->flags;
 
+        if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_EC_KEY, &dest->ex_data,
+            &((EC_KEY *)src)->ex_data)) /* XXX const */
+                return NULL;
+
+        if (src->meth != dest->meth) {
+#ifndef OPENSSL_NO_ENGINE
+                if (src->engine != NULL && ENGINE_init(src->engine) == 0)
+                        return 0;
+                dest->engine = src->engine;
+#endif
+                dest->meth = src->meth;
+        }
+
+        if (src->meth != NULL && src->meth->copy != NULL &&
+            src->meth->copy(dest, src) == 0)
+                return 0;
+
         return dest;
 }
 
 EC_KEY *
 EC_KEY_dup(const EC_KEY * ec_key)
 {
-        EC_KEY *ret = EC_KEY_new();
-        if (ret == NULL)
+        EC_KEY *ret;
+
+        if ((ret = EC_KEY_new_method(ec_key->engine)) == NULL)
                 return NULL;
         if (EC_KEY_copy(ret, ec_key) == NULL) {
                 EC_KEY_free(ret);
@@ -207,6 +235,18 @@ EC_KEY_up_ref(EC_KEY * r)
         return ((i > 1) ? 1 : 0);
 }
 
+int
+EC_KEY_set_ex_data(EC_KEY *r, int idx, void *arg)
+{
+        return CRYPTO_set_ex_data(&r->ex_data, idx, arg);
+}
+
+void *
+EC_KEY_get_ex_data(const EC_KEY *r, int idx)
+{
+        return CRYPTO_get_ex_data(&r->ex_data, idx);
+}
+
 int 
 EC_KEY_generate_key(EC_KEY *eckey)
 {
@@ -407,6 +447,9 @@ EC_KEY_get0_group(const EC_KEY * key)
 int 
 EC_KEY_set_group(EC_KEY * key, const EC_GROUP * group)
 {
+        if (key->meth->set_group != NULL &&
+            key->meth->set_group(key, group) == 0)
+                return 0;
         EC_GROUP_free(key->group);
         key->group = EC_GROUP_dup(group);
         return (key->group == NULL) ? 0 : 1;
@@ -421,6 +464,9 @@ EC_KEY_get0_private_key(const EC_KEY * key)
 int 
 EC_KEY_set_private_key(EC_KEY * key, const BIGNUM * priv_key)
 {
+        if (key->meth->set_private != NULL &&
+            key->meth->set_private(key, priv_key) == 0)
+                return 0;
         BN_clear_free(key->priv_key);
         key->priv_key = BN_dup(priv_key);
         return (key->priv_key == NULL) ? 0 : 1;
@@ -435,6 +481,9 @@ EC_KEY_get0_public_key(const EC_KEY * key)
 int 
 EC_KEY_set_public_key(EC_KEY * key, const EC_POINT * pub_key)
 {
+        if (key->meth->set_public != NULL &&
+            key->meth->set_public(key, pub_key) == 0)
+                return 0;
         EC_POINT_free(key->pub_key);
         key->pub_key = EC_POINT_dup(pub_key, key->group);
         return (key->pub_key == NULL) ? 0 : 1;
diff --git a/src/lib/libcrypto/ec/ec_kmeth.c b/src/lib/libcrypto/ec/ec_kmeth.c
new file mode 100644
index 0000000000..b714c62236
--- /dev/null
+++ b/src/lib/libcrypto/ec/ec_kmeth.c
@@ -0,0 +1,272 @@
+/*
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2015 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include <openssl/ec.h>
+#ifndef OPENSSL_NO_ENGINE
+#include <openssl/engine.h>
+#endif
+#include <openssl/err.h>
+
+#include "ec_lcl.h"
+#include "ecs_locl.h"
+
+static const EC_KEY_METHOD openssl_ec_key_method = {
+        .name = "OpenSSL EC_KEY method",
+        .flags = 0,
+
+        .init = NULL,
+        .finish = NULL,
+        .copy = NULL,
+
+        .set_group = NULL,
+        .set_private = NULL,
+        .set_public = NULL,
+
+        .sign = ossl_ecdsa_sign,
+        .sign_setup = ossl_ecdsa_sign_setup,
+        .sign_sig = ossl_ecdsa_sign_sig,
+};
+
+const EC_KEY_METHOD *default_ec_key_meth = &openssl_ec_key_method;
+
+const EC_KEY_METHOD *
+EC_KEY_OpenSSL(void)
+{
+        return &openssl_ec_key_method;
+}
+
+const EC_KEY_METHOD *
+EC_KEY_get_default_method(void)
+{
+        return default_ec_key_meth;
+}
+
+void
+EC_KEY_set_default_method(const EC_KEY_METHOD *meth)
+{
+        if (meth == NULL)
+                default_ec_key_meth = &openssl_ec_key_method;
+        else
+                default_ec_key_meth = meth;
+}
+
+const EC_KEY_METHOD *
+EC_KEY_get_method(const EC_KEY *key)
+{
+        return key->meth;
+}
+
+int
+EC_KEY_set_method(EC_KEY *key, const EC_KEY_METHOD *meth)
+{
+        void (*finish)(EC_KEY *key) = key->meth->finish;
+
+        if (finish != NULL)
+                finish(key);
+
+#ifndef OPENSSL_NO_ENGINE
+        ENGINE_finish(key->engine);
+        key->engine = NULL;
+#endif
+
+        key->meth = meth;
+        if (meth->init != NULL)
+                return meth->init(key);
+        return 1;
+}
+
+EC_KEY *
+EC_KEY_new_method(ENGINE *engine)
+{
+        EC_KEY *ret;
+
+        if ((ret = calloc(1, sizeof(EC_KEY))) == NULL) {
+                ECerror(ERR_R_MALLOC_FAILURE);
+                return NULL;
+        }
+        ret->meth = EC_KEY_get_default_method();
+#ifndef OPENSSL_NO_ENGINE
+        if (engine != NULL) {
+                if (!ENGINE_init(engine)) {
+                        ECerror(ERR_R_ENGINE_LIB);
+                        goto err;
+                }
+                ret->engine = engine;
+        } else
+                ret->engine = ENGINE_get_default_EC();
+        if (ret->engine) {
+                ret->meth = ENGINE_get_EC(ret->engine);
+                if (ret->meth == NULL) {
+                        ECerror(ERR_R_ENGINE_LIB);
+                        goto err;
+                }
+        }
+#endif
+        ret->version = 1;
+        ret->flags = 0;
+        ret->group = NULL;
+        ret->pub_key = NULL;
+        ret->priv_key = NULL;
+        ret->enc_flag = 0;
+        ret->conv_form = POINT_CONVERSION_UNCOMPRESSED;
+        ret->references = 1;
+        ret->method_data = NULL;
+
+        if (!CRYPTO_new_ex_data(CRYPTO_EX_INDEX_RSA, ret, &ret->ex_data))
+                goto err;
+        if (ret->meth->init != NULL && ret->meth->init(ret) == 0)
+                goto err;
+
+        return ret;
+
+ err:
+        EC_KEY_free(ret);
+        return NULL;
+}
+
+EC_KEY_METHOD *
+EC_KEY_METHOD_new(const EC_KEY_METHOD *meth)
+{
+        EC_KEY_METHOD *ret;
+
+        if ((ret = malloc(sizeof(*meth))) == NULL)
+                return NULL;
+        if (meth != NULL)
+                *ret = *meth;
+        ret->flags |= EC_KEY_METHOD_DYNAMIC;
+        return ret;
+}
+
+void
+EC_KEY_METHOD_free(EC_KEY_METHOD *meth)
+{
+        if (meth == NULL)
+                return;
+        if (meth->flags & EC_KEY_METHOD_DYNAMIC)
+                free(meth);
+}
+
+void
+EC_KEY_METHOD_get_init(EC_KEY_METHOD *meth,
+    int (**pinit)(EC_KEY *key),
+    void (**pfinish)(EC_KEY *key),
+    int (**pcopy)(EC_KEY *dest, const EC_KEY *src),
+    int (**pset_group)(EC_KEY *key, const EC_GROUP *grp),
+    int (**pset_private)(EC_KEY *key, const BIGNUM *priv_key),
+    int (**pset_public)(EC_KEY *key, const EC_POINT *pub_key))
+{
+        if (pinit != NULL)
+                *pinit = meth->init;
+        if (pfinish != NULL)
+                *pfinish = meth->finish;
+        if (pcopy != NULL)
+                *pcopy = meth->copy;
+        if (pset_group != NULL)
+                *pset_group = meth->set_group;
+        if (pset_private != NULL)
+                *pset_private = meth->set_private;
+        if (pset_public != NULL)
+                *pset_public = meth->set_public;
+}
+
+void
+EC_KEY_METHOD_set_init(EC_KEY_METHOD *meth,
+    int (*init)(EC_KEY *key),
+    void (*finish)(EC_KEY *key),
+    int (*copy)(EC_KEY *dest, const EC_KEY *src),
+    int (*set_group)(EC_KEY *key, const EC_GROUP *grp),
+    int (*set_private)(EC_KEY *key, const BIGNUM *priv_key),
+    int (*set_public)(EC_KEY *key, const EC_POINT *pub_key))
+{
+        meth->init = init;
+        meth->finish = finish;
+        meth->copy = copy;
+        meth->set_group = set_group;
+        meth->set_private = set_private;
+        meth->set_public = set_public;
+}
+
+void
+EC_KEY_METHOD_get_sign(EC_KEY_METHOD *meth,
+    int (**psign)(int type, const unsigned char *dgst,
+        int dlen, unsigned char *sig, unsigned int *siglen,
+        const BIGNUM *kinv, const BIGNUM *r, EC_KEY *eckey),
+    int (**psign_setup)(EC_KEY *eckey, BN_CTX *ctx_in,
+        BIGNUM **kinvp, BIGNUM **rp),
+    ECDSA_SIG *(**psign_sig)(const unsigned char *dgst,
+        int dgst_len, const BIGNUM *in_kinv, const BIGNUM *in_r,
+        EC_KEY *eckey))
+{
+        if (psign != NULL)
+                *psign = meth->sign;
+        if (psign_setup != NULL)
+                *psign_setup = meth->sign_setup;
+        if (psign_sig != NULL)
+                *psign_sig = meth->sign_sig;
+}
+
+void
+EC_KEY_METHOD_set_sign(EC_KEY_METHOD *meth,
+    int (*sign)(int type, const unsigned char *dgst,
+        int dlen, unsigned char *sig, unsigned int *siglen,
+        const BIGNUM *kinv, const BIGNUM *r, EC_KEY *eckey),
+    int (*sign_setup)(EC_KEY *eckey, BN_CTX *ctx_in,
+        BIGNUM **kinvp, BIGNUM **rp),
+    ECDSA_SIG *(*sign_sig)(const unsigned char *dgst,
+        int dgst_len, const BIGNUM *in_kinv,
+        const BIGNUM *in_r, EC_KEY *eckey))
+{
+        meth->sign = sign;
+        meth->sign_setup = sign_setup;
+        meth->sign_sig = sign_sig;
+}
diff --git a/src/lib/libcrypto/ec/ec_lcl.h b/src/lib/libcrypto/ec/ec_lcl.h
index c177246f36..cff0892e89 100644
--- a/src/lib/libcrypto/ec/ec_lcl.h
+++ b/src/lib/libcrypto/ec/ec_lcl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_lcl.h,v 1.11 2018/11/05 20:18:21 tb Exp $ */
+/* $OpenBSD: ec_lcl.h,v 1.12 2019/01/19 01:07:00 tb Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -73,6 +73,7 @@
 
 #include <openssl/obj_mac.h>
 #include <openssl/ec.h>
+#include <openssl/ecdsa.h>
 #include <openssl/bn.h>
 
 __BEGIN_HIDDEN_DECLS
@@ -245,6 +246,9 @@ struct ec_group_st {
 } /* EC_GROUP */;
 
 struct ec_key_st {
+        const EC_KEY_METHOD *meth;
+        ENGINE  *engine;
+
         int version;
 
         EC_GROUP *group;
@@ -259,6 +263,7 @@ struct ec_key_st {
         int     flags;
 
         EC_EXTRA_DATA *method_data;
+        CRYPTO_EX_DATA ex_data;
 } /* EC_KEY */;
 
 /* Basically a 'mixin' for extra data, but available for EC_GROUPs/EC_KEYs only
@@ -441,6 +446,29 @@ int ec_GFp_nistp256_have_precompute_mult(const EC_GROUP *group);
 const EC_METHOD *EC_GFp_nistz256_method(void);
 #endif
 
+/* EC_METHOD definitions */
+
+struct ec_key_method_st {
+        const char *name;
+        int32_t flags;
+        int (*init)(EC_KEY *key);
+        void (*finish)(EC_KEY *key);
+        int (*copy)(EC_KEY *dest, const EC_KEY *src);
+        int (*set_group)(EC_KEY *key, const EC_GROUP *grp);
+        int (*set_private)(EC_KEY *key, const BIGNUM *priv_key);
+        int (*set_public)(EC_KEY *key, const EC_POINT *pub_key);
+        int (*sign)(int type, const unsigned char *dgst, int dlen, unsigned char
+            *sig, unsigned int *siglen, const BIGNUM *kinv,
+            const BIGNUM *r, EC_KEY *eckey);
+        int (*sign_setup)(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
+            BIGNUM **rp);
+        ECDSA_SIG *(*sign_sig)(const unsigned char *dgst, int dgst_len,
+            const BIGNUM *in_kinv, const BIGNUM *in_r,
+            EC_KEY *eckey);
+} /* EC_KEY_METHOD */;
+
+#define EC_KEY_METHOD_DYNAMIC   1
+
 /* method functions in ecp_nistp521.c */
 int ec_GFp_nistp521_group_init(EC_GROUP *group);
 int ec_GFp_nistp521_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *n, BN_CTX *);