summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdgar Pek <edgar.pek@gmail.com>2015-02-21 14:56:41 +0100
committerKurt Roeckx <kurt@roeckx.be>2015-02-22 13:27:20 +0100
commite347d80287f18fce0db4571d5ee7285f1b14b82b (patch)
tree7287d32964ca894b6e8181a5a984289958bd9d08
parent9e7a5464d74917d9eb22305d3505895678b5b3c5 (diff)
downloadopenssl-new-e347d80287f18fce0db4571d5ee7285f1b14b82b.tar.gz
Fix null-pointer dereference
Signed-off-by: Kurt Roeckx <kurt@roeckx.be> Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit bcfa19a8d19506c26b5f8d9d9934ca2aa5f96b43)
-rw-r--r--engines/e_ubsec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/e_ubsec.c b/engines/e_ubsec.c
index 2d6331d690..6f09ffb965 100644
--- a/engines/e_ubsec.c
+++ b/engines/e_ubsec.c
@@ -967,11 +967,11 @@ static int ubsec_dh_generate_key(DH *dh)
if (dh->pub_key == NULL) {
pub_key = BN_new();
+ if (pub_key == NULL)
+ goto err;
pub_key_len = BN_num_bits(dh->p);
if (bn_wexpand(pub_key, dh->p->top) == NULL)
goto err;
- if (pub_key == NULL)
- goto err;
} else {
pub_key = dh->pub_key;
}