fix proxy multiplexing mode, broken when keystroke timing
authordjm <djm@openbsd.org>
Wed, 21 Feb 2024 05:57:34 +0000 (05:57 +0000)
committerdjm <djm@openbsd.org>
Wed, 21 Feb 2024 05:57:34 +0000 (05:57 +0000)
obfuscation was added. GHPR#463 from montag451

usr.bin/ssh/clientloop.c

index 6fa70cb..31eaa95 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.402 2023/11/24 00:31:30 dtucker Exp $ */
+/* $OpenBSD: clientloop.c,v 1.403 2024/02/21 05:57:34 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -508,7 +508,7 @@ send_chaff(struct ssh *ssh)
 {
        int r;
 
-       if ((ssh->kex->flags & KEX_HAS_PING) == 0)
+       if (ssh->kex == NULL || (ssh->kex->flags & KEX_HAS_PING) == 0)
                return 0;
        /* XXX probabilistically send chaff? */
        /*