diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | compat.c | 6 | ||||
-rw-r--r-- | dh.c | 9 |
3 files changed, 16 insertions, 7 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20020307 | ||
2 | - (djm) OpenBSD CVS Sync | ||
3 | - markus@cvs.openbsd.org 2002/03/06 00:20:54 | ||
4 | [compat.c dh.c] | ||
5 | compat.c | ||
6 | |||
1 | 20020305 | 7 | 20020305 |
2 | - stevesk@cvs.openbsd.org 2002/03/02 09:34:42 | 8 | - stevesk@cvs.openbsd.org 2002/03/02 09:34:42 |
3 | [LICENCE] | 9 | [LICENCE] |
@@ -7798,4 +7804,4 @@ | |||
7798 | - Wrote replacements for strlcpy and mkdtemp | 7804 | - Wrote replacements for strlcpy and mkdtemp |
7799 | - Released 1.0pre1 | 7805 | - Released 1.0pre1 |
7800 | 7806 | ||
7801 | $Id: ChangeLog,v 1.1908 2002/03/05 18:03:10 stevesk Exp $ | 7807 | $Id: ChangeLog,v 1.1909 2002/03/07 01:58:24 djm Exp $ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: compat.c,v 1.58 2002/01/21 22:30:12 markus Exp $"); | 26 | RCSID("$OpenBSD: compat.c,v 1.59 2002/03/06 00:20:54 markus Exp $"); |
27 | 27 | ||
28 | #include "buffer.h" | 28 | #include "buffer.h" |
29 | #include "packet.h" | 29 | #include "packet.h" |
@@ -73,8 +73,8 @@ compat_datafellows(const char *version) | |||
73 | { "OpenSSH_2.5.0*," | 73 | { "OpenSSH_2.5.0*," |
74 | "OpenSSH_2.5.1*," | 74 | "OpenSSH_2.5.1*," |
75 | "OpenSSH_2.5.2*", SSH_OLD_DHGEX|SSH_BUG_NOREKEY }, | 75 | "OpenSSH_2.5.2*", SSH_OLD_DHGEX|SSH_BUG_NOREKEY }, |
76 | { "OpenSSH_2.5.3*", | 76 | { "OpenSSH_2.5.3*", SSH_BUG_NOREKEY }, |
77 | SSH_BUG_NOREKEY }, | 77 | { "Sun_SSH_1.0*", SSH_BUG_NOREKEY }, |
78 | { "OpenSSH*", 0 }, | 78 | { "OpenSSH*", 0 }, |
79 | { "*MindTerm*", 0 }, | 79 | { "*MindTerm*", 0 }, |
80 | { "2.1.0*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| | 80 | { "2.1.0*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| |
@@ -23,13 +23,14 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: dh.c,v 1.19 2001/12/27 19:37:22 markus Exp $"); | 26 | RCSID("$OpenBSD: dh.c,v 1.20 2002/03/06 00:20:54 markus Exp $"); |
27 | 27 | ||
28 | #include "xmalloc.h" | 28 | #include "xmalloc.h" |
29 | 29 | ||
30 | #include <openssl/bn.h> | 30 | #include <openssl/bn.h> |
31 | #include <openssl/dh.h> | 31 | #include <openssl/dh.h> |
32 | #include <openssl/evp.h> | 32 | #include <openssl/evp.h> |
33 | #include <openssl/err.h> | ||
33 | 34 | ||
34 | #include "buffer.h" | 35 | #include "buffer.h" |
35 | #include "cipher.h" | 36 | #include "cipher.h" |
@@ -207,8 +208,10 @@ dh_gen_key(DH *dh, int need) | |||
207 | if ((dh->priv_key = BN_new()) == NULL) | 208 | if ((dh->priv_key = BN_new()) == NULL) |
208 | fatal("dh_gen_key: BN_new failed"); | 209 | fatal("dh_gen_key: BN_new failed"); |
209 | /* generate a 2*need bits random private exponent */ | 210 | /* generate a 2*need bits random private exponent */ |
210 | if (!BN_rand(dh->priv_key, 2*need, 0, 0)) | 211 | if (!BN_rand(dh->priv_key, 2*need, 0, 0)) { |
211 | fatal("dh_gen_key: BN_rand failed"); | 212 | int ecode = ERR_get_error(); |
213 | fatal("dh_gen_key: BN_rand failed: %s", ERR_error_string(ecode, NULL)); | ||
214 | } | ||
212 | if (DH_generate_key(dh) == 0) | 215 | if (DH_generate_key(dh) == 0) |
213 | fatal("DH_generate_key"); | 216 | fatal("DH_generate_key"); |
214 | for (i = 0; i <= BN_num_bits(dh->priv_key); i++) | 217 | for (i = 0; i <= BN_num_bits(dh->priv_key); i++) |