diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2001-06-25 04:13:25 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-06-25 04:13:25 +0000 |
| commit | 93a29e046e297c060a48fcdd1e43641470d78cdd (patch) | |
| tree | d9370dfcda997e302365dabf979a35af49c62e3c | |
| parent | d2bf0d64d93b942120e937058b189668069e77fd (diff) | |
- provos@cvs.openbsd.org 2001/06/22 21:27:08
[dh.c pathnames.h]
use /etc/moduli instead of /etc/primes, okay markus@
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | dh.c | 8 | ||||
| -rw-r--r-- | pathnames.h | 4 |
3 files changed, 11 insertions, 6 deletions
@@ -13,6 +13,9 @@ o) sort SEE ALSO; aaron@ ok + - provos@cvs.openbsd.org 2001/06/22 21:27:08 + [dh.c pathnames.h] + use /etc/moduli instead of /etc/primes, okay markus@ 20010622 - (stevesk) handle systems without pw_expire and pw_change. @@ -5697,4 +5700,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1299 2001/06/25 04:10:54 mouring Exp $ +$Id: ChangeLog,v 1.1300 2001/06/25 04:13:25 mouring Exp $ @@ -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/pathnames.h b/pathnames.h index 19098965..991fc734 100644 --- a/pathnames.h +++ b/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> @@ -36,6 +36,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" #ifndef _PATH_SSH_PROGRAM |