Move the definitions of EC_KEY and EC_KEY_METHOD to ossl_typ.h

Most of all, that has inclusion of openssl/engine.h work even if EC
has been disabled.  This is the same as has been done for DH, DSA, RSA
and more...

Reviewed-by: Stephen Henson <steve@openssl.org>

diff --git a/include/openssl/ec.h b/include/openssl/ec.h
index 9f0a0097e5ec91e39007205e0e04c835ffefa2ba..a7793b82718b87de6312aca958392bfa7f99c842 100644 (file)
--- a/include/openssl/ec.h
+++ b/include/openssl/ec.h
@@ -740,9 +740,6 @@ int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off);
 /*                      EC_KEY functions                            */
 /********************************************************************/
 
-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
 # define EC_PKEY_NO_PUBKEY       0x002

diff --git a/include/openssl/ossl_typ.h b/include/openssl/ossl_typ.h
index 167974b923002762ac878ccfaf19ff5e2b354945..a6d07a0bb3475d3f5f92f2e054015653e81aefa8 100644 (file)
--- a/include/openssl/ossl_typ.h
+++ b/include/openssl/ossl_typ.h
@@ -148,6 +148,9 @@ typedef struct dsa_method DSA_METHOD;
 typedef struct rsa_st RSA;
 typedef struct rsa_meth_st RSA_METHOD;
 
+typedef struct ec_key_st EC_KEY;
+typedef struct ec_key_method_st EC_KEY_METHOD;
+
 typedef struct rand_meth_st RAND_METHOD;
 
 typedef struct x509_st X509;