openssh: Fix build.sh to use upstream Makefile for building

Signed-off-by: Arthur Chan <arthur.chan@adalogics.com>

Author: arthurscchan

projects/openssh/build.sh

@@ -23,7 +23,6 @@ sed -i 's|\(usleep.*\)|// \1|' ssh-agent.c
 
 # Build project
 autoreconf
-env
 if ! env CFLAGS="" ./configure \
     --without-hardening \
     --without-zlib-version-check \
@@ -37,52 +36,20 @@ if ! env CFLAGS="" ./configure \
 fi
 make -j$(nproc) all
 
-# Build fuzzers
-EXTRA_CFLAGS="-DCIPHER_NONE_AVAIL=1 -D_GNU_SOURCE -Iopenbsd-compat/include"
-STATIC_CRYPTO="-Wl,-Bstatic -lcrypto -Wl,-Bdynamic"
-
-SK_NULL=ssh-sk-null.o
-SK_DUMMY=sk-dummy.o
-COMMON_DEPS="ssh-pkcs11-client.o -lssh -lopenbsd-compat"
-
-$CC $CFLAGS $EXTRA_CFLAGS -I. -g -c \
-	regress/misc/fuzz-harness/ssh-sk-null.cc -o ssh-sk-null.o
-$CC $CFLAGS $EXTRA_CFLAGS -I. -g -c \
-	-DSK_DUMMY_INTEGRATE=1 regress/misc/sk-dummy/sk-dummy.c -o sk-dummy.o
-
-$CXX $CXXFLAGS -std=c++11 $EXTRA_CFLAGS -I. -L. -Lopenbsd-compat -g \
-	regress/misc/fuzz-harness/pubkey_fuzz.cc -o $OUT/pubkey_fuzz \
-	$COMMON_DEPS $SK_NULL $STATIC_CRYPTO $LIB_FUZZING_ENGINE
-$CXX $CXXFLAGS -std=c++11 $EXTRA_CFLAGS -I. -L. -Lopenbsd-compat -g \
-	regress/misc/fuzz-harness/privkey_fuzz.cc -o $OUT/privkey_fuzz \
-	$COMMON_DEPS $SK_NULL $STATIC_CRYPTO $LIB_FUZZING_ENGINE
-$CXX $CXXFLAGS -std=c++11 $EXTRA_CFLAGS -I. -L. -Lopenbsd-compat -g \
-	regress/misc/fuzz-harness/sig_fuzz.cc -o $OUT/sig_fuzz \
-	$COMMON_DEPS $SK_NULL $STATIC_CRYPTO $LIB_FUZZING_ENGINE
-$CXX $CXXFLAGS -std=c++11 $EXTRA_CFLAGS -I. -L. -Lopenbsd-compat -g \
-	regress/misc/fuzz-harness/authopt_fuzz.cc -o $OUT/authopt_fuzz \
-	auth-options.o $COMMON_DEPS $SK_NULL $STATIC_CRYPTO \
-	$LIB_FUZZING_ENGINE
-$CXX $CXXFLAGS -std=c++11 $EXTRA_CFLAGS -I. -L. -Lopenbsd-compat -g \
-	regress/misc/fuzz-harness/sshsig_fuzz.cc -o $OUT/sshsig_fuzz \
-	sshsig.o $COMMON_DEPS $SK_NULL $STATIC_CRYPTO \
-	$LIB_FUZZING_ENGINE
-$CXX $CXXFLAGS -std=c++11 $EXTRA_CFLAGS -I. -L. -Lopenbsd-compat -g \
-	regress/misc/fuzz-harness/sshsigopt_fuzz.cc -o $OUT/sshsigopt_fuzz \
-	sshsig.o $COMMON_DEPS $SK_NULL $STATIC_CRYPTO \
-	$LIB_FUZZING_ENGINE
-$CXX $CXXFLAGS -std=c++11 $EXTRA_CFLAGS -I. -L. -Lopenbsd-compat -g \
-	regress/misc/fuzz-harness/kex_fuzz.cc -o $OUT/kex_fuzz \
-	$COMMON_DEPS -lz $SK_NULL $STATIC_CRYPTO \
-	$LIB_FUZZING_ENGINE
-
-$CC $CFLAGS $EXTRA_CFLAGS -I. -g -c \
-	regress/misc/fuzz-harness/agent_fuzz_helper.c -o agent_fuzz_helper.o
-$CC $CFLAGS $EXTRA_CFLAGS -I. -g -c -DENABLE_SK_INTERNAL=1 ssh-sk.c -o ssh-sk.o
-$CXX $CXXFLAGS -std=c++11 $EXTRA_CFLAGS -I. -L. -Lopenbsd-compat -g \
-	regress/misc/fuzz-harness/agent_fuzz.cc -o $OUT/agent_fuzz \
-	$SK_DUMMY agent_fuzz_helper.o ssh-sk.o $COMMON_DEPS -lz \
-	$STATIC_CRYPTO $LIB_FUZZING_ENGINE
+# Build fuzzers using upstream Makefile
+FUZZER_TARGETS=$(cd regress/misc/fuzz-harness && ls *_fuzz.cc 2>/dev/null | grep -v sntrup761 | sed 's/\.cc$//' | tr '\n' ' ')
+make -C regress/misc/fuzz-harness $FUZZER_TARGETS \
+	CC="$CC" \
+	CXX="$CXX" \
+	CFLAGS="-D_GNU_SOURCE=1 -DCIPHER_NONE_AVAIL=1 -I ../../.. -I ../../../openbsd-compat/include $CFLAGS" \
+	CXXFLAGS="-D_GNU_SOURCE=1 -DCIPHER_NONE_AVAIL=1 -I ../../.. -I ../../../openbsd-compat/include $CXXFLAGS" \
+	FUZZ_FLAGS="$CXXFLAGS" \
+	FUZZ_LIBS="$LIB_FUZZING_ENGINE" \
+	COMMON_OBJS="../../../ssh-pkcs11-client.o" \
+	LIBS="../../../ssh-pkcs11-client.o -lssh -lopenbsd-compat -Wl,-Bstatic -lcrypto -Wl,-Bdynamic \$(FUZZ_LIBS)"
+
+# Copy all fuzzers to output directory
+cp regress/misc/fuzz-harness/*_fuzz $OUT/
 
 # Prepare seed corpora
 CASES="$SRC/openssh-fuzz-cases"
@@ -93,4 +60,4 @@ CASES="$SRC/openssh-fuzz-cases"
 (set -e ; cd ${CASES}/sshsig ; zip -r $OUT/sshsig_fuzz_seed_corpus.zip .)
 (set -e ; cd ${CASES}/sshsigopt ; zip -r $OUT/sshsigopt_fuzz_seed_corpus.zip .)
 (set -e ; cd ${CASES}/kex ; zip -r $OUT/kex_fuzz_seed_corpus.zip .)
-(set -e ; cd ${CASES}/agent ; zip -r $OUT/agent_fuzz_seed_corpus.zip .)
+(set -e ; cd ${CASES}/agent ; zip -r $OUT/agent_fuzz_seed_corpus.zip .)