diff options
| author |   markus <markus@openbsd.org> | 2002-03-06 00:23:27 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2002-03-06 00:23:27 +0000 |
| commit | b89e752c86a72a3d867d2cb9f2aac6b057bbdada (patch) | |
| tree | ff256b872b1aa4f307dd97c5b756e878041c724a | |
| parent | compat.c (diff) | |
| download | wireguard-openbsd-b89e752c86a72a3d867d2cb9f2aac6b057bbdada.tar.xz wireguard-openbsd-b89e752c86a72a3d867d2cb9f2aac6b057bbdada.zip | |
undo
| -rw-r--r-- | usr.bin/ssh/Makefile.inc | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/compat.c | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/dh.c | 9 |
3 files changed, 8 insertions, 11 deletions
diff --git a/usr.bin/ssh/Makefile.inc b/usr.bin/ssh/Makefile.inc index 68fef921fac..c68f59a74e9 100644 --- a/usr.bin/ssh/Makefile.inc +++ b/usr.bin/ssh/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.22 2002/03/06 00:20:54 markus Exp $ +# $OpenBSD: Makefile.inc,v 1.23 2002/03/06 00:23:27 markus Exp $ CFLAGS+= -I${.CURDIR}/.. @@ -10,7 +10,7 @@ CDIAGFLAGS+= -Wno-uninitialized CDIAGFLAGS+= -Wmissing-prototypes CDIAGFLAGS+= -Wunused -DEBUG=-g +#DEBUG=-g #CFLAGS+= -DSMARTCARD #LDADD+= -lsectok diff --git a/usr.bin/ssh/compat.c b/usr.bin/ssh/compat.c index 0b3aa68c32a..906547079bb 100644 --- a/usr.bin/ssh/compat.c +++ b/usr.bin/ssh/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/usr.bin/ssh/dh.c b/usr.bin/ssh/dh.c index e691125e0a8..33187e02824 100644 --- a/usr.bin/ssh/dh.c +++ b/usr.bin/ssh/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++) |