diff options
author | Damien Miller <djm@mindrot.org> | 2000-10-14 16:23:11 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-10-14 16:23:11 +1100 |
commit | 874d77bb134a21a5cf625956b60173376a993ba8 (patch) | |
tree | 93dd73b2ff1fbf0ad5f3978a2c4e0d8438a0bf7c /dh.c | |
parent | 89d9796fbedef4eed6956a2c095c7cc25330c28d (diff) |
- (djm) Big OpenBSD sync:
- markus@cvs.openbsd.org 2000/09/30 10:27:44
[log.c]
allow loglevel debug
- markus@cvs.openbsd.org 2000/10/03 11:59:57
[packet.c]
hmac->mac
- markus@cvs.openbsd.org 2000/10/03 12:03:03
[auth-krb4.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth1.c]
move fake-auth from auth1.c to individual auth methods, disables s/key in
debug-msg
- markus@cvs.openbsd.org 2000/10/03 12:16:48
ssh.c
do not resolve canonname, i have no idea why this was added oin ossh
- markus@cvs.openbsd.org 2000/10/09 15:30:44
ssh-keygen.1 ssh-keygen.c
-X now reads private ssh.com DSA keys, too.
- markus@cvs.openbsd.org 2000/10/09 15:32:34
auth-options.c
clear options on every call.
- markus@cvs.openbsd.org 2000/10/09 15:51:00
authfd.c authfd.h
interop with ssh-agent2, from <res@shore.net>
- markus@cvs.openbsd.org 2000/10/10 14:20:45
compat.c
use rexexp for version string matching
- provos@cvs.openbsd.org 2000/10/10 22:02:18
[kex.c kex.h myproposal.h ssh.h ssh2.h sshconnect2.c sshd.c dh.c dh.h]
First rough implementation of the diffie-hellman group exchange. The
client can ask the server for bigger groups to perform the diffie-hellman
in, thus increasing the attack complexity when using ciphers with longer
keys. University of Windsor provided network, T the company.
- markus@cvs.openbsd.org 2000/10/11 13:59:52
[auth-rsa.c auth2.c]
clear auth options unless auth sucessfull
- markus@cvs.openbsd.org 2000/10/11 14:00:27
[auth-options.h]
clear auth options unless auth sucessfull
- markus@cvs.openbsd.org 2000/10/11 14:03:27
[scp.1 scp.c]
support 'scp -o' with help from mouring@pconline.com
- markus@cvs.openbsd.org 2000/10/11 14:11:35
[dh.c]
Wall
- markus@cvs.openbsd.org 2000/10/11 14:14:40
[auth.h auth2.c readconf.c readconf.h readpass.c servconf.c servconf.h]
[ssh.h sshconnect2.c sshd_config auth2-skey.c cli.c cli.h]
add support for s/key (kbd-interactive) to ssh2, based on work by
mkiernan@avantgo.com and me
- markus@cvs.openbsd.org 2000/10/11 14:27:24
[auth.c auth1.c auth2.c authfile.c cipher.c cipher.h kex.c kex.h]
[myproposal.h packet.c readconf.c session.c ssh.c ssh.h sshconnect1.c]
[sshconnect2.c sshd.c]
new cipher framework
- markus@cvs.openbsd.org 2000/10/11 14:45:21
[cipher.c]
remove DES
- markus@cvs.openbsd.org 2000/10/12 03:59:20
[cipher.c cipher.h sshconnect1.c sshconnect2.c sshd.c]
enable DES in SSH-1 clients only
- markus@cvs.openbsd.org 2000/10/12 08:21:13
[kex.h packet.c]
remove unused
- markus@cvs.openbsd.org 2000/10/13 12:34:46
[sshd.c]
Kludge for F-Secure Macintosh < 1.0.2; appro@fy.chalmers.se
- markus@cvs.openbsd.org 2000/10/13 12:59:15
[cipher.c cipher.h myproposal.h rijndael.c rijndael.h]
rijndael/aes support
- markus@cvs.openbsd.org 2000/10/13 13:10:54
[sshd.8]
more info about -V
- markus@cvs.openbsd.org 2000/10/13 13:12:02
[myproposal.h]
prefer no compression
Diffstat (limited to 'dh.c')
-rw-r--r-- | dh.c | 157 |
1 files changed, 157 insertions, 0 deletions
@@ -0,0 +1,157 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2000 Niels Provos. All rights reserved. | ||
3 | * | ||
4 | * Redistribution and use in source and binary forms, with or without | ||
5 | * modification, are permitted provided that the following conditions | ||
6 | * are met: | ||
7 | * 1. Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * 2. Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * | ||
13 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
14 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
15 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
16 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
17 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
18 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
19 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
20 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
21 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
23 | */ | ||
24 | |||
25 | #include "includes.h" | ||
26 | RCSID("$OpenBSD: dh.c,v 1.2 2000/10/11 20:11:35 markus Exp $"); | ||
27 | |||
28 | #include "xmalloc.h" | ||
29 | |||
30 | #include <openssl/bn.h> | ||
31 | #include <openssl/dh.h> | ||
32 | #include <openssl/evp.h> | ||
33 | |||
34 | #include "ssh.h" | ||
35 | #include "buffer.h" | ||
36 | #include "kex.h" | ||
37 | #include "dh.h" | ||
38 | |||
39 | int | ||
40 | parse_prime(int linenum, char *line, struct dhgroup *dhg) | ||
41 | { | ||
42 | char *cp, *arg; | ||
43 | char *strsize, *gen, *prime; | ||
44 | |||
45 | cp = line; | ||
46 | arg = strdelim(&cp); | ||
47 | /* Ignore leading whitespace */ | ||
48 | if (*arg == '\0') | ||
49 | arg = strdelim(&cp); | ||
50 | if (!*arg || *arg == '#') | ||
51 | return 0; | ||
52 | |||
53 | /* time */ | ||
54 | if (cp == NULL || *arg == '\0') | ||
55 | goto fail; | ||
56 | arg = strsep(&cp, " "); /* type */ | ||
57 | if (cp == NULL || *arg == '\0') | ||
58 | goto fail; | ||
59 | arg = strsep(&cp, " "); /* tests */ | ||
60 | if (cp == NULL || *arg == '\0') | ||
61 | goto fail; | ||
62 | arg = strsep(&cp, " "); /* tries */ | ||
63 | if (cp == NULL || *arg == '\0') | ||
64 | goto fail; | ||
65 | strsize = strsep(&cp, " "); /* size */ | ||
66 | if (cp == NULL || *strsize == '\0' || | ||
67 | (dhg->size = atoi(strsize)) == 0) | ||
68 | goto fail; | ||
69 | gen = strsep(&cp, " "); /* gen */ | ||
70 | if (cp == NULL || *gen == '\0') | ||
71 | goto fail; | ||
72 | prime = strsep(&cp, " "); /* prime */ | ||
73 | if (cp != NULL || *prime == '\0') | ||
74 | goto fail; | ||
75 | |||
76 | dhg->g = BN_new(); | ||
77 | if (BN_hex2bn(&dhg->g, gen) < 0) { | ||
78 | BN_free(dhg->g); | ||
79 | goto fail; | ||
80 | } | ||
81 | dhg->p = BN_new(); | ||
82 | if (BN_hex2bn(&dhg->p, prime) < 0) { | ||
83 | BN_free(dhg->g); | ||
84 | BN_free(dhg->p); | ||
85 | goto fail; | ||
86 | } | ||
87 | |||
88 | return (1); | ||
89 | fail: | ||
90 | fprintf(stderr, "Bad prime description in line %d\n", linenum); | ||
91 | return (0); | ||
92 | } | ||
93 | |||
94 | DH * | ||
95 | choose_dh(int minbits) | ||
96 | { | ||
97 | FILE *f; | ||
98 | char line[1024]; | ||
99 | int best, bestcount, which; | ||
100 | int linenum; | ||
101 | struct dhgroup dhg; | ||
102 | |||
103 | f = fopen(DH_PRIMES, "r"); | ||
104 | if (!f) { | ||
105 | perror(DH_PRIMES); | ||
106 | log("WARNING: %s does not exist, using old prime", DH_PRIMES); | ||
107 | return (dh_new_group1()); | ||
108 | } | ||
109 | |||
110 | linenum = 0; | ||
111 | best = bestcount = 0; | ||
112 | while (fgets(line, sizeof(line), f)) { | ||
113 | linenum++; | ||
114 | if (!parse_prime(linenum, line, &dhg)) | ||
115 | continue; | ||
116 | BN_free(dhg.g); | ||
117 | BN_free(dhg.p); | ||
118 | |||
119 | if ((dhg.size > minbits && dhg.size < best) || | ||
120 | (dhg.size > best && best < minbits)) { | ||
121 | best = dhg.size; | ||
122 | bestcount = 0; | ||
123 | } | ||
124 | if (dhg.size == best) | ||
125 | bestcount++; | ||
126 | } | ||
127 | fclose (f); | ||
128 | |||
129 | if (bestcount == 0) { | ||
130 | log("WARNING: no primes in %s, using old prime", DH_PRIMES); | ||
131 | return (dh_new_group1()); | ||
132 | } | ||
133 | |||
134 | f = fopen(DH_PRIMES, "r"); | ||
135 | if (!f) { | ||
136 | perror(DH_PRIMES); | ||
137 | exit(1); | ||
138 | } | ||
139 | |||
140 | linenum = 0; | ||
141 | which = arc4random() % bestcount; | ||
142 | while (fgets(line, sizeof(line), f)) { | ||
143 | if (!parse_prime(linenum, line, &dhg)) | ||
144 | continue; | ||
145 | if (dhg.size != best) | ||
146 | continue; | ||
147 | if (linenum++ != which) { | ||
148 | BN_free(dhg.g); | ||
149 | BN_free(dhg.p); | ||
150 | continue; | ||
151 | } | ||
152 | break; | ||
153 | } | ||
154 | fclose(f); | ||
155 | |||
156 | return (dh_new_group(dhg.g, dhg.p)); | ||
157 | } | ||