summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-03-07 12:58:42 +1100
committerDamien Miller <djm@mindrot.org>2002-03-07 12:58:42 +1100
commit6d6c5d202f28608c4962c9c50b394b2a37fc1343 (patch)
treeae1a8572ed66601421eb8dde2f1270d794206c13
parent6ba693f70e3f5b69b5b8a9b43bf4323c601cc097 (diff)
- markus@cvs.openbsd.org 2002/03/06 00:23:27
[compat.c dh.c] undo
-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 fb1a0dd3..b65e663a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
- markus@cvs.openbsd.org 2002/03/06 00:20:54
[compat.c dh.c]
compat.c
+ - markus@cvs.openbsd.org 2002/03/06 00:23:27
+ [compat.c dh.c]
+ undo
20020305
- stevesk@cvs.openbsd.org 2002/03/02 09:34:42
@@ -7804,4 +7807,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1909 2002/03/07 01:58:24 djm Exp $
+$Id: ChangeLog,v 1.1910 2002/03/07 01:58:42 djm Exp $
diff --git a/compat.c b/compat.c
index 0b3aa68c..90654707 100644
--- a/compat.c
+++ b/compat.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.59 2002/03/06 00:20:54 markus Exp $");
+RCSID("$OpenBSD: compat.c,v 1.60 2002/03/06 00:23:27 markus Exp $");
#include "buffer.h"
#include "packet.h"
@@ -73,8 +73,8 @@ compat_datafellows(const char *version)
{ "OpenSSH_2.5.0*,"
"OpenSSH_2.5.1*,"
"OpenSSH_2.5.2*", SSH_OLD_DHGEX|SSH_BUG_NOREKEY },
- { "OpenSSH_2.5.3*", SSH_BUG_NOREKEY },
- { "Sun_SSH_1.0*", SSH_BUG_NOREKEY },
+ { "OpenSSH_2.5.3*",
+ SSH_BUG_NOREKEY },
{ "OpenSSH*", 0 },
{ "*MindTerm*", 0 },
{ "2.1.0*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
diff --git a/dh.c b/dh.c
index e691125e..33187e02 100644
--- a/dh.c
+++ b/dh.c
@@ -23,14 +23,13 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: dh.c,v 1.20 2002/03/06 00:20:54 markus Exp $");
+RCSID("$OpenBSD: dh.c,v 1.21 2002/03/06 00:23:27 markus Exp $");
#include "xmalloc.h"
#include <openssl/bn.h>
#include <openssl/dh.h>
#include <openssl/evp.h>
-#include <openssl/err.h>
#include "buffer.h"
#include "cipher.h"
@@ -208,10 +207,8 @@ dh_gen_key(DH *dh, int need)
if ((dh->priv_key = BN_new()) == NULL)
fatal("dh_gen_key: BN_new failed");
/* generate a 2*need bits random private exponent */
- if (!BN_rand(dh->priv_key, 2*need, 0, 0)) {
- int ecode = ERR_get_error();
- fatal("dh_gen_key: BN_rand failed: %s", ERR_error_string(ecode, NULL));
- }
+ if (!BN_rand(dh->priv_key, 2*need, 0, 0))
+ fatal("dh_gen_key: BN_rand failed");
if (DH_generate_key(dh) == 0)
fatal("DH_generate_key");
for (i = 0; i <= BN_num_bits(dh->priv_key); i++)