upstream: lots of dependencies go away here with ed25519 no longer

needing the ssh_digest API.

OpenBSD-Regress-ID: 785847ec78cb580d141e29abce351a436d6b5d49

diff --git a/Makefile.in b/Makefile.in
index 8528db3b630915f3c2cec097fa4b1d0f2411d18d..d47b083457be4fa9b0637bc62a869b995a50ac17 100644 (file)
--- 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 db229aa1f40ba3e358cdb365ff3a84163c410266..29e313c8296509d307c3787e0d3eee9171f7df9e 100644 (file)
--- 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