From 714b2abb298552698d19818d42d6cc19ffdb7cf2 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Tue, 27 Oct 2015 18:18:18 +0000 Subject: [PATCH] move ECDSA_SIG definition Reviewed-by: Richard Levitte --- crypto/ec/ec_lcl.h | 5 +++++ include/openssl/ec.h | 2 ++ include/openssl/ecdsa.h | 5 ----- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h index 57fd6ce284..38b8c80f6b 100644 --- a/crypto/ec/ec_lcl.h +++ b/crypto/ec/ec_lcl.h @@ -580,3 +580,8 @@ int ossl_ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh, void *(*KDF) (const void *in, size_t inlen, void *out, size_t *outlen)); + +struct ECDSA_SIG_st { + BIGNUM *r; + BIGNUM *s; +}; diff --git a/include/openssl/ec.h b/include/openssl/ec.h index a6e35362da..6683e17266 100644 --- a/include/openssl/ec.h +++ b/include/openssl/ec.h @@ -999,6 +999,8 @@ int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh, void *(*KDF) (const void *in, size_t inlen, void *out, size_t *outlen)); +typedef struct ECDSA_SIG_st ECDSA_SIG; + # define ECParameters_dup(x) ASN1_dup_of(EC_KEY,i2d_ECParameters,d2i_ECParameters,x) # ifndef __cplusplus diff --git a/include/openssl/ecdsa.h b/include/openssl/ecdsa.h index bb84236cd7..fb6813585f 100644 --- a/include/openssl/ecdsa.h +++ b/include/openssl/ecdsa.h @@ -75,11 +75,6 @@ extern "C" { #endif -typedef struct ECDSA_SIG_st { - BIGNUM *r; - BIGNUM *s; -} ECDSA_SIG; - /** Allocates and initialize a ECDSA_SIG structure * \return pointer to a ECDSA_SIG structure or NULL if an error occurred */ -- 2.34.1