* New upstream release (closes: #395507, #397961, #420035). Important

  changes not previously backported to 4.3p2:
  - 4.4/4.4p1 (http://www.openssh.org/txt/release-4.4):
    + On portable OpenSSH, fix a GSSAPI authentication abort that could be
      used to determine the validity of usernames on some platforms.
    + Implemented conditional configuration in sshd_config(5) using the
      "Match" directive. This allows some configuration options to be
      selectively overridden if specific criteria (based on user, group,
      hostname and/or address) are met. So far a useful subset of
      post-authentication options are supported and more are expected to
      be added in future releases.
    + Add support for Diffie-Hellman group exchange key agreement with a
      final hash of SHA256.
    + Added a "ForceCommand" directive to sshd_config(5). Similar to the
      command="..." option accepted in ~/.ssh/authorized_keys, this forces
      the execution of the specified command regardless of what the user
      requested. This is very useful in conjunction with the new "Match"
      option.
    + Add a "PermitOpen" directive to sshd_config(5). This mirrors the
      permitopen="..." authorized_keys option, allowing fine-grained
      control over the port-forwardings that a user is allowed to
      establish.
    + Add optional logging of transactions to sftp-server(8).
    + ssh(1) will now record port numbers for hosts stored in
      ~/.ssh/known_hosts when a non-standard port has been requested
      (closes: #50612).
    + Add an "ExitOnForwardFailure" option to cause ssh(1) to exit (with a
      non-zero exit code) when requested port forwardings could not be
      established.
    + Extend sshd_config(5) "SubSystem" declarations to allow the
      specification of command-line arguments.
    + Replacement of all integer overflow susceptible invocations of
      malloc(3) and realloc(3) with overflow-checking equivalents.
    + Many manpage fixes and improvements.
    + Add optional support for OpenSSL hardware accelerators (engines),
      enabled using the --with-ssl-engine configure option.
    + Tokens in configuration files may be double-quoted in order to
      contain spaces (closes: #319639).
    + Move a debug() call out of a SIGCHLD handler, fixing a hang when the
      session exits very quickly (closes: #307890).
    + Fix some incorrect buffer allocation calculations (closes: #410599).
    + ssh-add doesn't ask for a passphrase if key file permissions are too
      liberal (closes: #103677).
    + Likewise, ssh doesn't ask either (closes: #99675).
  - 4.6/4.6p1 (http://www.openssh.org/txt/release-4.6):
    + sshd now allows the enabling and disabling of authentication methods
      on a per user, group, host and network basis via the Match directive
      in sshd_config.
    + Fixed an inconsistent check for a terminal when displaying scp
      progress meter (closes: #257524).
    + Fix "hang on exit" when background processes are running at the time
      of exit on a ttyful/login session (closes: #88337).
* Update to current GSSAPI patch from
  http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch;
  install ChangeLog.gssapi.

1 files changed, 63 insertions, 11 deletions

diff --git a/readconf.c b/readconf.c
index b3e14b9d2..6a0ffd634 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: readconf.c,v 1.161 2007/01/21 01:45:35 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -12,17 +13,33 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.145 2005/12/08 18:34:11 reyk Exp $");
 
-#include "ssh.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+
+#include <ctype.h>
+#include <errno.h>
+#include <netdb.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
 #include "xmalloc.h"
+#include "ssh.h"
 #include "compat.h"
 #include "cipher.h"
 #include "pathnames.h"
 #include "log.h"
+#include "key.h"
 #include "readconf.h"
 #include "match.h"
 #include "misc.h"
+#include "buffer.h"
 #include "kex.h"
 #include "mac.h"
 
@@ -94,6 +111,7 @@ RCSID("$OpenBSD: readconf.c,v 1.145 2005/12/08 18:34:11 reyk Exp $");
 typedef enum {
         oBadOption,
         oForwardAgent, oForwardX11, oForwardX11Trusted, oGatewayPorts,
+        oExitOnForwardFailure,
         oPasswordAuthentication, oRSAAuthentication,
         oChallengeResponseAuthentication, oXAuthLocation,
         oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,
@@ -109,6 +127,7 @@ typedef enum {
         oClearAllForwardings, oNoHostAuthenticationForLocalhost,
         oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
         oAddressFamily, oGssAuthentication, oGssDelegateCreds,
+        oGssKeyEx,
         oGssTrustDns,
         oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
         oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,
@@ -126,6 +145,7 @@ static struct {
         { "forwardagent", oForwardAgent },
         { "forwardx11", oForwardX11 },
         { "forwardx11trusted", oForwardX11Trusted },
+        { "exitonforwardfailure", oExitOnForwardFailure },
         { "xauthlocation", oXAuthLocation },
         { "gatewayports", oGatewayPorts },
         { "useprivilegedport", oUsePrivilegedPort },
@@ -146,10 +166,12 @@ static struct {
         { "afstokenpassing", oUnsupported },
 #if defined(GSSAPI)
         { "gssapiauthentication", oGssAuthentication },
+        { "gssapikeyexchange", oGssKeyEx },
         { "gssapidelegatecredentials", oGssDelegateCreds },
         { "gssapitrustdns", oGssTrustDns },
 #else
         { "gssapiauthentication", oUnsupported },
+        { "gssapikeyexchange", oUnsupported },
         { "gssapidelegatecredentials", oUnsupported },
         { "gssapitrustdns", oUnsupported },
 #endif
@@ -312,7 +334,8 @@ process_config_line(Options *options, const char *host,
                     int *activep)
 {
         char *s, **charptr, *endofnumber, *keyword, *arg, *arg2, fwdarg[256];
-        int opcode, *intptr, value, value2;
+        int opcode, *intptr, value, value2, scale;
+        long long orig, val64;
         size_t len;
         Forward fwd;
 
@@ -325,7 +348,8 @@ process_config_line(Options *options, const char *host,
 
         s = line;
         /* Get the keyword. (Each line is supposed to begin with a keyword). */
-        keyword = strdelim(&s);
+        if ((keyword = strdelim(&s)) == NULL)
+                return 0;
         /* Ignore leading whitespace. */
         if (*keyword == '\0')
                 keyword = strdelim(&s);
@@ -349,7 +373,7 @@ parse_time:
                 if ((value = convtime(arg)) == -1)
                         fatal("%s line %d: invalid time value.",
                             filename, linenum);
-                if (*intptr == -1)
+                if (*activep && *intptr == -1)
                         *intptr = value;
                 break;
 
@@ -382,6 +406,10 @@ parse_flag:
                 intptr = &options->gateway_ports;
                 goto parse_flag;
 
+        case oExitOnForwardFailure:
+                intptr = &options->exit_on_forward_failure;
+                goto parse_flag;
+
         case oUsePrivilegedPort:
                 intptr = &options->use_privileged_port;
                 goto parse_flag;
@@ -422,6 +450,10 @@ parse_flag:
                 intptr = &options->gss_authentication;
                 goto parse_flag;
 
+        case oGssKeyEx:
+                intptr = &options->gss_keyex;
+                goto parse_flag;
+
         case oGssDelegateCreds:
                 intptr = &options->gss_deleg_creds;
                 goto parse_flag;
@@ -489,22 +521,36 @@ parse_yesnoask:
                         fatal("%.200s line %d: Missing argument.", filename, linenum);
                 if (arg[0] < '0' || arg[0] > '9')
                         fatal("%.200s line %d: Bad number.", filename, linenum);
-                value = strtol(arg, &endofnumber, 10);
+                orig = val64 = strtoll(arg, &endofnumber, 10);
                 if (arg == endofnumber)
                         fatal("%.200s line %d: Bad number.", filename, linenum);
                 switch (toupper(*endofnumber)) {
+                case '\0':
+                        scale = 1;
+                        break;
                 case 'K':
-                        value *= 1<<10;
+                        scale = 1<<10;
                         break;
                 case 'M':
-                        value *= 1<<20;
+                        scale = 1<<20;
                         break;
                 case 'G':
-                        value *= 1<<30;
+                        scale = 1<<30;
                         break;
+                default:
+                        fatal("%.200s line %d: Invalid RekeyLimit suffix",
+                            filename, linenum);
                 }
+                val64 *= scale;
+                /* detect integer wrap and too-large limits */
+                if ((val64 / scale) != orig || val64 > INT_MAX)
+                        fatal("%.200s line %d: RekeyLimit too large",
+                            filename, linenum);
+                if (val64 < 16)
+                        fatal("%.200s line %d: RekeyLimit too small",
+                            filename, linenum);
                 if (*activep && *intptr == -1)
-                        *intptr = value;
+                        *intptr = (int)val64;
                 break;
 
         case oIdentityFile:
@@ -516,7 +562,7 @@ parse_yesnoask:
                         if (*intptr >= SSH_MAX_IDENTITY_FILES)
                                 fatal("%.200s line %d: Too many identity files specified (max %d).",
                                     filename, linenum, SSH_MAX_IDENTITY_FILES);
-                        charptr =  &options->identity_files[*intptr];
+                        charptr = &options->identity_files[*intptr];
                         *charptr = xstrdup(arg);
                         *intptr = *intptr + 1;
                 }
@@ -997,6 +1043,7 @@ initialize_options(Options * options)
         options->forward_agent = -1;
         options->forward_x11 = -1;
         options->forward_x11_trusted = -1;
+        options->exit_on_forward_failure = -1;
         options->xauth_location = NULL;
         options->gateway_ports = -1;
         options->use_privileged_port = -1;
@@ -1004,6 +1051,7 @@ initialize_options(Options * options)
         options->pubkey_authentication = -1;
         options->challenge_response_authentication = -1;
         options->gss_authentication = -1;
+        options->gss_keyex = -1;
         options->gss_deleg_creds = -1;
         options->gss_trust_dns = -1;
         options->password_authentication = -1;
@@ -1079,6 +1127,8 @@ fill_default_options(Options * options)
                 options->forward_x11 = 0;
         if (options->forward_x11_trusted == -1)
                 options->forward_x11_trusted = 1;
+        if (options->exit_on_forward_failure == -1)
+                options->exit_on_forward_failure = 0;
         if (options->xauth_location == NULL)
                 options->xauth_location = _PATH_XAUTH;
         if (options->gateway_ports == -1)
@@ -1093,6 +1143,8 @@ fill_default_options(Options * options)
                 options->challenge_response_authentication = 1;
         if (options->gss_authentication == -1)
                 options->gss_authentication = 0;
+        if (options->gss_keyex == -1)
+                options->gss_keyex = 0;
         if (options->gss_deleg_creds == -1)
                 options->gss_deleg_creds = 0;
         if (options->gss_trust_dns == -1)