diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-11-29 00:13:29 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-29 11:19:48 +1100 |
commit | d46ac56f1cbd5a855a2d5e7309f90d383dcf6431 (patch) | |
tree | 9d1ede575985bfa514d19746e4f5b3af87c9eb91 | |
parent | 7404b81f25a4a7847380c0f0cf7f1bea5f0a5cd3 (diff) |
upstream: lots of dependencies go away here with ed25519 no longer
needing the ssh_digest API.
OpenBSD-Regress-ID: 785847ec78cb580d141e29abce351a436d6b5d49
-rw-r--r-- | Makefile.in | 3 | ||||
-rw-r--r-- | 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 | |||
596 | # These all need to be compiled -fPIC, so they are treated differently. | 596 | # These all need to be compiled -fPIC, so they are treated differently. |
597 | SK_DUMMY_OBJS=\ | 597 | SK_DUMMY_OBJS=\ |
598 | regress/misc/sk-dummy/sk-dummy.lo \ | 598 | regress/misc/sk-dummy/sk-dummy.lo \ |
599 | ed25519.lo hash.lo ge25519.lo fe25519.lo sc25519.lo verify.lo \ | 599 | ed25519.lo hash.lo ge25519.lo fe25519.lo sc25519.lo verify.lo |
600 | digest-openssl.lo ssherr.lo fatal.lo sshbuf.lo log.lo cleanup.lo | ||
601 | 600 | ||
602 | .c.lo: | 601 | .c.lo: |
603 | $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c $< -o $@ | 602 | $(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 @@ | |||
1 | # $OpenBSD: Makefile,v 1.1 2019/11/26 23:41:23 djm Exp $ | 1 | # $OpenBSD: Makefile,v 1.2 2019/11/29 00:13:29 djm Exp $ |
2 | 2 | ||
3 | .include <bsd.own.mk> | 3 | .include <bsd.own.mk> |
4 | .include <bsd.obj.mk> | 4 | .include <bsd.obj.mk> |
@@ -12,7 +12,6 @@ SSHREL=../../../../../usr.bin/ssh | |||
12 | SRCS=sk-dummy.c | 12 | SRCS=sk-dummy.c |
13 | # From usr.bin/ssh | 13 | # From usr.bin/ssh |
14 | SRCS+=ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c | 14 | SRCS+=ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c |
15 | SRCS+=digest-openssl.c ssherr.c fatal.c sshbuf.c log.c cleanup.c | ||
16 | OPENSSL?= yes | 15 | OPENSSL?= yes |
17 | 16 | ||
18 | CFLAGS+= -fPIC | 17 | CFLAGS+= -fPIC |