diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2015-01-19 20:52:16 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-01-19 23:13:01 +0100 |
| commit | 091c302829210c41e7f57c3f094c7b9c054306f0 (patch) | |
| tree | 800de5dc85b877a85d1f269ae5bb09b0dc3fa7a7 /kexdhs.c | |
| parent | upstream commit (diff) | |
| download | openssh-091c302829210c41e7f57c3f094c7b9c054306f0.tar.xz openssh-091c302829210c41e7f57c3f094c7b9c054306f0.zip | |
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 @@ -/* $OpenBSD: kexdhs.c,v 1.18 2014/02/02 03:44:31 djm Exp $ */ +/* $OpenBSD: kexdhs.c,v 1.19 2015/01/19 19:52:16 markus Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * @@ -121,8 +121,8 @@ kexdh_server(Kex *kex) kex_dh_hash( kex->client_version_string, kex->server_version_string, - buffer_ptr(&kex->peer), buffer_len(&kex->peer), - buffer_ptr(&kex->my), buffer_len(&kex->my), + buffer_ptr(kex->peer), buffer_len(kex->peer), + buffer_ptr(kex->my), buffer_len(kex->my), server_host_key_blob, sbloblen, dh_client_pub, dh->pub_key, |