diff options
Diffstat (limited to 'kexecdhs.c')
-rw-r--r-- | kexecdhs.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/kexecdhs.c b/kexecdhs.c index 3a580aacf..6fbb79c9d 100644 --- a/kexecdhs.c +++ b/kexecdhs.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexecdhs.c,v 1.5 2013/07/19 07:37:48 markus Exp $ */ | 1 | /* $OpenBSD: kexecdhs.c,v 1.9 2014/01/12 08:13:13 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2010 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2010 Damien Miller. All rights reserved. |
@@ -37,12 +37,7 @@ | |||
37 | #include "kex.h" | 37 | #include "kex.h" |
38 | #include "log.h" | 38 | #include "log.h" |
39 | #include "packet.h" | 39 | #include "packet.h" |
40 | #include "dh.h" | ||
41 | #include "ssh2.h" | 40 | #include "ssh2.h" |
42 | #ifdef GSSAPI | ||
43 | #include "ssh-gss.h" | ||
44 | #endif | ||
45 | #include "monitor_wrap.h" | ||
46 | 41 | ||
47 | #ifdef OPENSSL_HAS_ECC | 42 | #ifdef OPENSSL_HAS_ECC |
48 | 43 | ||
@@ -114,7 +109,7 @@ kexecdh_server(Kex *kex) | |||
114 | /* calc H */ | 109 | /* calc H */ |
115 | key_to_blob(server_host_public, &server_host_key_blob, &sbloblen); | 110 | key_to_blob(server_host_public, &server_host_key_blob, &sbloblen); |
116 | kex_ecdh_hash( | 111 | kex_ecdh_hash( |
117 | kex->evp_md, | 112 | kex->hash_alg, |
118 | group, | 113 | group, |
119 | kex->client_version_string, | 114 | kex->client_version_string, |
120 | kex->server_version_string, | 115 | kex->server_version_string, |
@@ -153,7 +148,7 @@ kexecdh_server(Kex *kex) | |||
153 | /* have keys, free server key */ | 148 | /* have keys, free server key */ |
154 | EC_KEY_free(server_key); | 149 | EC_KEY_free(server_key); |
155 | 150 | ||
156 | kex_derive_keys(kex, hash, hashlen, shared_secret); | 151 | kex_derive_keys_bn(kex, hash, hashlen, shared_secret); |
157 | BN_clear_free(shared_secret); | 152 | BN_clear_free(shared_secret); |
158 | kex_finish(kex); | 153 | kex_finish(kex); |
159 | } | 154 | } |