diff options
-rw-r--r-- | kexc25519s.c | 9 | ||||
-rw-r--r-- | kexdhs.c | 9 | ||||
-rw-r--r-- | kexecdhs.c | 9 | ||||
-rw-r--r-- | kexgexs.c | 9 |
4 files changed, 16 insertions, 20 deletions
diff --git a/kexc25519s.c b/kexc25519s.c index 912b0afb1..d840856d2 100644 --- a/kexc25519s.c +++ b/kexc25519s.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexc25519s.c,v 1.6 2015/01/19 20:16:15 markus Exp $ */ | 1 | /* $OpenBSD: kexc25519s.c,v 1.7 2015/01/20 07:55:33 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. |
@@ -75,10 +75,9 @@ input_kex_c25519_init(int type, u_int32_t seq, void *ctxt) | |||
75 | r = SSH_ERR_INVALID_ARGUMENT; | 75 | r = SSH_ERR_INVALID_ARGUMENT; |
76 | goto out; | 76 | goto out; |
77 | } | 77 | } |
78 | if ((server_host_public = kex->load_host_public_key(kex->hostkey_type, | 78 | server_host_public = kex->load_host_public_key(kex->hostkey_type, ssh); |
79 | ssh)) == NULL || | 79 | server_host_private = kex->load_host_private_key(kex->hostkey_type, ssh); |
80 | (server_host_private = kex->load_host_private_key(kex->hostkey_type, | 80 | if (server_host_public == NULL) { |
81 | ssh)) == NULL) { | ||
82 | r = SSH_ERR_NO_HOSTKEY_LOADED; | 81 | r = SSH_ERR_NO_HOSTKEY_LOADED; |
83 | goto out; | 82 | goto out; |
84 | } | 83 | } |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexdhs.c,v 1.20 2015/01/19 20:16:15 markus Exp $ */ | 1 | /* $OpenBSD: kexdhs.c,v 1.21 2015/01/20 07:55:33 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -101,10 +101,9 @@ input_kex_dh_init(int type, u_int32_t seq, void *ctxt) | |||
101 | r = SSH_ERR_INVALID_ARGUMENT; | 101 | r = SSH_ERR_INVALID_ARGUMENT; |
102 | goto out; | 102 | goto out; |
103 | } | 103 | } |
104 | if ((server_host_public = kex->load_host_public_key(kex->hostkey_type, | 104 | server_host_public = kex->load_host_public_key(kex->hostkey_type, ssh); |
105 | ssh)) == NULL || | 105 | server_host_private = kex->load_host_private_key(kex->hostkey_type, ssh); |
106 | (server_host_private = kex->load_host_private_key(kex->hostkey_type, | 106 | if (server_host_public == NULL) { |
107 | ssh)) == NULL) { | ||
108 | r = SSH_ERR_NO_HOSTKEY_LOADED; | 107 | r = SSH_ERR_NO_HOSTKEY_LOADED; |
109 | goto out; | 108 | goto out; |
110 | } | 109 | } |
diff --git a/kexecdhs.c b/kexecdhs.c index 6b8d95d9c..f47a7b207 100644 --- a/kexecdhs.c +++ b/kexecdhs.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexecdhs.c,v 1.12 2015/01/19 20:16:15 markus Exp $ */ | 1 | /* $OpenBSD: kexecdhs.c,v 1.13 2015/01/20 07:55:33 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. |
@@ -95,10 +95,9 @@ input_kex_ecdh_init(int type, u_int32_t seq, void *ctxt) | |||
95 | r = SSH_ERR_INVALID_ARGUMENT; | 95 | r = SSH_ERR_INVALID_ARGUMENT; |
96 | goto out; | 96 | goto out; |
97 | } | 97 | } |
98 | if ((server_host_public = kex->load_host_public_key(kex->hostkey_type, | 98 | server_host_public = kex->load_host_public_key(kex->hostkey_type, ssh); |
99 | ssh)) == NULL || | 99 | server_host_private = kex->load_host_private_key(kex->hostkey_type, ssh); |
100 | (server_host_private = kex->load_host_private_key(kex->hostkey_type, | 100 | if (server_host_public == NULL) { |
101 | ssh)) == NULL) { | ||
102 | r = SSH_ERR_NO_HOSTKEY_LOADED; | 101 | r = SSH_ERR_NO_HOSTKEY_LOADED; |
103 | goto out; | 102 | goto out; |
104 | } | 103 | } |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexgexs.c,v 1.21 2015/01/19 20:16:15 markus Exp $ */ | 1 | /* $OpenBSD: kexgexs.c,v 1.22 2015/01/20 07:55:33 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Niels Provos. All rights reserved. | 3 | * Copyright (c) 2000 Niels Provos. All rights reserved. |
4 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
@@ -160,10 +160,9 @@ input_kex_dh_gex_init(int type, u_int32_t seq, void *ctxt) | |||
160 | r = SSH_ERR_INVALID_ARGUMENT; | 160 | r = SSH_ERR_INVALID_ARGUMENT; |
161 | goto out; | 161 | goto out; |
162 | } | 162 | } |
163 | if ((server_host_public = kex->load_host_public_key(kex->hostkey_type, | 163 | server_host_public = kex->load_host_public_key(kex->hostkey_type, ssh); |
164 | ssh)) == NULL || | 164 | server_host_private = kex->load_host_private_key(kex->hostkey_type, ssh); |
165 | (server_host_private = kex->load_host_private_key(kex->hostkey_type, | 165 | if (server_host_public == NULL) { |
166 | ssh)) == NULL) { | ||
167 | r = SSH_ERR_NO_HOSTKEY_LOADED; | 166 | r = SSH_ERR_NO_HOSTKEY_LOADED; |
168 | goto out; | 167 | goto out; |
169 | } | 168 | } |