move ECDSA_SIG definition

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h
index 57fd6ce284f7efa0e465d955fcd0dbcc32e627b3..38b8c80f6b5174a0b897a163fab8074dffe331bf 100644 (file)
--- 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));
                           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 a6e35362da29bd42d267e25966798154d110ecf3..6683e1726644bd9d8aaf105cf3b000e595863b5a 100644 (file)
--- 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));
 
                      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
 # 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 bb84236cd71cf0cb1a5f0a12ac0ff85f81c8c79d..fb6813585f43f27c176c53bd39c30c6e666207fa 100644 (file)
--- a/include/openssl/ecdsa.h
+++ b/include/openssl/ecdsa.h
@@ -75,11 +75,6 @@
 extern "C" {
 #endif
 
 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
  */
 /** Allocates and initialize a ECDSA_SIG structure
  *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
  */