upstream commit

Allow RekeyLimits in excess of 4G up to 2**63 bits
 (limited by the return type of scan_scaled).  Part of bz#2521, ok djm.

Upstream-ID: 13bea82be566b9704821b1ea05bf7804335c7979

1 files changed, 3 insertions, 7 deletions

diff --git a/servconf.c b/servconf.c
index 19c68e2d7..7bee5a17a 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
 
-/* $OpenBSD: servconf.c,v 1.283 2015/11/13 04:38:06 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.284 2016/01/29 02:54:45 dtucker Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1330,16 +1330,12 @@ process_server_config_line(ServerOptions *options, char *line,
                         if (scan_scaled(arg, &val64) == -1)
                                 fatal("%.200s line %d: Bad number '%s': %s",
                                     filename, linenum, arg, strerror(errno));
-                        /* check for too-large or too-small limits */
-                        if (val64 > UINT_MAX)
-                                fatal("%.200s line %d: RekeyLimit too large",
-                                    filename, linenum);
                         if (val64 != 0 && val64 < 16)
                                 fatal("%.200s line %d: RekeyLimit too small",
                                     filename, linenum);
                 }
                 if (*activep && options->rekey_limit == -1)
-                        options->rekey_limit = (u_int32_t)val64;
+                        options->rekey_limit = val64;
                 if (cp != NULL) { /* optional rekey interval present */
                         if (strcmp(cp, "none") == 0) {
                                 (void)strdelim(&cp);    /* discard */
@@ -2361,7 +2357,7 @@ dump_config(ServerOptions *o)
         printf("ipqos %s ", iptos2str(o->ip_qos_interactive));
         printf("%s\n", iptos2str(o->ip_qos_bulk));
 
-        printf("rekeylimit %lld %d\n", (long long)o->rekey_limit,
+        printf("rekeylimit %llu %d\n", (unsigned long long)o->rekey_limit,
             o->rekey_interval);
 
         channel_print_adm_permitted_opens();