[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  03f880e4fc5f4235006abdc152664c22aef6a506 (commit)
      from  ffbc5b577d6283429c2348b23bca5eac46c80854 (commit)


- Log -----------------------------------------------------------------
commit 03f880e4fc5f4235006abdc152664c22aef6a506
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 10 11:29:08 2016 +0100

    The typedef ECPARAMETERS is already defined, don't define it anew
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/ec/ec_asn1.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index 3b0ba2e..301a5d3 100644
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -172,14 +172,14 @@ typedef struct x9_62_curve_st {
     ASN1_BIT_STRING *seed;
 } X9_62_CURVE;
 
-typedef struct ec_parameters_st {
+struct ec_parameters_st {
     long version;
     X9_62_FIELDID *fieldID;
     X9_62_CURVE *curve;
     ASN1_OCTET_STRING *base;
     ASN1_INTEGER *order;
     ASN1_INTEGER *cofactor;
-} ECPARAMETERS;
+} /* ECPARAMETERS */ ;
 
 struct ecpk_parameters_st {
     int type;