diff options
author | markus@openbsd.org <markus@openbsd.org> | 2015-01-19 19:52:16 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-01-20 09:13:01 +1100 |
commit | 091c302829210c41e7f57c3f094c7b9c054306f0 (patch) | |
tree | 800de5dc85b877a85d1f269ae5bb09b0dc3fa7a7 /kexdhs.c | |
parent | 4e62cc68ce4ba20245d208b252e74e91d3785b74 (diff) |
upstream commit
update packet.c & isolate, introduce struct ssh a) switch
packet.c to buffer api and isolate per-connection info into struct ssh b)
(de)serialization of the state is moved from monitor to packet.c c) the old
packet.c API is implemented in opacket.[ch] d) compress.c/h is removed and
integrated into packet.c with and ok djm@
Diffstat (limited to 'kexdhs.c')
-rw-r--r-- | kexdhs.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexdhs.c,v 1.18 2014/02/02 03:44:31 djm Exp $ */ | 1 | /* $OpenBSD: kexdhs.c,v 1.19 2015/01/19 19:52:16 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -121,8 +121,8 @@ kexdh_server(Kex *kex) | |||
121 | kex_dh_hash( | 121 | kex_dh_hash( |
122 | kex->client_version_string, | 122 | kex->client_version_string, |
123 | kex->server_version_string, | 123 | kex->server_version_string, |
124 | buffer_ptr(&kex->peer), buffer_len(&kex->peer), | 124 | buffer_ptr(kex->peer), buffer_len(kex->peer), |
125 | buffer_ptr(&kex->my), buffer_len(&kex->my), | 125 | buffer_ptr(kex->my), buffer_len(kex->my), |
126 | server_host_key_blob, sbloblen, | 126 | server_host_key_blob, sbloblen, |
127 | dh_client_pub, | 127 | dh_client_pub, |
128 | dh->pub_key, | 128 | dh->pub_key, |