* New upstream release (closes: #536182). Yes, I know 5.3p1 has been out

  for a while, but there's no GSSAPI patch available for it yet.
  - Change the default cipher order to prefer the AES CTR modes and the
    revised "arcfour256" mode to CBC mode ciphers that are susceptible to
    CPNI-957037 "Plaintext Recovery Attack Against SSH".
  - Add countermeasures to mitigate CPNI-957037-style attacks against the
    SSH protocol's use of CBC-mode ciphers. Upon detection of an invalid
    packet length or Message Authentication Code, ssh/sshd will continue
    reading up to the maximum supported packet length rather than
    immediately terminating the connection. This eliminates most of the
    known differences in behaviour that leaked information about the
    plaintext of injected data which formed the basis of this attack
    (closes: #506115, LP: #379329).
  - ForceCommand directive now accepts commandline arguments for the
    internal-sftp server (closes: #524423, LP: #362511).
  - Add AllowAgentForwarding to available Match keywords list (closes:
    #540623).
  - Make ssh(1) send the correct channel number for
    SSH2_MSG_CHANNEL_SUCCESS and SSH2_MSG_CHANNEL_FAILURE messages to
    avoid triggering 'Non-public channel' error messages on sshd(8) in
    openssh-5.1.
  - Avoid printing 'Non-public channel' warnings in sshd(8), since the
    ssh(1) has sent incorrect channel numbers since ~2004 (this reverts a
    behaviour introduced in openssh-5.1; closes: #496017).
* Update to GSSAPI patch from
  http://www.sxw.org.uk/computing/patches/openssh-5.2p1-gsskex-all-20090726.patch,
  including cascading credentials support (LP: #416958).

1 files changed, 36 insertions, 19 deletions

diff --git a/clientloop.c b/clientloop.c
index abe5609de..16a162803 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.201 2008/07/16 11:51:14 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.209 2009/02/12 03:00:56 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -107,10 +107,13 @@
 #include "atomicio.h"
 #include "sshpty.h"
 #include "misc.h"
-#include "monitor_fdpass.h"
 #include "match.h"
 #include "msg.h"
 
+#ifdef GSSAPI
+#include "ssh-gss.h"
+#endif
+
 /* import options */
 extern Options options;
 
@@ -770,8 +773,8 @@ process_cmdline(void)
         void (*handler)(int);
         char *s, *cmd, *cancel_host;
         int delete = 0;
-        int local = 0;
-        u_short cancel_port;
+        int local = 0, remote = 0, dynamic = 0;
+        int cancel_port;
         Forward fwd;
 
         bzero(&fwd, sizeof(fwd));
@@ -795,6 +798,8 @@ process_cmdline(void)
                     "Request local forward");
                 logit("      -R[bind_address:]port:host:hostport    "
                     "Request remote forward");
+                logit("      -D[bind_address:]port                  "
+                    "Request dynamic forward");
                 logit("      -KR[bind_address:]port                 "
                     "Cancel remote forward");
                 if (!options.permit_local_command)
@@ -814,17 +819,22 @@ process_cmdline(void)
                 delete = 1;
                 s++;
         }
-        if (*s != 'L' && *s != 'R') {
+        if (*s == 'L')
+                local = 1;
+        else if (*s == 'R')
+                remote = 1;
+        else if (*s == 'D')
+                dynamic = 1;
+        else {
                 logit("Invalid command.");
                 goto out;
         }
-        if (*s == 'L')
-                local = 1;
-        if (local && delete) {
+
+        if ((local || dynamic) && delete) {
                 logit("Not supported.");
                 goto out;
         }
-        if ((!local || delete) && !compat20) {
+        if (remote && delete && !compat20) {
                 logit("Not supported for SSH protocol version 1.");
                 goto out;
         }
@@ -842,17 +852,17 @@ process_cmdline(void)
                         cancel_port = a2port(cancel_host);
                         cancel_host = NULL;
                 }
-                if (cancel_port == 0) {
+                if (cancel_port <= 0) {
                         logit("Bad forwarding close port");
                         goto out;
                 }
                 channel_request_rforward_cancel(cancel_host, cancel_port);
         } else {
-                if (!parse_forward(&fwd, s)) {
+                if (!parse_forward(&fwd, s, dynamic, remote)) {
                         logit("Bad forwarding specification.");
                         goto out;
                 }
-                if (local) {
+                if (local || dynamic) {
                         if (channel_setup_local_fwd_listener(fwd.listen_host,
                             fwd.listen_port, fwd.connect_host,
                             fwd.connect_port, options.gateway_ports) < 0) {
@@ -1041,7 +1051,6 @@ process_escapes(Channel *c, Buffer *bin, Buffer *bout, Buffer *berr,
 Supported escape sequences:\r\n\
   %c.  - terminate session\r\n\
   %cB  - send a BREAK to the remote system\r\n\
-  %cC  - open a command line\r\n\
   %cR  - Request rekey (SSH protocol 2 only)\r\n\
   %c#  - list forwarded connections\r\n\
   %c?  - this message\r\n\
@@ -1050,8 +1059,7 @@ Supported escape sequences:\r\n\
                                             escape_char, escape_char,
                                             escape_char, escape_char,
                                             escape_char, escape_char,
-                                            escape_char, escape_char,
-                                            escape_char);
+                                            escape_char, escape_char);
                                 } else {
                                         snprintf(string, sizeof string,
 "%c?\r\n\
@@ -1086,6 +1094,8 @@ Supported escape sequences:\r\n\
                                 continue;
 
                         case 'C':
+                                if (c && c->ctl_fd != -1)
+                                        goto noescape;
                                 process_cmdline();
                                 continue;
 
@@ -1428,6 +1438,13 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
                 /* Do channel operations unless rekeying in progress. */
                 if (!rekeying) {
                         channel_after_select(readset, writeset);
+
+                        if (options.gss_renewal_rekey &&
+                            ssh_gssapi_credentials_updated(GSS_C_NO_CONTEXT)) {
+                                debug("credentials updated - forcing rekey");
+                                need_rekeying = 1;
+                        }
+
                         if (need_rekeying || packet_need_rekeying()) {
                                 debug("need rekeying");
                                 xxx_kex->done = 0;
@@ -1639,7 +1656,7 @@ client_request_forwarded_tcpip(const char *request_type, int rchan)
 {
         Channel *c = NULL;
         char *listen_address, *originator_address;
-        int listen_port, originator_port;
+        u_short listen_port, originator_port;
 
         /* Get rest of the packet */
         listen_address = packet_get_string(NULL);
@@ -1665,7 +1682,7 @@ client_request_x11(const char *request_type, int rchan)
 {
         Channel *c = NULL;
         char *originator;
-        int originator_port;
+        u_short originator_port;
         int sock;
 
         if (!options.forward_x11) {
@@ -1729,7 +1746,7 @@ client_request_tun_fwd(int tun_mode, int local_tun, int remote_tun)
                 return 0;
 
         if (!compat20) {
-                error("Tunnel forwarding is not support for protocol 1");
+                error("Tunnel forwarding is not supported for protocol 1");
                 return -1;
         }
 
@@ -1853,7 +1870,7 @@ client_input_channel_req(int type, u_int32_t seq, void *ctxt)
         if (reply) {
                 packet_start(success ?
                     SSH2_MSG_CHANNEL_SUCCESS : SSH2_MSG_CHANNEL_FAILURE);
-                packet_put_int(id);
+                packet_put_int(c->remote_id);
                 packet_send();
         }
         xfree(rtype);