From 66cfd2f5d49458fe9a3bb27319840e5bd209a81e Mon Sep 17 00:00:00 2001
From: tb <>
Date: Wed, 2 May 2018 15:48:38 +0000
Subject: Remove incorrect NULL checks in DH_set0_key(). Reported by Ondřej
Surý, LibreSSL-portable issue #92.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
ok inoguchi, jsing
---
src/lib/libcrypto/dh/dh_lib.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
(limited to 'src/lib')
diff --git a/src/lib/libcrypto/dh/dh_lib.c b/src/lib/libcrypto/dh/dh_lib.c
index 8a7f9386c7..446bc65aa2 100644
--- a/src/lib/libcrypto/dh/dh_lib.c
+++ b/src/lib/libcrypto/dh/dh_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_lib.c,v 1.31 2018/04/14 07:09:21 tb Exp $ */
+/* $OpenBSD: dh_lib.c,v 1.32 2018/05/02 15:48:38 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -294,10 +294,6 @@ DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key)
int
DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key)
{
- if ((dh->pub_key == NULL && pub_key == NULL) ||
- (dh->priv_key == NULL && priv_key == NULL))
- return 0;
-
if (pub_key != NULL) {
BN_free(dh->pub_key);
dh->pub_key = pub_key;
--
cgit v1.2.3-55-g6feb