diff options
-rw-r--r-- | kexdh.c | 3 | ||||
-rw-r--r-- | sshd.c | 11 |
2 files changed, 8 insertions, 6 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexdh.c,v 1.32 2019/01/21 10:40:11 djm Exp $ */ | 1 | /* $OpenBSD: kexdh.c,v 1.33 2020/05/08 05:13:14 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2019 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2019 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -42,6 +42,7 @@ | |||
42 | #include "digest.h" | 42 | #include "digest.h" |
43 | #include "ssherr.h" | 43 | #include "ssherr.h" |
44 | #include "dh.h" | 44 | #include "dh.h" |
45 | #include "log.h" | ||
45 | 46 | ||
46 | int | 47 | int |
47 | kex_dh_keygen(struct kex *kex) | 48 | kex_dh_keygen(struct kex *kex) |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.552 2020/03/13 04:01:57 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.553 2020/05/08 05:13:14 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 |
@@ -2372,10 +2372,11 @@ do_ssh2_kex(struct ssh *ssh) | |||
2372 | 2372 | ||
2373 | #ifdef DEBUG_KEXDH | 2373 | #ifdef DEBUG_KEXDH |
2374 | /* send 1st encrypted/maced/compressed message */ | 2374 | /* send 1st encrypted/maced/compressed message */ |
2375 | packet_start(SSH2_MSG_IGNORE); | 2375 | if ((r = sshpkt_start(ssh, SSH2_MSG_IGNORE)) != 0 || |
2376 | packet_put_cstring("markus"); | 2376 | (r = sshpkt_put_cstring(ssh, "markus")) != 0 || |
2377 | packet_send(); | 2377 | (r = sshpkt_send(ssh)) != 0 || |
2378 | packet_write_wait(); | 2378 | (r = ssh_packet_write_wait(ssh)) != 0) |
2379 | fatal("%s: send test: %s", __func__, ssh_err(r)); | ||
2379 | #endif | 2380 | #endif |
2380 | debug("KEX done"); | 2381 | debug("KEX done"); |
2381 | } | 2382 | } |