diff options
| author |   provos <provos@openbsd.org> | 2001-06-22 21:27:07 +0000 |
|---|---|---|
| committer | provos <provos@openbsd.org> | 2001-06-22 21:27:07 +0000 |
| commit | b225231fa4a92b0079dd3ca3070caeb2b4ef609b (patch) | |
| tree | d50feb7c512ca93e711b8a195d01f48dc6b9e2cf | |
| parent | minor nit. (diff) | |
| download | wireguard-openbsd-b225231fa4a92b0079dd3ca3070caeb2b4ef609b.tar.xz wireguard-openbsd-b225231fa4a92b0079dd3ca3070caeb2b4ef609b.zip | |
use /etc/moduli instead of /etc/primes, okay markus@
| -rw-r--r-- | usr.bin/ssh/dh.c | 8 | ||||
| -rw-r--r-- | usr.bin/ssh/pathnames.h | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/usr.bin/ssh/dh.c b/usr.bin/ssh/dh.c index 575522ddb5e..26deb9fbf07 100644 --- a/usr.bin/ssh/dh.c +++ b/usr.bin/ssh/dh.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: dh.c,v 1.14 2001/04/15 08:43:45 markus Exp $"); +RCSID("$OpenBSD: dh.c,v 1.15 2001/06/22 21:27:07 provos Exp $"); #include "xmalloc.h" @@ -108,9 +108,9 @@ choose_dh(int min, int wantbits, int max) int linenum; struct dhgroup dhg; - f = fopen(_PATH_DH_PRIMES, "r"); - if (!f) { - log("WARNING: %s does not exist, using old prime", _PATH_DH_PRIMES); + if ((f = fopen(_PATH_DH_MODULI, "r")) == NULL && + (f = fopen(_PATH_DH_PRIMES, "r")) == NULL) { + log("WARNING: %s does not exist, using old modulus", _PATH_DH_MODULI); return (dh_new_group1()); } diff --git a/usr.bin/ssh/pathnames.h b/usr.bin/ssh/pathnames.h index 064665a2e12..818fbf6c8ad 100644 --- a/usr.bin/ssh/pathnames.h +++ b/usr.bin/ssh/pathnames.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pathnames.h,v 1.6 2001/06/08 15:25:40 markus Exp $ */ +/* $OpenBSD: pathnames.h,v 1.7 2001/06/22 21:27:08 provos Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -31,6 +31,8 @@ #define _PATH_HOST_KEY_FILE ETCDIR "/ssh_host_key" #define _PATH_HOST_DSA_KEY_FILE ETCDIR "/ssh_host_dsa_key" #define _PATH_HOST_RSA_KEY_FILE ETCDIR "/ssh_host_rsa_key" +#define _PATH_DH_MODULI ETCDIR "/moduli" +/* Backwards compatibility */ #define _PATH_DH_PRIMES ETCDIR "/primes" #define _PATH_SSH_PROGRAM "/usr/bin/ssh" |