From d46ac56f1cbd5a855a2d5e7309f90d383dcf6431 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Fri, 29 Nov 2019 00:13:29 +0000 Subject: [PATCH] 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(-) 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 .include @@ -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