import openssh-4.6p1-gsskex-20070312.patch

1 files changed, 63 insertions, 11 deletions

diff --git a/readconf.c b/readconf.c
index 355a41ccb..598bab693 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,
@@ -125,6 +144,7 @@ static struct {
         { "forwardagent", oForwardAgent },
         { "forwardx11", oForwardX11 },
         { "forwardx11trusted", oForwardX11Trusted },
+        { "exitonforwardfailure", oExitOnForwardFailure },
         { "xauthlocation", oXAuthLocation },
         { "gatewayports", oGatewayPorts },
         { "useprivilegedport", oUsePrivilegedPort },
@@ -145,10 +165,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
@@ -309,7 +331,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;
 
@@ -322,7 +345,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);
@@ -346,7 +370,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;
 
@@ -379,6 +403,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;
@@ -419,6 +447,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;
@@ -486,22 +518,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:
@@ -513,7 +559,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;
                 }
@@ -970,6 +1016,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;
@@ -977,6 +1024,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;
@@ -1051,6 +1099,8 @@ fill_default_options(Options * options)
                 options->forward_x11 = 0;
         if (options->forward_x11_trusted == -1)
                 options->forward_x11_trusted = 0;
+        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)
@@ -1065,6 +1115,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)