From c6efa8a91af1d4fdb43909a23a0a4ffa012155ad Mon Sep 17 00:00:00 2001
From: "djm@openbsd.org" <djm@openbsd.org>
Date: Tue, 26 Nov 2019 23:41:23 +0000
Subject: upstream: add dummy security key middleware based on work by

markus@

This will allow us to test U2F/FIDO2 support in OpenSSH without
requiring real hardware.

ok markus@

OpenBSD-Regress-ID: 88b309464b8850c320cf7513f26d97ee1fdf9aae
---
 regress/misc/sk-dummy/Makefile | 67 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 regress/misc/sk-dummy/Makefile

(limited to 'regress/misc/sk-dummy/Makefile')

diff --git a/regress/misc/sk-dummy/Makefile b/regress/misc/sk-dummy/Makefile
new file mode 100644
index 000000000..db229aa1f
--- /dev/null
+++ b/regress/misc/sk-dummy/Makefile
@@ -0,0 +1,67 @@
+#	$OpenBSD: Makefile,v 1.1 2019/11/26 23:41:23 djm Exp $
+
+.include <bsd.own.mk>
+.include <bsd.obj.mk>
+
+PROG=	sk-dummy.so
+NOMAN=
+
+SSHREL=../../../../../usr.bin/ssh
+.PATH: ${.CURDIR}/${SSHREL}
+
+SRCS=sk-dummy.c
+# From usr.bin/ssh
+SRCS+=ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c
+SRCS+=digest-openssl.c ssherr.c fatal.c sshbuf.c log.c cleanup.c
+OPENSSL?=	yes
+
+CFLAGS+=	-fPIC
+
+.if (${OPENSSL:L} == "yes")
+CFLAGS+=	-DWITH_OPENSSL
+.endif
+
+# enable warnings
+WARNINGS=Yes
+
+DEBUG=-g
+CFLAGS+=	-fstack-protector-all
+CDIAGFLAGS=	-Wall
+CDIAGFLAGS+=	-Wextra
+CDIAGFLAGS+=	-Werror
+CDIAGFLAGS+=	-Wchar-subscripts
+CDIAGFLAGS+=	-Wcomment
+CDIAGFLAGS+=	-Wformat
+CDIAGFLAGS+=	-Wformat-security
+CDIAGFLAGS+=	-Wimplicit
+CDIAGFLAGS+=	-Winline
+CDIAGFLAGS+=	-Wmissing-declarations
+CDIAGFLAGS+=	-Wmissing-prototypes
+CDIAGFLAGS+=	-Wparentheses
+CDIAGFLAGS+=	-Wpointer-arith
+CDIAGFLAGS+=	-Wreturn-type
+CDIAGFLAGS+=	-Wshadow
+CDIAGFLAGS+=	-Wsign-compare
+CDIAGFLAGS+=	-Wstrict-aliasing
+CDIAGFLAGS+=	-Wstrict-prototypes
+CDIAGFLAGS+=	-Wswitch
+CDIAGFLAGS+=	-Wtrigraphs
+CDIAGFLAGS+=	-Wuninitialized
+CDIAGFLAGS+=	-Wunused
+CDIAGFLAGS+=	-Wno-unused-parameter
+.if ${COMPILER_VERSION:L} != "gcc3"
+CDIAGFLAGS+=	-Wold-style-definition
+.endif
+
+CFLAGS+=-I${.CURDIR}/${SSHREL}
+
+.if (${OPENSSL:L} == "yes")
+LDADD+= -lcrypto
+DPADD+= ${LIBCRYPTO}
+.endif
+
+$(PROG): $(OBJS)
+	$(CC) $(LDFLAGS) -shared -o $@ $(OBJS) $(LDADD)
+
+.include <bsd.prog.mk>
+
-- 
cgit v1.2.3


From d46ac56f1cbd5a855a2d5e7309f90d383dcf6431 Mon Sep 17 00:00:00 2001
From: "djm@openbsd.org" <djm@openbsd.org>
Date: Fri, 29 Nov 2019 00:13:29 +0000
Subject: upstream: lots of dependencies go away here with ed25519 no longer

needing the ssh_digest API.

OpenBSD-Regress-ID: 785847ec78cb580d141e29abce351a436d6b5d49
---
 Makefile.in                    | 3 +--
 regress/misc/sk-dummy/Makefile | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'regress/misc/sk-dummy/Makefile')

diff --git a/Makefile.in b/Makefile.in
index 8528db3b6..d47b08345 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -596,8 +596,7 @@ regress/misc/kexfuzz/kexfuzz$(EXEEXT): ${MISC_KEX_FUZZ_OBJS} libssh.a
 # These all need to be compiled -fPIC, so they are treated differently.
 SK_DUMMY_OBJS=\
 	regress/misc/sk-dummy/sk-dummy.lo \
-	ed25519.lo hash.lo ge25519.lo fe25519.lo sc25519.lo verify.lo \
-	digest-openssl.lo ssherr.lo fatal.lo sshbuf.lo log.lo cleanup.lo
+	ed25519.lo hash.lo ge25519.lo fe25519.lo sc25519.lo verify.lo
 
 .c.lo:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c $< -o $@
diff --git a/regress/misc/sk-dummy/Makefile b/regress/misc/sk-dummy/Makefile
index db229aa1f..29e313c82 100644
--- a/regress/misc/sk-dummy/Makefile
+++ b/regress/misc/sk-dummy/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2019/11/26 23:41:23 djm Exp $
+#	$OpenBSD: Makefile,v 1.2 2019/11/29 00:13:29 djm Exp $
 
 .include <bsd.own.mk>
 .include <bsd.obj.mk>
@@ -12,7 +12,6 @@ SSHREL=../../../../../usr.bin/ssh
 SRCS=sk-dummy.c
 # From usr.bin/ssh
 SRCS+=ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c
-SRCS+=digest-openssl.c ssherr.c fatal.c sshbuf.c log.c cleanup.c
 OPENSSL?=	yes
 
 CFLAGS+=	-fPIC
-- 
cgit v1.2.3