From d3b6aeb546242c9e61721225ac4387d416dd3d5e Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Fri, 20 Oct 2017 02:13:41 +0000 Subject: upstream commit more RCSIDs Upstream-Regress-ID: 1aecbe3f8224793f0ec56741a86d619830eb33be --- regress/misc/kexfuzz/README | 2 ++ 1 file changed, 2 insertions(+) (limited to 'regress/misc') diff --git a/regress/misc/kexfuzz/README b/regress/misc/kexfuzz/README index abd7b50ee..504c26f3b 100644 --- a/regress/misc/kexfuzz/README +++ b/regress/misc/kexfuzz/README @@ -30,3 +30,5 @@ Limitations: kexfuzz can't change the ordering of packets at present. It is limited to replacing individual packets with fuzzed variants with the same type. It really should allow insertion, deletion on replacement of packets too. + +$OpenBSD: README,v 1.3 2017/10/20 02:13:41 djm Exp $ -- cgit v1.2.3 From f6b50bf84dc0b61f22c887c00423e0ea7644e844 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Thu, 21 Dec 2017 05:46:35 +0000 Subject: upstream commit another libssh casualty OpenBSD-Regress-ID: 839b970560246de23e7c50215095fb527a5a83ec --- regress/misc/kexfuzz/Makefile | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) (limited to 'regress/misc') diff --git a/regress/misc/kexfuzz/Makefile b/regress/misc/kexfuzz/Makefile index d0aca8dfe..a7bb6b70d 100644 --- a/regress/misc/kexfuzz/Makefile +++ b/regress/misc/kexfuzz/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2017/04/17 11:02:31 jsg Exp $ +# $OpenBSD: Makefile,v 1.3 2017/12/21 05:46:35 djm Exp $ .include .include @@ -9,6 +9,25 @@ OPENSSL?= yes PROG= kexfuzz SRCS= kexfuzz.c + +SSHREL=../../../../../usr.bin/ssh +.PATH: ${.CURDIR}/${SSHREL} +# From usr.bin/ssh +SRCS+=sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c +SRCS+=atomicio.c sshkey.c authfile.c cipher.c log.c ssh-rsa.c ssh-dss.c +SRCS+=ssh-ecdsa.c ssh-ed25519.c mac.c umac.c umac128.c hmac.c misc.c +SRCS+=ssherr.c uidswap.c cleanup.c xmalloc.c match.c krl.c fatal.c +SRCS+=addrmatch.c bitmap.c packet.c dispatch.c canohost.c ssh_api.c +SRCS+=kex.c kexc25519.c kexc25519c.c kexc25519s.c kexdh.c kexdhc.c kexdhs.c +SRCS+=kexecdh.c kexecdhc.c kexecdhs.c kexgex.c kexgexc.c kexgexs.c +SRCS+=dh.c compat.c +SRCS+=ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c +SRCS+=cipher-chachapoly.c chacha.c poly1305.c +SRCS+=smult_curve25519_ref.c + +SRCS+=digest-openssl.c +#SRCS+=digest-libc.c + NOMAN= 1 .if (${OPENSSL:L} == "yes") @@ -49,23 +68,14 @@ CDIAGFLAGS+= -Wswitch CDIAGFLAGS+= -Wtrigraphs CDIAGFLAGS+= -Wuninitialized CDIAGFLAGS+= -Wunused +CDIAGFLAGS+= -Wno-unused-parameter .if ${COMPILER_VERSION:L} != "gcc3" -CDIAGFLAGS+= -Wpointer-sign CDIAGFLAGS+= -Wold-style-definition .endif -SSHREL=../../../../../usr.bin/ssh CFLAGS+=-I${.CURDIR}/${SSHREL} -.if exists(${.CURDIR}/${SSHREL}/lib/${__objdir}) -LDADD+=-L${.CURDIR}/${SSHREL}/lib/${__objdir} -lssh -DPADD+=${.CURDIR}/${SSHREL}/lib/${__objdir}/libssh.a -.else -LDADD+=-L${.CURDIR}/${SSHREL}/lib -lssh -DPADD+=${.CURDIR}/${SSHREL}/lib/libssh.a -.endif - LDADD+= -lutil -lz DPADD+= ${LIBUTIL} ${LIBZ} -- cgit v1.2.3 From 4f29309c4cb19bcb1774931db84cacc414f17d29 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 3 Jan 2018 19:50:43 +1100 Subject: unbreak fuzz harness --- regress/misc/fuzz-harness/sig_fuzz.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'regress/misc') diff --git a/regress/misc/fuzz-harness/sig_fuzz.cc b/regress/misc/fuzz-harness/sig_fuzz.cc index 0e535b49a..dd1fda091 100644 --- a/regress/misc/fuzz-harness/sig_fuzz.cc +++ b/regress/misc/fuzz-harness/sig_fuzz.cc @@ -37,13 +37,13 @@ int LLVMFuzzerTestOneInput(const uint8_t* sig, size_t slen) static const size_t dlen = strlen(data); #ifdef WITH_OPENSSL - sshkey_verify(rsa, sig, slen, (const u_char *)data, dlen, 0); - sshkey_verify(dsa, sig, slen, (const u_char *)data, dlen, 0); - sshkey_verify(ecdsa256, sig, slen, (const u_char *)data, dlen, 0); - sshkey_verify(ecdsa384, sig, slen, (const u_char *)data, dlen, 0); - sshkey_verify(ecdsa521, sig, slen, (const u_char *)data, dlen, 0); + sshkey_verify(rsa, sig, slen, (const u_char *)data, dlen, NULL, 0); + sshkey_verify(dsa, sig, slen, (const u_char *)data, dlen, NULL, 0); + sshkey_verify(ecdsa256, sig, slen, (const u_char *)data, dlen, NULL, 0); + sshkey_verify(ecdsa384, sig, slen, (const u_char *)data, dlen, NULL, 0); + sshkey_verify(ecdsa521, sig, slen, (const u_char *)data, dlen, NULL, 0); #endif - sshkey_verify(ed25519, sig, slen, (const u_char *)data, dlen, 0); + sshkey_verify(ed25519, sig, slen, (const u_char *)data, dlen, NULL, 0); return 0; } -- cgit v1.2.3