diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2020-12-29 01:02:16 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2020-12-29 01:02:16 +0000 |
| commit | da6900f074665242c5e8e9fbe5f69ec020f1663c (patch) | |
| tree | adcb119f609f5616629e2cda29f187e58c4be998 | |
| parent | b9ebde14942966a970c1c3ebc093972597d3c187 (diff) | |
Adapt to replacement of sntrup4591761x25519-sha512@tinyssh.org with
sntrup761x25519-sha512@openssh.com.
Also test sntrup761x25519-sha512@openssh.com in unittests/kex
| -rw-r--r-- | regress/usr.bin/ssh/misc/kexfuzz/Makefile | 6 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/unittests/kex/Makefile | 6 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/unittests/kex/test_kex.c | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/regress/usr.bin/ssh/misc/kexfuzz/Makefile b/regress/usr.bin/ssh/misc/kexfuzz/Makefile index ede5e2fb4bc..733558d5707 100644 --- a/regress/usr.bin/ssh/misc/kexfuzz/Makefile +++ b/regress/usr.bin/ssh/misc/kexfuzz/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2020/04/03 04:07:48 djm Exp $ +# $OpenBSD: Makefile,v 1.9 2020/12/29 01:02:15 djm Exp $ .include <bsd.own.mk> .include <bsd.obj.mk> @@ -32,8 +32,8 @@ SRCS+= kexgexs.c SRCS+= kexc25519.c SRCS+= smult_curve25519_ref.c SRCS+= kexgen.c -SRCS+= kexsntrup4591761x25519.c -SRCS+= sntrup4591761.c +SRCS+= kexsntrup761x25519.c +SRCS+= sntrup761.c SRCS+=digest-openssl.c #SRCS+=digest-libc.c diff --git a/regress/usr.bin/ssh/unittests/kex/Makefile b/regress/usr.bin/ssh/unittests/kex/Makefile index 1c5d68ce870..bff16ab4ef8 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.10 2020/04/06 09:43:56 dtucker Exp $ +# $OpenBSD: Makefile,v 1.11 2020/12/29 01:02:15 djm Exp $ PROG=test_kex SRCS=tests.c test_kex.c @@ -23,8 +23,8 @@ SRCS+= kexgexs.c SRCS+= kexc25519.c SRCS+= smult_curve25519_ref.c SRCS+= kexgen.c -SRCS+= kexsntrup4591761x25519.c -SRCS+= sntrup4591761.c +SRCS+= kexsntrup761x25519.c +SRCS+= sntrup761.c SRCS+= utf8.c SRCS+=digest-openssl.c diff --git a/regress/usr.bin/ssh/unittests/kex/test_kex.c b/regress/usr.bin/ssh/unittests/kex/test_kex.c index a0d3351f14d..d0d26051dd5 100644 --- a/regress/usr.bin/ssh/unittests/kex/test_kex.c +++ b/regress/usr.bin/ssh/unittests/kex/test_kex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: test_kex.c,v 1.4 2019/01/21 12:35:20 djm Exp $ */ +/* $OpenBSD: test_kex.c,v 1.5 2020/12/29 01:02:15 djm Exp $ */ /* * Regress test KEX * @@ -144,6 +144,7 @@ do_kex_with_key(char *kex, int keytype, int bits) server2->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; server2->kex->kex[KEX_ECDH_SHA2] = kex_gen_server; server2->kex->kex[KEX_C25519_SHA256] = kex_gen_server; + server2->kex->kex[KEX_KEM_SNTRUP761X25519_SHA512] = kex_gen_server; server2->kex->load_host_public_key = server->kex->load_host_public_key; server2->kex->load_host_private_key = server->kex->load_host_private_key; server2->kex->sign = server->kex->sign; @@ -186,4 +187,5 @@ kex_tests(void) do_kex("diffie-hellman-group-exchange-sha1"); do_kex("diffie-hellman-group14-sha1"); do_kex("diffie-hellman-group1-sha1"); + do_kex("sntrup761x25519-sha512@openssh.com"); } |