Partial port of EC_KEY_METHOD from OpenSSL 1.1.

This commit adds init/free, support for signing, setting and
getting the method, engine support as well as extra data.

from markus

1 files changed, 29 insertions, 1 deletions

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 *);