diff options
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/lib/libssh/Makefile | 4 | ||||
| -rw-r--r-- | secure/libexec/sftp-server/Makefile | 2 | ||||
| -rw-r--r-- | secure/libexec/ssh-sk-helper/Makefile | 2 | ||||
| -rw-r--r-- | secure/ssh.mk | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 4fc0082ba747..66b70d96b005 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -32,12 +32,12 @@ SRCS= ${LIBOPENSSH_SRCS} \ ssh-pkcs11.c smult_curve25519_ref.c \ poly1305.c chacha.c cipher-chachapoly.c cipher-chachapoly-libcrypto.c \ ssh-ed25519.c digest-openssl.c digest-libc.c \ - hmac.c ed25519.c hash.c \ + hmac.c ed25519.c ed25519-openssl.c \ kex.c kex-names.c kexdh.c kexgex.c kexecdh.c kexc25519.c \ kexgexc.c kexgexs.c \ kexsntrup761x25519.c kexmlkem768x25519.c sntrup761.c kexgen.c \ sftp-realpath.c platform-pledge.c platform-tracing.c platform-misc.c \ - sshbuf-io.c misc-agent.c + sshbuf-io.c misc-agent.c ssherr-libcrypto.c # Add ${SKSRCS} to avoid linking problems. SRCS+= ${SKSRCS} diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile index 20f2d4639511..cc8907b34dd2 100644 --- a/secure/libexec/sftp-server/Makefile +++ b/secure/libexec/sftp-server/Makefile @@ -2,7 +2,7 @@ .include "${SRCTOP}/secure/ssh.mk" PROG= sftp-server -SRCS= sftp-common.c sftp-server.c sftp-server-main.c $(SKSRCS) +SRCS= sftp-common.c sftp-server.c sftp-server-main.c ssherr-nolibcrypto.c $(SKSRCS) MAN= sftp-server.8 LIBADD= ssh diff --git a/secure/libexec/ssh-sk-helper/Makefile b/secure/libexec/ssh-sk-helper/Makefile index 622b0ac682bd..837599df80b0 100644 --- a/secure/libexec/ssh-sk-helper/Makefile +++ b/secure/libexec/ssh-sk-helper/Makefile @@ -2,7 +2,7 @@ .include "${SRCTOP}/secure/ssh.mk" PROG= ssh-sk-helper -SRCS= ssh-sk-helper.c ssh-sk.c sk-usbhid.c +SRCS= ssh-sk-helper.c ssh-sk.c sk-usbhid.c ssherr-nolibcrypto.c MAN= ssh-sk-helper.8 CFLAGS+=-I${SRCTOP}/contrib/libfido2/src diff --git a/secure/ssh.mk b/secure/ssh.mk index 816081df219e..b7b7a794b9c7 100644 --- a/secure/ssh.mk +++ b/secure/ssh.mk @@ -4,7 +4,7 @@ SSHDIR= ${SRCTOP}/crypto/openssh -SFTP_CLIENT_SRCS=sftp-common.c sftp-client.c sftp-glob.c +SFTP_CLIENT_SRCS=sftp-common.c sftp-client.c sftp-glob.c ssherr-nolibcrypto.c SKSRCS= ssh-sk-client.c CFLAGS+= -I${SSHDIR} -I${SSHDIR}/openbsd-compat/include -include ssh_namespace.h |