summaryrefslogtreecommitdiff
path: root/kexkemc.c
diff options
context:
space:
mode:
Diffstat (limited to 'kexkemc.c')
-rw-r--r--kexkemc.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/kexkemc.c b/kexkemc.c
index 13f36a116..384a4db59 100644
--- a/kexkemc.c
+++ b/kexkemc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: kexkemc.c,v 1.2 2019/01/21 10:24:09 djm Exp $ */ 1/* $OpenBSD: kexkemc.c,v 1.3 2019/01/21 10:28:02 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2019 Markus Friedl. All rights reserved. 3 * Copyright (c) 2019 Markus Friedl. All rights reserved.
4 * 4 *
@@ -48,6 +48,13 @@ kex_kem_client(struct ssh *ssh)
48 int r; 48 int r;
49 49
50 switch (kex->kex_type) { 50 switch (kex->kex_type) {
51 case KEX_DH_GRP1_SHA1:
52 case KEX_DH_GRP14_SHA1:
53 case KEX_DH_GRP14_SHA256:
54 case KEX_DH_GRP16_SHA512:
55 case KEX_DH_GRP18_SHA512:
56 r = kex_dh_keypair(kex);
57 break;
51 case KEX_C25519_SHA256: 58 case KEX_C25519_SHA256:
52 r = kex_c25519_keypair(kex); 59 r = kex_c25519_keypair(kex);
53 break; 60 break;
@@ -99,6 +106,13 @@ input_kex_kem_reply(int type, u_int32_t seq, struct ssh *ssh)
99 106
100 /* compute shared secret */ 107 /* compute shared secret */
101 switch (kex->kex_type) { 108 switch (kex->kex_type) {
109 case KEX_DH_GRP1_SHA1:
110 case KEX_DH_GRP14_SHA1:
111 case KEX_DH_GRP14_SHA256:
112 case KEX_DH_GRP16_SHA512:
113 case KEX_DH_GRP18_SHA512:
114 r = kex_dh_dec(kex, server_pubkey, pklen, &shared_secret);
115 break;
102 case KEX_C25519_SHA256: 116 case KEX_C25519_SHA256:
103 r = kex_c25519_dec(kex, server_pubkey, pklen, &shared_secret); 117 r = kex_c25519_dec(kex, server_pubkey, pklen, &shared_secret);
104 break; 118 break;