Attachment 2802 Details for Bug 2559 – Remove /etc/primes fallback and fix moduli log messages

[patch] Remove /etc/primes fallback and fix moduli log messages

ssh-moduli-primes.patch (text/plain), 2.03 KB, created by Darren Tucker on 2016-03-31 14:04:46 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2016-03-31 14:04:46 AEDT

Size: 2.03 KB

patch

obsolete

>? clientloop.c.daz
>? session.c.daz
>? moduli-gen/work
>Index: dh.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/dh.c,v
>retrieving revision 1.58
>diff -u -p -r1.58 dh.c
>--- dh.c	28 Feb 2016 22:27:00 -0000	1.58
>+++ dh.c	31 Mar 2016 03:02:27 -0000
>@@ -28,6 +28,7 @@
> #include <openssl/bn.h>
> #include <openssl/dh.h>
> 
>+#include <errno.h>
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
>@@ -148,10 +149,9 @@ 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);
>+	if ((f = fopen(_PATH_DH_MODULI, "r")) == NULL) {
>+		logit("WARNING: could open open %s (%s), using fixed modulus",
>+		    _PATH_DH_MODULI, strerror(errno));
> 		return (dh_new_group_fallback(max));
> 	}
> 
>@@ -179,7 +179,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", _PATH_DH_MODULI);
> 		return (dh_new_group_fallback(max));
> 	}
> 
>@@ -200,7 +200,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, _PATH_DH_MODULI);
> 		return (dh_new_group_fallback(max));
> 	}
> 
>Index: pathnames.h
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/pathnames.h,v
>retrieving revision 1.24
>diff -u -p -r1.24 pathnames.h
>--- pathnames.h	6 Dec 2013 13:39:49 -0000	1.24
>+++ pathnames.h	31 Mar 2016 03:02:27 -0000
>@@ -36,8 +36,6 @@
> #define _PATH_HOST_RSA_KEY_FILE		SSHDIR "/ssh_host_rsa_key"
> #define _PATH_HOST_ED25519_KEY_FILE	SSHDIR "/ssh_host_ed25519_key"
> #define _PATH_DH_MODULI			ETCDIR "/moduli"
>-/* Backwards compatibility */
>-#define _PATH_DH_PRIMES			ETCDIR "/primes"
> 
> #define _PATH_SSH_PROGRAM		"/usr/bin/ssh"
>

Actions: View | Diff

Attachments on bug 2559: 2801 | 2802