diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-12-18 23:13:42 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-12-19 15:21:37 +1100 |
commit | 349ecd4da3a985359694a74635748009be6baca6 (patch) | |
tree | 940cbfe36d5b6d209e1350154f2fecff8f3de1e6 | |
parent | c9e37a8725c083441dd34a8a53768aa45c3c53fe (diff) |
upstream commit
pass kex->hostkey_alg and kex->hostkey_nid from pre-auth
to post-auth unpriviledged child processes; ok markus@
OpenBSD-Commit-ID: 4a35bc7af0a5f8a232d1361f79f4ebc376137302
-rw-r--r-- | packet.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.c,v 1.268 2017/12/10 05:55:29 dtucker Exp $ */ | 1 | /* $OpenBSD: packet.c,v 1.269 2017/12/18 23:13:42 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -2173,7 +2173,9 @@ kex_to_blob(struct sshbuf *m, struct kex *kex) | |||
2173 | if ((r = sshbuf_put_string(m, kex->session_id, | 2173 | if ((r = sshbuf_put_string(m, kex->session_id, |
2174 | kex->session_id_len)) != 0 || | 2174 | kex->session_id_len)) != 0 || |
2175 | (r = sshbuf_put_u32(m, kex->we_need)) != 0 || | 2175 | (r = sshbuf_put_u32(m, kex->we_need)) != 0 || |
2176 | (r = sshbuf_put_cstring(m, kex->hostkey_alg)) != 0 || | ||
2176 | (r = sshbuf_put_u32(m, kex->hostkey_type)) != 0 || | 2177 | (r = sshbuf_put_u32(m, kex->hostkey_type)) != 0 || |
2178 | (r = sshbuf_put_u32(m, kex->hostkey_nid)) != 0 || | ||
2177 | (r = sshbuf_put_u32(m, kex->kex_type)) != 0 || | 2179 | (r = sshbuf_put_u32(m, kex->kex_type)) != 0 || |
2178 | (r = sshbuf_put_stringb(m, kex->my)) != 0 || | 2180 | (r = sshbuf_put_stringb(m, kex->my)) != 0 || |
2179 | (r = sshbuf_put_stringb(m, kex->peer)) != 0 || | 2181 | (r = sshbuf_put_stringb(m, kex->peer)) != 0 || |
@@ -2337,7 +2339,9 @@ kex_from_blob(struct sshbuf *m, struct kex **kexp) | |||
2337 | } | 2339 | } |
2338 | if ((r = sshbuf_get_string(m, &kex->session_id, &kex->session_id_len)) != 0 || | 2340 | if ((r = sshbuf_get_string(m, &kex->session_id, &kex->session_id_len)) != 0 || |
2339 | (r = sshbuf_get_u32(m, &kex->we_need)) != 0 || | 2341 | (r = sshbuf_get_u32(m, &kex->we_need)) != 0 || |
2342 | (r = sshbuf_get_cstring(m, &kex->hostkey_alg, NULL)) != 0 || | ||
2340 | (r = sshbuf_get_u32(m, (u_int *)&kex->hostkey_type)) != 0 || | 2343 | (r = sshbuf_get_u32(m, (u_int *)&kex->hostkey_type)) != 0 || |
2344 | (r = sshbuf_get_u32(m, (u_int *)&kex->hostkey_nid)) != 0 || | ||
2341 | (r = sshbuf_get_u32(m, &kex->kex_type)) != 0 || | 2345 | (r = sshbuf_get_u32(m, &kex->kex_type)) != 0 || |
2342 | (r = sshbuf_get_stringb(m, kex->my)) != 0 || | 2346 | (r = sshbuf_get_stringb(m, kex->my)) != 0 || |
2343 | (r = sshbuf_get_stringb(m, kex->peer)) != 0 || | 2347 | (r = sshbuf_get_stringb(m, kex->peer)) != 0 || |