diff options
| author | Ray Lai <ray@cvs.openbsd.org> | 2007-09-27 00:15:58 +0000 |
|---|---|---|
| committer | Ray Lai <ray@cvs.openbsd.org> | 2007-09-27 00:15:58 +0000 |
| commit | 726353f05375b677d96353913fd6edd8ea3e64f8 (patch) | |
| tree | 418a15e5abb8ba4e7adb57fed6434564b90a2683 /usr.bin | |
| parent | a09504c7eae6630e3c39e10696acd53c62b59e75 (diff) | |
Don't return -1 on error in dh_pub_is_valid(), since it evaluates
to true.
Also fix a typo.
Initial diff from Matthew Dempsky, input from djm.
OK djm, markus.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/dh.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/ssh/dh.c b/usr.bin/ssh/dh.c index 1ab5682c55a..c658f745ef0 100644 --- a/usr.bin/ssh/dh.c +++ b/usr.bin/ssh/dh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh.c,v 1.44 2006/11/07 13:02:07 markus Exp $ */ +/* $OpenBSD: dh.c,v 1.45 2007/09/27 00:15:57 ray Exp $ */ /* * Copyright (c) 2000 Niels Provos. All rights reserved. * @@ -182,7 +182,7 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub) BIGNUM *tmp; if (dh_pub->neg) { - logit("invalid public DH value: negativ"); + logit("invalid public DH value: negative"); return 0; } if (BN_cmp(dh_pub, BN_value_one()) != 1) { /* pub_exp <= 1 */ @@ -190,8 +190,10 @@ dh_pub_is_valid(DH *dh, BIGNUM *dh_pub) return 0; } - if ((tmp = BN_new()) == NULL) - return (-1); + if ((tmp = BN_new()) == NULL) { + error("%s: BN_new failed", __func__); + return 0; + } if (!BN_sub(tmp, dh->p, BN_value_one()) || BN_cmp(dh_pub, tmp) != -1) { /* pub_exp > p-2 */ BN_clear_free(tmp); |