Import openssh_7.4p1.orig.tar.gz

1 files changed, 3 insertions, 4 deletions

diff --git a/dh.c b/dh.c
index 167d3714e..475312427 100644
--- a/dh.c
+++ b/dh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh.c,v 1.60 2016/05/02 10:26:04 djm Exp $ */
+/* $OpenBSD: dh.c,v 1.62 2016/12/15 21:20:41 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  *
@@ -25,7 +25,6 @@
 
 #include "includes.h"
 
-#include <sys/param.h>  /* MIN */
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>
@@ -153,7 +152,7 @@ choose_dh(int min, int wantbits, int max)
         struct dhgroup dhg;
 
         if ((f = fopen(_PATH_DH_MODULI, "r")) == NULL) {
-                logit("WARNING: could open open %s (%s), using fixed modulus",
+                logit("WARNING: could not open %s (%s), using fixed modulus",
                     _PATH_DH_MODULI, strerror(errno));
                 return (dh_new_group_fallback(max));
         }
@@ -272,7 +271,7 @@ dh_gen_key(DH *dh, int need)
          * Pollard Rho, Big step/Little Step attacks are O(sqrt(n)),
          * so double requested need here.
          */
-        dh->length = MIN(need * 2, pbits - 1);
+        dh->length = MINIMUM(need * 2, pbits - 1);
         if (DH_generate_key(dh) == 0 ||
             !dh_pub_is_valid(dh, dh->pub_key)) {
                 BN_clear_free(dh->priv_key);