diff options
Diffstat (limited to 'ssh_api.c')
-rw-r--r-- | ssh_api.c | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh_api.c,v 1.12 2019/01/21 10:24:09 djm Exp $ */ | 1 | /* $OpenBSD: ssh_api.c,v 1.13 2019/01/21 10:28:02 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2012 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2012 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -99,11 +99,11 @@ ssh_init(struct ssh **sshp, int is_server, struct kex_params *kex_params) | |||
99 | ssh->kex->server = is_server; | 99 | ssh->kex->server = is_server; |
100 | if (is_server) { | 100 | if (is_server) { |
101 | #ifdef WITH_OPENSSL | 101 | #ifdef WITH_OPENSSL |
102 | ssh->kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; | 102 | ssh->kex->kex[KEX_DH_GRP1_SHA1] = kex_kem_server; |
103 | ssh->kex->kex[KEX_DH_GRP14_SHA1] = kexdh_server; | 103 | ssh->kex->kex[KEX_DH_GRP14_SHA1] = kex_kem_server; |
104 | ssh->kex->kex[KEX_DH_GRP14_SHA256] = kexdh_server; | 104 | ssh->kex->kex[KEX_DH_GRP14_SHA256] = kex_kem_server; |
105 | ssh->kex->kex[KEX_DH_GRP16_SHA512] = kexdh_server; | 105 | ssh->kex->kex[KEX_DH_GRP16_SHA512] = kex_kem_server; |
106 | ssh->kex->kex[KEX_DH_GRP18_SHA512] = kexdh_server; | 106 | ssh->kex->kex[KEX_DH_GRP18_SHA512] = kex_kem_server; |
107 | ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; | 107 | ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_server; |
108 | ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; | 108 | ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; |
109 | # ifdef OPENSSL_HAS_ECC | 109 | # ifdef OPENSSL_HAS_ECC |
@@ -117,11 +117,11 @@ ssh_init(struct ssh **sshp, int is_server, struct kex_params *kex_params) | |||
117 | ssh->kex->sign=&_ssh_host_key_sign; | 117 | ssh->kex->sign=&_ssh_host_key_sign; |
118 | } else { | 118 | } else { |
119 | #ifdef WITH_OPENSSL | 119 | #ifdef WITH_OPENSSL |
120 | ssh->kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; | 120 | ssh->kex->kex[KEX_DH_GRP1_SHA1] = kex_kem_client; |
121 | ssh->kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; | 121 | ssh->kex->kex[KEX_DH_GRP14_SHA1] = kex_kem_client; |
122 | ssh->kex->kex[KEX_DH_GRP14_SHA256] = kexdh_client; | 122 | ssh->kex->kex[KEX_DH_GRP14_SHA256] = kex_kem_client; |
123 | ssh->kex->kex[KEX_DH_GRP16_SHA512] = kexdh_client; | 123 | ssh->kex->kex[KEX_DH_GRP16_SHA512] = kex_kem_client; |
124 | ssh->kex->kex[KEX_DH_GRP18_SHA512] = kexdh_client; | 124 | ssh->kex->kex[KEX_DH_GRP18_SHA512] = kex_kem_client; |
125 | ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; | 125 | ssh->kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; |
126 | ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; | 126 | ssh->kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; |
127 | # ifdef OPENSSL_HAS_ECC | 127 | # ifdef OPENSSL_HAS_ECC |