From 6c912f352370ae0f0c1b13019aa25839cd118df9 Mon Sep 17 00:00:00 2001 From: djm Date: Sun, 15 Jan 2023 23:35:10 +0000 Subject: [PATCH] adapt to ed25519 changes in src/usr.bin/ssh --- regress/usr.bin/ssh/misc/sk-dummy/Makefile | 4 ++-- regress/usr.bin/ssh/unittests/authopt/Makefile | 4 ++-- regress/usr.bin/ssh/unittests/hostkeys/Makefile | 4 ++-- regress/usr.bin/ssh/unittests/kex/Makefile | 4 ++-- regress/usr.bin/ssh/unittests/sshkey/Makefile | 4 ++-- regress/usr.bin/ssh/unittests/sshsig/Makefile | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/regress/usr.bin/ssh/misc/sk-dummy/Makefile b/regress/usr.bin/ssh/misc/sk-dummy/Makefile index 29e313c8296..18b0a243f66 100644 --- a/regress/usr.bin/ssh/misc/sk-dummy/Makefile +++ b/regress/usr.bin/ssh/misc/sk-dummy/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2019/11/29 00:13:29 djm Exp $ +# $OpenBSD: Makefile,v 1.3 2023/01/15 23:35:10 djm Exp $ .include .include @@ -11,7 +11,7 @@ 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+=ed25519.c hash.c OPENSSL?= yes CFLAGS+= -fPIC diff --git a/regress/usr.bin/ssh/unittests/authopt/Makefile b/regress/usr.bin/ssh/unittests/authopt/Makefile index 71a7be5bd2e..3045ec70816 100644 --- a/regress/usr.bin/ssh/unittests/authopt/Makefile +++ b/regress/usr.bin/ssh/unittests/authopt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2021/01/09 12:24:30 dtucker Exp $ +# $OpenBSD: Makefile,v 1.7 2023/01/15 23:35:10 djm Exp $ PROG=test_authopt SRCS=tests.c @@ -11,7 +11,7 @@ SRCS+=sshbuf-io.c atomicio.c sshkey.c authfile.c cipher.c log.c ssh-rsa.c SRCS+=ssh-dss.c ssh-ecdsa.c ssh-ed25519.c mac.c umac.c umac128.c hmac.c misc.c SRCS+=ssherr.c uidswap.c cleanup.c xmalloc.c match.c krl.c fatal.c SRCS+=addr.c addrmatch.c bitmap.c -SRCS+=ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c +SRCS+=ed25519.c hash.c SRCS+=cipher-chachapoly.c chacha.c poly1305.c ssh-ecdsa-sk.c ssh-sk.c SRCS+=ssh-ed25519-sk.c sk-usbhid.c diff --git a/regress/usr.bin/ssh/unittests/hostkeys/Makefile b/regress/usr.bin/ssh/unittests/hostkeys/Makefile index 9a53423eeac..04d93359aca 100644 --- a/regress/usr.bin/ssh/unittests/hostkeys/Makefile +++ b/regress/usr.bin/ssh/unittests/hostkeys/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2021/01/09 12:24:30 dtucker Exp $ +# $OpenBSD: Makefile,v 1.10 2023/01/15 23:35:10 djm Exp $ PROG=test_hostkeys SRCS=tests.c test_iterate.c @@ -9,7 +9,7 @@ SRCS+=sshbuf-io.c atomicio.c sshkey.c authfile.c cipher.c log.c ssh-rsa.c SRCS+=ssh-dss.c ssh-ecdsa.c ssh-ed25519.c mac.c umac.c umac128.c hmac.c misc.c SRCS+=ssherr.c uidswap.c cleanup.c xmalloc.c match.c krl.c fatal.c SRCS+=addr.c addrmatch.c bitmap.c hostfile.c -SRCS+=ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c +SRCS+=ed25519.c hash.c SRCS+=cipher-chachapoly.c chacha.c poly1305.c ssh-ecdsa-sk.c ssh-sk.c SRCS+=ssh-ed25519-sk.c sk-usbhid.c diff --git a/regress/usr.bin/ssh/unittests/kex/Makefile b/regress/usr.bin/ssh/unittests/kex/Makefile index 50b117c0785..4e6548115aa 100644 --- a/regress/usr.bin/ssh/unittests/kex/Makefile +++ b/regress/usr.bin/ssh/unittests/kex/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2021/01/09 12:24:30 dtucker Exp $ +# $OpenBSD: Makefile,v 1.13 2023/01/15 23:35:10 djm Exp $ PROG=test_kex SRCS=tests.c test_kex.c @@ -9,7 +9,7 @@ SRCS+=sshbuf-io.c atomicio.c sshkey.c authfile.c cipher.c log.c ssh-rsa.c SRCS+=ssh-dss.c ssh-ecdsa.c ssh-ed25519.c mac.c umac.c umac128.c hmac.c misc.c SRCS+=ssherr.c uidswap.c cleanup.c xmalloc.c match.c krl.c fatal.c SRCS+=addr.c addrmatch.c bitmap.c packet.c dispatch.c canohost.c ssh_api.c -SRCS+=compat.c ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c +SRCS+=compat.c ed25519.c hash.c SRCS+=cipher-chachapoly.c chacha.c poly1305.c ssh-ecdsa-sk.c ssh-sk.c SRCS+=ssh-ed25519-sk.c sk-usbhid.c diff --git a/regress/usr.bin/ssh/unittests/sshkey/Makefile b/regress/usr.bin/ssh/unittests/sshkey/Makefile index 19d85664049..8127c10bd11 100644 --- a/regress/usr.bin/ssh/unittests/sshkey/Makefile +++ b/regress/usr.bin/ssh/unittests/sshkey/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2021/01/09 12:24:31 dtucker Exp $ +# $OpenBSD: Makefile,v 1.12 2023/01/15 23:35:10 djm Exp $ PROG=test_sshkey SRCS=tests.c test_sshkey.c test_file.c test_fuzz.c common.c @@ -9,7 +9,7 @@ SRCS+=sshbuf-io.c atomicio.c sshkey.c authfile.c cipher.c log.c ssh-rsa.c SRCS+=ssh-dss.c ssh-ecdsa.c ssh-ed25519.c mac.c umac.c umac128.c hmac.c misc.c SRCS+=ssherr.c uidswap.c cleanup.c xmalloc.c match.c krl.c fatal.c SRCS+=addr.c addrmatch.c bitmap.c -SRCS+=ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c +SRCS+=ed25519.c hash.c SRCS+=cipher-chachapoly.c chacha.c poly1305.c ssh-ecdsa-sk.c ssh-sk.c SRCS+=ssh-ed25519-sk.c sk-usbhid.c diff --git a/regress/usr.bin/ssh/unittests/sshsig/Makefile b/regress/usr.bin/ssh/unittests/sshsig/Makefile index 65564d1b278..bc3c6c739d4 100644 --- a/regress/usr.bin/ssh/unittests/sshsig/Makefile +++ b/regress/usr.bin/ssh/unittests/sshsig/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2021/01/09 12:24:31 dtucker Exp $ +# $OpenBSD: Makefile,v 1.3 2023/01/15 23:35:10 djm Exp $ PROG=test_sshsig SRCS=tests.c @@ -9,7 +9,7 @@ SRCS+=sshbuf-io.c atomicio.c sshkey.c authfile.c cipher.c log.c ssh-rsa.c SRCS+=ssh-dss.c ssh-ecdsa.c ssh-ed25519.c mac.c umac.c umac128.c hmac.c misc.c SRCS+=ssherr.c uidswap.c cleanup.c xmalloc.c match.c krl.c fatal.c SRCS+=addr.c addrmatch.c bitmap.c sshsig.c -SRCS+=ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c +SRCS+=ed25519.c hash.c SRCS+=cipher-chachapoly.c chacha.c poly1305.c ssh-ecdsa-sk.c ssh-sk.c SRCS+=ssh-ed25519-sk.c sk-usbhid.c -- 2.20.1