tests: added reproducer for client issues

This allows to reproduce issues found on client handling, by adding
a transcript in client-interesting. Currently it contains values
found using oss-fuzz.

The client3.disabled transcript is disabled because it depends
on a fix in nettle.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

diff --git a/devel/fuzz/gnutls_client_fuzzer.cc b/devel/fuzz/gnutls_client_fuzzer.cc
index b155ca5edf374ac794f0a9260771a6c7481bab26..5a198ce9ea19f72dbacfe8b702af79ec992930de 100644 (file)
--- a/devel/fuzz/gnutls_client_fuzzer.cc
+++ b/devel/fuzz/gnutls_client_fuzzer.cc
@@ -26,7 +26,10 @@
 #include <gnutls/gnutls.h>
 
 
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+#ifdef __cplusplus
+extern "C"
+#endif
+int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     int res;
     gnutls_session_t session;
     gnutls_certificate_credentials_t xcred;

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2e769483d17b11b0c211d249a095ba16d9cb2d67..3e99d66b1f7d54f58ce0a299d728d2fa6d8fa468 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -38,7 +38,8 @@ EXTRA_DIST = suppressions.valgrind eagain-common.h cert-common.h test-chains.h \
        certs-interesting/cert3.der.err certs-interesting/cert4.der certs-interesting/cert5.der \
        certs-interesting/cert6.der \
        certs-interesting/cert3.der.err certs-interesting/cert4.der pkcs7-interesting/pkcs7-1.der \
-       pkcs7-interesting/pkcs7-1.der.err pkcs7-interesting/pkcs7-2.der pkcs7-interesting/pkcs7-2.der.err
+       pkcs7-interesting/pkcs7-1.der.err pkcs7-interesting/pkcs7-2.der pkcs7-interesting/pkcs7-2.der.err \
+       client-interesting/client1.raw client-interesting/client2.raw client-interesting/client3.disabled
 
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 AM_CPPFLAGS = \
@@ -322,5 +323,8 @@ TESTS_ENVIRONMENT =                                         \
        srcdir="$(srcdir)"
 
 if WANT_TEST_SUITE
+
+ctests += client
+
 LOG_COMPILER = $(VALGRIND)
 endif

diff --git a/tests/client-interesting/client1.raw b/tests/client-interesting/client1.raw
new file mode 100644 (file)
index 0000000..d2fce92
Binary files /dev/null and b/tests/client-interesting/client1.raw differ

diff --git a/tests/client-interesting/client2.raw b/tests/client-interesting/client2.raw
new file mode 100644 (file)
index 0000000..5939b16
Binary files /dev/null and b/tests/client-interesting/client2.raw differ

diff --git a/tests/client-interesting/client3.disabled b/tests/client-interesting/client3.disabled
new file mode 100644 (file)
index 0000000..8039698
Binary files /dev/null and b/tests/client-interesting/client3.disabled differ

diff --git a/tests/client.c b/tests/client.c
new file mode 100644 (file)
index 0000000..e284beb
--- /dev/null
+++ b/tests/client.c
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2016 Red Hat, Inc.
+ * Copyright 2016 Alex Gaynor, Google Inc.
+ *
+ * Author: Nikos Mavrogiannopoulos, Alex Gaynor
+ *
+ * This file is part of GnuTLS.
+ *
+ * GnuTLS is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuTLS is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GnuTLS; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <limits.h>
+#include <dirent.h>
+
+#include "utils.h"
+
+#define true 1
+
+/* This program will load certificates from CERT_DIR and try to print
+ * them. If CERT_DIR/certname.err is available, it should contain the
+ * error code that gnutls_x509_crt_import() should return.
+ */
+
+#define CERT_DIR "client-interesting"
+
+int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
+
+static int getnext(DIR **dirp, gnutls_datum_t *der)
+{
+       struct dirent *d;
+       char path[256];
+       char cert_dir[256];
+       const char *src;
+       int ret;
+
+       src = getenv("srcdir");
+       if (src == NULL)
+               src = ".";
+
+       snprintf(cert_dir, sizeof(cert_dir), "%s/%s", src, CERT_DIR);
+
+       if (*dirp == NULL) {
+               *dirp = opendir(cert_dir);
+               if (*dirp == NULL)
+                       return -1;
+       }
+
+       do {
+               d = readdir(*dirp);
+               if (d != NULL
+#ifdef _DIRENT_HAVE_D_TYPE
+                       && d->d_type == DT_REG
+#endif
+                       ) {
+                       if (strstr(d->d_name, ".raw") == 0)
+                               continue;
+                       snprintf(path, sizeof(path), "%s/%s", cert_dir, d->d_name);
+
+                       success("Loading %s\n", path);
+                       ret = gnutls_load_file(path, der);
+                       if (ret < 0) {
+                               return -1;
+                       }
+
+                       return 0;
+               }
+       } while(d != NULL);
+
+       closedir(*dirp);
+       return -1; /* finished */
+}
+
+#include "../devel/fuzz/gnutls_client_fuzzer.cc"
+
+void doit(void)
+{
+       int ret;
+       gnutls_datum_t raw;
+       DIR *dirp = NULL;
+
+       ret = global_init();
+       if (ret < 0)
+               fail("init %d\n", ret);
+
+       while (getnext(&dirp, &raw)==0) {
+               LLVMFuzzerTestOneInput(raw.data, raw.size);
+               gnutls_free(raw.data);
+               raw.data = NULL;
+               raw.size = 0;
+       }
+
+       gnutls_global_deinit();
+}