diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-12-09 23:56:57 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-12-09 23:56:57 +0100 |
| commit | f8d3ab49283ef6fa760da8b69aa5dfc4e83b0f01 (patch) | |
| tree | b3ecef44c2338ba52c787d3522272d35d4d3814e /include | |
| parent | 5e030525606d365f4f14a384d0b67f1cb38f2c6e (diff) | |
| download | openssl-f8d3ab49283ef6fa760da8b69aa5dfc4e83b0f01.tar.gz | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/ec.h | 3 | ||||
| -rw-r--r-- | include/openssl/ossl_typ.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/openssl/ec.h b/include/openssl/ec.h index 9f0a0097e5..a7793b8271 100644 --- 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 167974b923..a6d07a0bb3 100644 --- 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; |