[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  40f43f8a2e7c75f032672d198604e4fbd6a60fd8 (commit)
      from  ee619197db0c1efa676bedf3b05d028080988759 (commit)


- Log -----------------------------------------------------------------
commit 40f43f8a2e7c75f032672d198604e4fbd6a60fd8
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu Mar 10 14:24:39 2016 +0000

    move DSA_SIG definition into C source file
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/dsa/dsa_asn1.c | 6 +++++-
 crypto/dsa/dsa_locl.h | 5 -----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/crypto/dsa/dsa_asn1.c b/crypto/dsa/dsa_asn1.c
index ddf3259..b2ac1e6 100644
--- a/crypto/dsa/dsa_asn1.c
+++ b/crypto/dsa/dsa_asn1.c
@@ -62,7 +62,11 @@
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/rand.h>
-#include "dsa_locl.h"
+
+struct DSA_SIG_st {
+    BIGNUM *r;
+    BIGNUM *s;
+};
 
 ASN1_SEQUENCE(DSA_SIG) = {
         ASN1_SIMPLE(DSA_SIG, r, CBIGNUM),
diff --git a/crypto/dsa/dsa_locl.h b/crypto/dsa/dsa_locl.h
index 7767e74..6182495 100644
--- a/crypto/dsa/dsa_locl.h
+++ b/crypto/dsa/dsa_locl.h
@@ -65,8 +65,3 @@ int dsa_builtin_paramgen2(DSA *ret, size_t L, size_t N,
                           size_t seed_len, int idx, unsigned char *seed_out,
                           int *counter_ret, unsigned long *h_ret,
                           BN_GENCB *cb);
-
-struct DSA_SIG_st {
-    BIGNUM *r;
-    BIGNUM *s;
-};