summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--compat.c6
-rw-r--r--dh.c9
3 files changed, 10 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index fb1a0dd3e..b65e663a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
3 - markus@cvs.openbsd.org 2002/03/06 00:20:54 3 - markus@cvs.openbsd.org 2002/03/06 00:20:54
4 [compat.c dh.c] 4 [compat.c dh.c]
5 compat.c 5 compat.c
6 - markus@cvs.openbsd.org 2002/03/06 00:23:27
7 [compat.c dh.c]
8 undo
6 9
720020305 1020020305
8 - stevesk@cvs.openbsd.org 2002/03/02 09:34:42 11 - stevesk@cvs.openbsd.org 2002/03/02 09:34:42
@@ -7804,4 +7807,4 @@
7804 - Wrote replacements for strlcpy and mkdtemp 7807 - Wrote replacements for strlcpy and mkdtemp
7805 - Released 1.0pre1 7808 - Released 1.0pre1
7806 7809
7807$Id: ChangeLog,v 1.1909 2002/03/07 01:58:24 djm Exp $ 7810$Id: ChangeLog,v 1.1910 2002/03/07 01:58:42 djm Exp $
diff --git a/compat.c b/compat.c
index 0b3aa68c3..906547079 100644
--- a/compat.c
+++ b/compat.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: compat.c,v 1.59 2002/03/06 00:20:54 markus Exp $"); 26RCSID("$OpenBSD: compat.c,v 1.60 2002/03/06 00:23:27 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*", SSH_BUG_NOREKEY }, 76 { "OpenSSH_2.5.3*",
77 { "Sun_SSH_1.0*", SSH_BUG_NOREKEY }, 77 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|
diff --git a/dh.c b/dh.c
index e691125e0..33187e028 100644
--- a/dh.c
+++ b/dh.c
@@ -23,14 +23,13 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: dh.c,v 1.20 2002/03/06 00:20:54 markus Exp $"); 26RCSID("$OpenBSD: dh.c,v 1.21 2002/03/06 00:23:27 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>
34 33
35#include "buffer.h" 34#include "buffer.h"
36#include "cipher.h" 35#include "cipher.h"
@@ -208,10 +207,8 @@ dh_gen_key(DH *dh, int need)
208 if ((dh->priv_key = BN_new()) == NULL) 207 if ((dh->priv_key = BN_new()) == NULL)
209 fatal("dh_gen_key: BN_new failed"); 208 fatal("dh_gen_key: BN_new failed");
210 /* generate a 2*need bits random private exponent */ 209 /* generate a 2*need bits random private exponent */
211 if (!BN_rand(dh->priv_key, 2*need, 0, 0)) { 210 if (!BN_rand(dh->priv_key, 2*need, 0, 0))
212 int ecode = ERR_get_error(); 211 fatal("dh_gen_key: BN_rand failed");
213 fatal("dh_gen_key: BN_rand failed: %s", ERR_error_string(ecode, NULL));
214 }
215 if (DH_generate_key(dh) == 0) 212 if (DH_generate_key(dh) == 0)
216 fatal("DH_generate_key"); 213 fatal("DH_generate_key");
217 for (i = 0; i <= BN_num_bits(dh->priv_key); i++) 214 for (i = 0; i <= BN_num_bits(dh->priv_key); i++)