[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  d20841c414bf62527f016cd4903d8d23451f24a5 (commit)
      from  8478a70333d4d68f768847f8c2a8619b5bd15bcc (commit)


- Log -----------------------------------------------------------------
commit d20841c414bf62527f016cd4903d8d23451f24a5
Author: Rich Salz <rsalz at openssl.org>
Date:   Tue Jul 5 11:51:04 2016 -0400

    Add OPENSSL_NO_EC wrapper
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 fuzz/asn1.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fuzz/asn1.c b/fuzz/asn1.c
index 4d22eeb..5d871cd 100644
--- a/fuzz/asn1.c
+++ b/fuzz/asn1.c
@@ -30,8 +30,10 @@ static ASN1_ITEM_EXP *item_type[] = {
     ASN1_ITEM_ref(ASN1_SEQUENCE),
     ASN1_ITEM_ref(AUTHORITY_INFO_ACCESS),
     ASN1_ITEM_ref(BIGNUM),
+#ifndef OPENSSL_NO_EC
     ASN1_ITEM_ref(ECPARAMETERS),
     ASN1_ITEM_ref(ECPKPARAMETERS),
+#endif
     ASN1_ITEM_ref(GENERAL_NAME),
     ASN1_ITEM_ref(GENERAL_SUBTREE),
     ASN1_ITEM_ref(NAME_CONSTRAINTS),