diff options
| author | Damien Miller <djm@mindrot.org> | 2007-10-26 06:25:55 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2007-10-26 06:25:55 +0200 |
| commit | 603077ab4c2446d19784e84590ae13c58f9d5032 (patch) | |
| tree | 19939ad659c005f15244f3cd81178ff744bd5a4c /dh.c | |
| parent | - canacar@cvs.openbsd.org 2007/09/25 23:48:57 (diff) | |
| download | openssh-603077ab4c2446d19784e84590ae13c58f9d5032.tar.xz openssh-603077ab4c2446d19784e84590ae13c58f9d5032.zip | |
- ray@cvs.openbsd.org 2007/09/27 00:15:57
[dh.c]
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 'dh.c')
| -rw-r--r-- | dh.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -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. * @@ -185,7 +185,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 */ @@ -193,8 +193,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); |