summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/dh.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2001-01-19 15:55:10 +0000
committermarkus <markus@openbsd.org>2001-01-19 15:55:10 +0000
commite810d18bdfa95d8f53b6d93b96ecc03eefc7550b (patch)
tree6a18b679fd9e18b99b22b7d8e1f905509c1b1351 /usr.bin/ssh/dh.c
parentAgain, increase the size. (diff)
downloadwireguard-openbsd-e810d18bdfa95d8f53b6d93b96ecc03eefc7550b.tar.xz
wireguard-openbsd-e810d18bdfa95d8f53b6d93b96ecc03eefc7550b.zip
move ssh1 definitions to ssh1.h, pathnames to pathnames.h
Diffstat (limited to 'usr.bin/ssh/dh.c')
-rw-r--r--usr.bin/ssh/dh.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/usr.bin/ssh/dh.c b/usr.bin/ssh/dh.c
index 87a47845007..605148f908a 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.4 2001/01/15 21:43:51 markus Exp $");
+RCSID("$OpenBSD: dh.c,v 1.5 2001/01/19 15:55:11 markus Exp $");
#include "xmalloc.h"
@@ -35,6 +35,7 @@ RCSID("$OpenBSD: dh.c,v 1.4 2001/01/15 21:43:51 markus Exp $");
#include "buffer.h"
#include "kex.h"
#include "dh.h"
+#include "pathnames.h"
int
parse_prime(int linenum, char *line, struct dhgroup *dhg)
@@ -100,9 +101,9 @@ choose_dh(int minbits)
int linenum;
struct dhgroup dhg;
- f = fopen(DH_PRIMES, "r");
+ f = fopen(_PATH_DH_PRIMES, "r");
if (!f) {
- log("WARNING: %s does not exist, using old prime", DH_PRIMES);
+ log("WARNING: %s does not exist, using old prime", _PATH_DH_PRIMES);
return (dh_new_group1());
}
@@ -126,13 +127,13 @@ choose_dh(int minbits)
fclose (f);
if (bestcount == 0) {
- log("WARNING: no primes in %s, using old prime", DH_PRIMES);
+ log("WARNING: no primes in %s, using old prime", _PATH_DH_PRIMES);
return (dh_new_group1());
}
- f = fopen(DH_PRIMES, "r");
+ f = fopen(_PATH_DH_PRIMES, "r");
if (!f) {
- fatal("WARNING: %s dissappeared, giving up", DH_PRIMES);
+ fatal("WARNING: %s dissappeared, giving up", _PATH_DH_PRIMES);
}
linenum = 0;