diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2019-01-21 12:50:13 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2019-01-21 12:50:13 +0000 |
| commit | 937b38e71aca193b4ce1be0addf4c5bbcce02d9f (patch) | |
| tree | 0e330c692f28edb87214bba0a4fbaf72c53644c1 /regress/usr.bin/ssh | |
| parent | 8ed2d488d2e66f77397d3761784bd6218f563423 (diff) | |
adapt to changes in KEX APIs and file removals
Diffstat (limited to 'regress/usr.bin/ssh')
| -rw-r--r-- | regress/usr.bin/ssh/misc/kexfuzz/Makefile | 21 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/misc/kexfuzz/kexfuzz.c | 16 |
2 files changed, 23 insertions, 14 deletions
diff --git a/regress/usr.bin/ssh/misc/kexfuzz/Makefile b/regress/usr.bin/ssh/misc/kexfuzz/Makefile index a7bb6b70d21..20802cb8703 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.3 2017/12/21 05:46:35 djm Exp $ +# $OpenBSD: Makefile,v 1.4 2019/01/21 12:50:12 djm Exp $ .include <bsd.own.mk> .include <bsd.obj.mk> @@ -18,12 +18,21 @@ SRCS+=atomicio.c sshkey.c authfile.c cipher.c log.c ssh-rsa.c ssh-dss.c SRCS+=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+=addrmatch.c bitmap.c packet.c dispatch.c canohost.c ssh_api.c -SRCS+=kex.c kexc25519.c kexc25519c.c kexc25519s.c kexdh.c kexdhc.c kexdhs.c -SRCS+=kexecdh.c kexecdhc.c kexecdhs.c kexgex.c kexgexc.c kexgexs.c -SRCS+=dh.c compat.c -SRCS+=ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c +SRCS+=compat.c ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c SRCS+=cipher-chachapoly.c chacha.c poly1305.c -SRCS+=smult_curve25519_ref.c + +SRCS+= kex.c +SRCS+= dh.c +SRCS+= kexdh.c +SRCS+= kexecdh.c +SRCS+= kexgex.c +SRCS+= kexgexc.c +SRCS+= kexgexs.c +SRCS+= kexc25519.c +SRCS+= smult_curve25519_ref.c +SRCS+= kexgen.c +SRCS+= kexsntrup4591761x25519.c +SRCS+= sntrup4591761.c SRCS+=digest-openssl.c #SRCS+=digest-libc.c diff --git a/regress/usr.bin/ssh/misc/kexfuzz/kexfuzz.c b/regress/usr.bin/ssh/misc/kexfuzz/kexfuzz.c index daf60306f6a..13c9259df4d 100644 --- a/regress/usr.bin/ssh/misc/kexfuzz/kexfuzz.c +++ b/regress/usr.bin/ssh/misc/kexfuzz/kexfuzz.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kexfuzz.c,v 1.4 2017/04/30 23:34:55 djm Exp $ */ +/* $OpenBSD: kexfuzz.c,v 1.5 2019/01/21 12:50:12 djm Exp $ */ /* * Fuzz harness for KEX code * @@ -269,18 +269,18 @@ do_kex_with_key(const char *kex, struct sshkey *prvkey, int *c2s, int *s2c, ASSERT_PTR_NE(server2->kex, NULL); /* XXX we need to set the callbacks */ #ifdef WITH_OPENSSL - server2->kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; - server2->kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; - server2->kex->kex[KEX_DH_GRP14_SHA256] = kexdh_server; - server2->kex->kex[KEX_DH_GRP16_SHA512] = kexdh_server; - server2->kex->kex[KEX_DH_GRP18_SHA512] = kexdh_server; + server2->kex->kex[KEX_DH_GRP1_SHA1] = kex_gen_server; + server2->kex->kex[KEX_DH_GRP14_SHA1] = kex_gen_server; + server2->kex->kex[KEX_DH_GRP14_SHA256] = kex_gen_server; + server2->kex->kex[KEX_DH_GRP16_SHA512] = kex_gen_server; + server2->kex->kex[KEX_DH_GRP18_SHA512] = kex_gen_server; server2->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; server2->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; # ifdef OPENSSL_HAS_ECC - server2->kex->kex[KEX_ECDH_SHA2] = kexecdh_server; + server2->kex->kex[KEX_ECDH_SHA2] = kex_gen_server; # endif #endif - server2->kex->kex[KEX_C25519_SHA256] = kexc25519_server; + server2->kex->kex[KEX_C25519_SHA256] = 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; |