Merge branch 'PHP-7.1'

ksmiley · Aug 14, 2016 · f13fd9e · f13fd9e
2 parents 42906d3 + 427c8c8
commit f13fd9e
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
@@ -4059,11 +4059,8 @@ zend_bool php_openssl_pkey_init_dsa(DSA *dsa, zval *data)
 
 	OPENSSL_PKEY_SET_BN(data, pub_key);
 	OPENSSL_PKEY_SET_BN(data, priv_key);
-	if (priv_key || pub_key) {
-		return 1;
-	}
-	if (!DSA_set0_key(dsa, pub_key, priv_key)) {
-		return 0;
+	if (pub_key) {
+		return DSA_set0_key(dsa, pub_key, priv_key);
 	}
 
 	/* generate key */
@@ -4098,11 +4095,8 @@ zend_bool php_openssl_pkey_init_dh(DH *dh, zval *data)
 
 	OPENSSL_PKEY_SET_BN(data, priv_key);
 	OPENSSL_PKEY_SET_BN(data, pub_key);
-	if (priv_key || pub_key) {
-		return 1;
-	}
-	if (!DH_set0_key(dh, pub_key, priv_key)) {
-		return 0;
+	if (pub_key) {
+		return DH_set0_key(dh, pub_key, priv_key);
 	}
 
 	/* generate key */