diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2019-09-06 05:59:42 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2019-09-06 05:59:42 +0000 |
| commit | 0188ffb2ef92e1045cca9a9c4ee2349809955935 (patch) | |
| tree | 6931724fadfdde068692dc6b1b2ef6b998b7ee94 /usr.bin | |
| parent | ca8b81b8f1eca373a3dc57064510d030f82a0691 (diff) | |
avoid compiling certain files that deeply depend on libcrypto when
WITH_OPENSSL isn't set
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/Makefile.inc | 8 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh-agent/Makefile | 5 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh-keygen/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh-pkcs11-helper/Makefile | 4 |
4 files changed, 13 insertions, 8 deletions
diff --git a/usr.bin/ssh/Makefile.inc b/usr.bin/ssh/Makefile.inc index 686107d87cf..43d1448d422 100644 --- a/usr.bin/ssh/Makefile.inc +++ b/usr.bin/ssh/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.68 2019/08/16 06:35:27 djm Exp $ +# $OpenBSD: Makefile.inc,v 1.69 2019/09/06 05:59:41 djm Exp $ .include <bsd.own.mk> @@ -107,9 +107,13 @@ SRCS_UTL+= addrmatch.c SRCS_UTL+= match.c .if (${OPENSSL:L} == "yes") -SRCS_PKCS11+= ssh-pkcs11.c +SRCS_PKCS11+= ssh-pkcs11.c +SRCS_PKCS11_CLIENT+= ssh-pkcs11-client.c +SRCS_MODULI+= moduli.c .else SRCS_PKCS11+= +SRCS_PKCS11_CLIENT+= +SRCS_MODULI+= .endif WITH_XMSS?= no diff --git a/usr.bin/ssh/ssh-agent/Makefile b/usr.bin/ssh/ssh-agent/Makefile index dadb2226eba..19f9ba47cbc 100644 --- a/usr.bin/ssh/ssh-agent/Makefile +++ b/usr.bin/ssh/ssh-agent/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.31 2018/07/25 17:12:35 deraadt Exp $ +# $OpenBSD: Makefile,v 1.32 2019/09/06 05:59:41 djm Exp $ .PATH: ${.CURDIR}/.. -SRCS= ssh-agent.c ssh-pkcs11-client.c +SRCS= ssh-agent.c ${SRCS_PKCS11_CLIENT} SRCS+= atomicio.c compat.c fatal.c readpass.c SRCS+= ${SRCS_BASE} ${SRCS_KEY} ${SRCS_KEYP} ${SRCS_KRL} ${SRCS_UTL} + PROG= ssh-agent BINOWN= root BINGRP= _sshagnt diff --git a/usr.bin/ssh/ssh-keygen/Makefile b/usr.bin/ssh/ssh-keygen/Makefile index db4166be9d3..7e969fc3104 100644 --- a/usr.bin/ssh/ssh-keygen/Makefile +++ b/usr.bin/ssh/ssh-keygen/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.31 2019/09/03 08:34:20 djm Exp $ +# $OpenBSD: Makefile,v 1.32 2019/09/06 05:59:41 djm Exp $ .PATH: ${.CURDIR}/.. -SRCS= ssh-keygen.c moduli.c +SRCS= ssh-keygen.c ${SRCS_MODULI} SRCS+= atomicio.c authfd.c cleanup.c dns.c fatal.c hmac.c hostfile.c \ readpass.c utf8.c sshsig.c SRCS+= ${SRCS_BASE} ${SRCS_KEY} ${SRCS_KEYP} ${SRCS_KRL} ${SRCS_UTL} \ diff --git a/usr.bin/ssh/ssh-pkcs11-helper/Makefile b/usr.bin/ssh/ssh-pkcs11-helper/Makefile index 72cf97c8753..cef4618c485 100644 --- a/usr.bin/ssh/ssh-pkcs11-helper/Makefile +++ b/usr.bin/ssh/ssh-pkcs11-helper/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.8 2018/07/25 17:12:35 deraadt Exp $ +# $OpenBSD: Makefile,v 1.9 2019/09/06 05:59:41 djm Exp $ .PATH: ${.CURDIR}/.. -SRCS= ssh-pkcs11-helper.c ssh-pkcs11.c +SRCS= ssh-pkcs11-helper.c ${SRCS_PKCS11} SRCS+= atomicio.c compat.c fatal.c readpass.c SRCS+= ${SRCS_KEY} ${SRCS_UTL} ${SRCS_BASE} |