From a05b0bcf878c8c52824e8ee4bb6c1853fa23800b Mon Sep 17 00:00:00 2001
From: Kurt Roeckx <kurt@roeckx.be>
Date: Fri, 1 Jul 2016 16:42:15 +0200
Subject: [PATCH] Re-add x509 and crl fuzzer

Reviewed-by: Rich Salz <rsalz@openssl.org>

GH: #1276
---
 fuzz/build.info             | 10 +++++++++-
 fuzz/build.info.fuzz        | 10 +++++++++-
 fuzz/crl.c                  |  4 ++++
 fuzz/x509.c                 |  4 ++++
 test/recipes/05-test_fuzz.t |  2 +-
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/fuzz/build.info b/fuzz/build.info
index 861f4ef9be..c920e95dc1 100644
--- a/fuzz/build.info
+++ b/fuzz/build.info
@@ -1,5 +1,5 @@
 {- use File::Spec::Functions qw/catdir rel2abs/; -}
-PROGRAMS=asn1-test asn1parse-test bignum-test bndiv-test cms-test conf-test ct-test server-test
+PROGRAMS=asn1-test asn1parse-test bignum-test bndiv-test cms-test conf-test crl-test ct-test server-test x509-test
 
 SOURCE[asn1-test]=asn1.c test-corpus.c
 INCLUDE[asn1-test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
@@ -25,6 +25,10 @@ SOURCE[conf-test]=conf.c test-corpus.c
 INCLUDE[conf-test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
 DEPEND[conf-test]=../libcrypto
 
+SOURCE[crl-test]=crl.c test-corpus.c
+INCLUDE[crl-test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+DEPEND[crl-test]=../libcrypto
+
 SOURCE[ct-test]=ct.c test-corpus.c
 INCLUDE[ct-test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
 DEPEND[ct-test]=../libcrypto
@@ -32,3 +36,7 @@ DEPEND[ct-test]=../libcrypto
 SOURCE[server-test]=server.c test-corpus.c
 INCLUDE[server-test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
 DEPEND[server-test]=../libcrypto ../libssl
+
+SOURCE[x509-test]=x509.c test-corpus.c
+INCLUDE[x509-test]="{- rel2abs(catdir($builddir,"../include")) -}" ../include
+DEPEND[x509-test]=../libcrypto
diff --git a/fuzz/build.info.fuzz b/fuzz/build.info.fuzz
index fafc1dfaca..1c0506b471 100644
--- a/fuzz/build.info.fuzz
+++ b/fuzz/build.info.fuzz
@@ -8,7 +8,7 @@
    ""
 -}
 
-PROGRAMS=asn1 asn1parse bignum bndiv cms conf ct server
+PROGRAMS=asn1 asn1parse bignum bndiv cms conf crl ct server x509
 
 SOURCE[asn1]=asn1.c driver.c
 INCLUDE[asn1]="{- rel2abs(catdir($builddir,"../include")) -}" ../include {- $ex_inc -}
@@ -34,6 +34,10 @@ SOURCE[conf]=conf.c driver.c
 INCLUDE[conf]="{- rel2abs(catdir($builddir,"../include")) -}" ../include {- $ex_inc -}
 DEPEND[conf]=../libcrypto {- $ex_lib -}
 
+SOURCE[crl]=crl.c driver.c
+INCLUDE[crl]="{- rel2abs(catdir($builddir,"../include")) -}" ../include {- $ex_inc -}
+DEPEND[crl]=../libcrypto {- $ex_lib -}
+
 SOURCE[ct]=ct.c driver.c
 INCLUDE[ct]="{- rel2abs(catdir($builddir,"../include")) -}" ../include {- $ex_inc -}
 DEPEND[ct]=../libcrypto {- $ex_lib -}
@@ -41,3 +45,7 @@ DEPEND[ct]=../libcrypto {- $ex_lib -}
 SOURCE[server]=server.c driver.c
 INCLUDE[server]="{- rel2abs(catdir($builddir,"../include")) -}" ../include {- $ex_inc -}
 DEPEND[server]=../libcrypto ../libssl {- $ex_lib -}
+
+SOURCE[x509]=x509.c driver.c
+INCLUDE[x509]="{- rel2abs(catdir($builddir,"../include")) -}" ../include {- $ex_inc -}
+DEPEND[x509]=../libcrypto {- $ex_lib -}
diff --git a/fuzz/crl.c b/fuzz/crl.c
index 4dd5b3b155..728943f551 100644
--- a/fuzz/crl.c
+++ b/fuzz/crl.c
@@ -12,6 +12,10 @@
 #include <openssl/bio.h>
 #include "fuzzer.h"
 
+int FuzzerInitialize(int *argc, char ***argv) {
+    return 1;
+}
+
 int FuzzerTestOneInput(const uint8_t *buf, size_t len) {
     const unsigned char *p = buf;
     unsigned char *der = NULL;
diff --git a/fuzz/x509.c b/fuzz/x509.c
index cc6ff83bab..b2851f1e11 100644
--- a/fuzz/x509.c
+++ b/fuzz/x509.c
@@ -12,6 +12,10 @@
 #include <openssl/bio.h>
 #include "fuzzer.h"
 
+int FuzzerInitialize(int *argc, char ***argv) {
+    return 1;
+}
+
 int FuzzerTestOneInput(const uint8_t *buf, size_t len) {
     const unsigned char *p = buf;
     unsigned char *der = NULL;
diff --git a/test/recipes/05-test_fuzz.t b/test/recipes/05-test_fuzz.t
index f5ae228de4..ec5c5ad4ed 100755
--- a/test/recipes/05-test_fuzz.t
+++ b/test/recipes/05-test_fuzz.t
@@ -14,7 +14,7 @@ use OpenSSL::Test qw/:DEFAULT srctop_file/;
 
 setup("test_fuzz");
 
-my @fuzzers = ('asn1', 'asn1parse', 'bignum', 'bndiv', 'cms', 'conf', 'ct', 'server');
+my @fuzzers = ('asn1', 'asn1parse', 'bignum', 'bndiv', 'cms', 'conf', 'crl', 'ct', 'server', 'x509');
 plan tests => scalar @fuzzers;
 
 foreach my $f (@fuzzers) {
-- 
GitLab