diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-22 05:34:40 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-22 05:34:40 +0000 |
commit | 226cfa03781466907dd252916aeade6879e376b8 (patch) | |
tree | 3251d15053db065d74994b95e17fd65874fcaa9b /dh.c | |
parent | 401d58f3612fa030f309d01df9815a2fc1d3c6de (diff) |
Hopefully things did not get mixed around too much. It compiles under
Linux and works. So that is at least a good sign. =)
20010122
- (bal) OpenBSD Resync
- markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by markus
[servconf.c ssh.h sshd.c]
only auth-chall.c needs #ifdef SKEY
- markus@cvs.openbsd.org 2001/01/19 15:55:10 GMT 2001 by markus
[auth-krb4.c auth-options.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c
auth1.c auth2.c channels.c clientloop.c dh.c dispatch.c nchan.c
packet.c pathname.h readconf.c scp.c servconf.c serverloop.c
session.c ssh-add.c ssh-keygen.c ssh-keyscan.c ssh.c ssh.h
ssh1.h sshconnect1.c sshd.c ttymodes.c]
move ssh1 definitions to ssh1.h, pathnames to pathnames.h
- markus@cvs.openbsd.org 2001/01/19 16:48:14
[sshd.8]
fix typo; from stevesk@
- markus@cvs.openbsd.org 2001/01/19 16:50:58
[ssh-dss.c]
clear and free digest, make consistent with other code (use dlen); from
stevesk@
- markus@cvs.openbsd.org 2001/01/20 15:55:20 GMT 2001 by markus
[auth-options.c auth-options.h auth-rsa.c auth2.c]
pass the filename to auth_parse_options()
- markus@cvs.openbsd.org 2001/01/20 17:59:40 GMT 2001
[readconf.c]
fix SIGSEGV from -o ""; problem noted by jehsom@togetherweb.com
- stevesk@cvs.openbsd.org 2001/01/20 18:20:29
[sshconnect2.c]
dh_new_group() does not return NULL. ok markus@
- markus@cvs.openbsd.org 2001/01/20 21:33:42
[ssh-add.c]
do not loop forever if askpass does not exist; from
andrew@pimlott.ne.mediaone.net
- djm@cvs.openbsd.org 2001/01/20 23:00:56
[servconf.c]
Check for NULL return from strdelim; ok markus
- djm@cvs.openbsd.org 2001/01/20 23:02:07
[readconf.c]
KNF; ok markus
- jakob@cvs.openbsd.org 2001/01/21 9:00:33
[ssh-keygen.1]
remove -R flag; ok markus@
- markus@cvs.openbsd.org 2001/01/21 19:05:40
[atomicio.c automicio.h auth-chall.c auth-krb4.c auth-options.c
auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c
auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c
bufaux.c bufaux.h buffer.c canahost.c canahost.h channels.c
cipher.c cli.c clientloop.c clientloop.h compat.c compress.c
deattack.c dh.c dispatch.c groupaccess.c hmac.c hostfile.c kex.c
key.c key.h log-client.c log-server.c log.c log.h login.c login.h
match.c misc.c misc.h nchan.c packet.c pty.c radix.h readconf.c
readpass.c readpass.h rsa.c scp.c servconf.c serverloop.c serverloop.h
session.c sftp-server.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c
ssh-keyscan.c ssh-rsa.c ssh.c ssh.h sshconnect.c sshconnect.h
sshconnect1.c sshconnect2.c sshd.c tildexpand.c tildexpand.h
ttysmodes.c uidswap.c xmalloc.c]
split ssh.h and try to cleanup the #include mess. remove unnecessary
#includes. rename util.[ch] -> misc.[ch]
- (bal) renamed 'PIDDIR' to '_PATH_SSH_PIDDIR' to match OpenBSD tree
- (bal) Moved #ifdef KRB4 in auth-krb4.c above the #include to resolve
conflict when compiling for non-kerb install
- (bal) removed the #ifdef SKEY in auth1.c to match Markus' changes
on 1/19.
Diffstat (limited to 'dh.c')
-rw-r--r-- | dh.c | 17 |
1 files changed, 10 insertions, 7 deletions
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: dh.c,v 1.4 2001/01/15 21:43:51 markus Exp $"); | 26 | RCSID("$OpenBSD: dh.c,v 1.6 2001/01/21 19:05:49 markus Exp $"); |
27 | 27 | ||
28 | #include "xmalloc.h" | 28 | #include "xmalloc.h" |
29 | 29 | ||
@@ -31,10 +31,13 @@ RCSID("$OpenBSD: dh.c,v 1.4 2001/01/15 21:43:51 markus Exp $"); | |||
31 | #include <openssl/dh.h> | 31 | #include <openssl/dh.h> |
32 | #include <openssl/evp.h> | 32 | #include <openssl/evp.h> |
33 | 33 | ||
34 | #include "ssh.h" | ||
35 | #include "buffer.h" | 34 | #include "buffer.h" |
35 | #include "cipher.h" | ||
36 | #include "kex.h" | 36 | #include "kex.h" |
37 | #include "dh.h" | 37 | #include "dh.h" |
38 | #include "pathnames.h" | ||
39 | #include "log.h" | ||
40 | #include "misc.h" | ||
38 | 41 | ||
39 | int | 42 | int |
40 | parse_prime(int linenum, char *line, struct dhgroup *dhg) | 43 | parse_prime(int linenum, char *line, struct dhgroup *dhg) |
@@ -100,9 +103,9 @@ choose_dh(int minbits) | |||
100 | int linenum; | 103 | int linenum; |
101 | struct dhgroup dhg; | 104 | struct dhgroup dhg; |
102 | 105 | ||
103 | f = fopen(DH_PRIMES, "r"); | 106 | f = fopen(_PATH_DH_PRIMES, "r"); |
104 | if (!f) { | 107 | if (!f) { |
105 | log("WARNING: %s does not exist, using old prime", DH_PRIMES); | 108 | log("WARNING: %s does not exist, using old prime", _PATH_DH_PRIMES); |
106 | return (dh_new_group1()); | 109 | return (dh_new_group1()); |
107 | } | 110 | } |
108 | 111 | ||
@@ -126,13 +129,13 @@ choose_dh(int minbits) | |||
126 | fclose (f); | 129 | fclose (f); |
127 | 130 | ||
128 | if (bestcount == 0) { | 131 | if (bestcount == 0) { |
129 | log("WARNING: no primes in %s, using old prime", DH_PRIMES); | 132 | log("WARNING: no primes in %s, using old prime", _PATH_DH_PRIMES); |
130 | return (dh_new_group1()); | 133 | return (dh_new_group1()); |
131 | } | 134 | } |
132 | 135 | ||
133 | f = fopen(DH_PRIMES, "r"); | 136 | f = fopen(_PATH_DH_PRIMES, "r"); |
134 | if (!f) { | 137 | if (!f) { |
135 | fatal("WARNING: %s dissappeared, giving up", DH_PRIMES); | 138 | fatal("WARNING: %s dissappeared, giving up", _PATH_DH_PRIMES); |
136 | } | 139 | } |
137 | 140 | ||
138 | linenum = 0; | 141 | linenum = 0; |