New upstream release (7.9p1)

2 files changed, 38 insertions, 2 deletions

diff --git a/regress/misc/fuzz-harness/Makefile b/regress/misc/fuzz-harness/Makefile
index 8fbfc20c6..a2aa4441f 100644
--- a/regress/misc/fuzz-harness/Makefile
+++ b/regress/misc/fuzz-harness/Makefile
@@ -7,7 +7,7 @@ CXXFLAGS=-O2 -g -Wall -Wextra -I ../../.. $(FUZZ_FLAGS)
 LDFLAGS=-L ../../.. -L ../../../openbsd-compat -g $(FUZZ_FLAGS)
 LIBS=-lssh -lopenbsd-compat -lcrypto $(FUZZ_LIBS)
 
-all: pubkey_fuzz sig_fuzz
+all: pubkey_fuzz sig_fuzz authopt_fuzz
 
 .cc.o:
         $(CXX) $(CXXFLAGS) -c $< -o $@
@@ -18,5 +18,8 @@ pubkey_fuzz: pubkey_fuzz.o
 sig_fuzz: sig_fuzz.o
         $(CXX) -o $@ sig_fuzz.o $(LDFLAGS) $(LIBS)
 
+authopt_fuzz: authopt_fuzz.o
+        $(CXX) -o $@ authopt_fuzz.o ../../../auth-options.o $(LDFLAGS) $(LIBS)
+
 clean:
-        -rm -f *.o pubkey_fuzz sig_fuzz
+        -rm -f *.o pubkey_fuzz sig_fuzz authopt_fuzz
diff --git a/regress/misc/fuzz-harness/authopt_fuzz.cc b/regress/misc/fuzz-harness/authopt_fuzz.cc
new file mode 100644
index 000000000..a76d5a3f1
--- /dev/null
+++ b/regress/misc/fuzz-harness/authopt_fuzz.cc
@@ -0,0 +1,33 @@
+#include <stddef.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+
+extern "C" {
+
+#include "auth-options.h"
+
+int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+        char *cp = (char *)malloc(size + 1);
+        struct sshauthopt *opts = NULL, *merge = NULL, *add = sshauthopt_new();
+
+        if (cp == NULL || add == NULL)
+                goto out;
+        memcpy(cp, data, size);
+        cp[size] = '\0';
+        if ((opts = sshauthopt_parse(cp, NULL)) == NULL)
+                goto out;
+        if ((merge = sshauthopt_merge(opts, add, NULL)) == NULL)
+                goto out;
+
+ out:
+        free(cp);
+        sshauthopt_free(add);
+        sshauthopt_free(opts);
+        sshauthopt_free(merge);
+        return 0;
+}
+
+} // extern "C"