diff options
-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 @@ | |||
13 | o) sort SEE ALSO; | 13 | o) sort SEE ALSO; |
14 | 14 | ||
15 | aaron@ ok | 15 | aaron@ ok |
16 | - provos@cvs.openbsd.org 2001/06/22 21:27:08 | ||
17 | [dh.c pathnames.h] | ||
18 | use /etc/moduli instead of /etc/primes, okay markus@ | ||
16 | 19 | ||
17 | 20010622 | 20 | 20010622 |
18 | - (stevesk) handle systems without pw_expire and pw_change. | 21 | - (stevesk) handle systems without pw_expire and pw_change. |
@@ -5697,4 +5700,4 @@ | |||
5697 | - Wrote replacements for strlcpy and mkdtemp | 5700 | - Wrote replacements for strlcpy and mkdtemp |
5698 | - Released 1.0pre1 | 5701 | - Released 1.0pre1 |
5699 | 5702 | ||
5700 | $Id: ChangeLog,v 1.1299 2001/06/25 04:10:54 mouring Exp $ | 5703 | $Id: ChangeLog,v 1.1300 2001/06/25 04:13:25 mouring Exp $ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: dh.c,v 1.14 2001/04/15 08:43:45 markus Exp $"); | 26 | RCSID("$OpenBSD: dh.c,v 1.15 2001/06/22 21:27:07 provos Exp $"); |
27 | 27 | ||
28 | #include "xmalloc.h" | 28 | #include "xmalloc.h" |
29 | 29 | ||
@@ -108,9 +108,9 @@ choose_dh(int min, int wantbits, int max) | |||
108 | int linenum; | 108 | int linenum; |
109 | struct dhgroup dhg; | 109 | struct dhgroup dhg; |
110 | 110 | ||
111 | f = fopen(_PATH_DH_PRIMES, "r"); | 111 | if ((f = fopen(_PATH_DH_MODULI, "r")) == NULL && |
112 | if (!f) { | 112 | (f = fopen(_PATH_DH_PRIMES, "r")) == NULL) { |
113 | log("WARNING: %s does not exist, using old prime", _PATH_DH_PRIMES); | 113 | log("WARNING: %s does not exist, using old modulus", _PATH_DH_MODULI); |
114 | return (dh_new_group1()); | 114 | return (dh_new_group1()); |
115 | } | 115 | } |
116 | 116 | ||
diff --git a/pathnames.h b/pathnames.h index 190989655..991fc734a 100644 --- a/pathnames.h +++ b/pathnames.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pathnames.h,v 1.6 2001/06/08 15:25:40 markus Exp $ */ | 1 | /* $OpenBSD: pathnames.h,v 1.7 2001/06/22 21:27:08 provos Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -36,6 +36,8 @@ | |||
36 | #define _PATH_HOST_KEY_FILE ETCDIR "/ssh_host_key" | 36 | #define _PATH_HOST_KEY_FILE ETCDIR "/ssh_host_key" |
37 | #define _PATH_HOST_DSA_KEY_FILE ETCDIR "/ssh_host_dsa_key" | 37 | #define _PATH_HOST_DSA_KEY_FILE ETCDIR "/ssh_host_dsa_key" |
38 | #define _PATH_HOST_RSA_KEY_FILE ETCDIR "/ssh_host_rsa_key" | 38 | #define _PATH_HOST_RSA_KEY_FILE ETCDIR "/ssh_host_rsa_key" |
39 | #define _PATH_DH_MODULI ETCDIR "/moduli" | ||
40 | /* Backwards compatibility */ | ||
39 | #define _PATH_DH_PRIMES ETCDIR "/primes" | 41 | #define _PATH_DH_PRIMES ETCDIR "/primes" |
40 | 42 | ||
41 | #ifndef _PATH_SSH_PROGRAM | 43 | #ifndef _PATH_SSH_PROGRAM |