Attachment 2801 Details for Bug 2559 – moduli-primes-warnings.patch

[patch] moduli-primes-warnings.patch

new-primes.patch (text/plain), 1.57 KB, created by Dimitri John Ledkov on 2016-03-30 23:22:43 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitri John Ledkov

Created: 2016-03-30 23:22:43 AEDT

Size: 1.57 KB

patch

obsolete

>Description: Make warning messages unambigious about moduli/prime
>Author: Dimitri John Ledkov <xnox@ubuntu.com>
>Bug-Ubuntu: https://bugs.launchpad.net/bugs/1528251
>
>Index: openssh-7.2p2/dh.c
>===================================================================
>--- openssh-7.2p2.orig/dh.c
>+++ openssh-7.2p2/dh.c
>@@ -151,11 +151,19 @@ choose_dh(int min, int wantbits, int max
> 	int linenum;
> 	struct dhgroup dhg;
> 
>-	if ((f = fopen(_PATH_DH_MODULI, "r")) == NULL &&
>-	    (f = fopen(_PATH_DH_PRIMES, "r")) == NULL) {
>-		logit("WARNING: %s does not exist, using fixed modulus",
>-		    _PATH_DH_MODULI);
>-		return (dh_new_group_fallback(max));
>+	const char *moduli_path;
>+	
>+	moduli_path = _PATH_DH_MODULI;
>+
>+	if ((f = fopen(moduli_path, "r")) == NULL) {
>+	  logit("WARNING: %s does not exist, trying %s",
>+		moduli_path, _PATH_DH_PRIMES);
>+	  moduli_path = _PATH_DH_PRIMES;
>+	  if ((f = fopen(moduli_path, "r")) == NULL) {
>+	    logit("WARNING: %s does not exist, using fixed modulus",
>+		  moduli_path);
>+	    return (dh_new_group_fallback(max));
>+	  }
> 	}
> 
> 	linenum = 0;
>@@ -182,7 +190,7 @@ choose_dh(int min, int wantbits, int max
> 
> 	if (bestcount == 0) {
> 		fclose(f);
>-		logit("WARNING: no suitable primes in %s", _PATH_DH_PRIMES);
>+		logit("WARNING: no suitable primes in %s", moduli_path);
> 		return (dh_new_group_fallback(max));
> 	}
> 
>@@ -203,7 +211,7 @@ choose_dh(int min, int wantbits, int max
> 	fclose(f);
> 	if (linenum != which+1) {
> 		logit("WARNING: line %d disappeared in %s, giving up",
>-		    which, _PATH_DH_PRIMES);
>+		    which, moduli_path);
> 		return (dh_new_group_fallback(max));
> 	}
>

Actions: View | Diff

Attachments on bug 2559: 2801 | 2802