diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-11-27 18:54:28 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-11-27 18:54:28 +0000 |
| commit | 0f4216298fbd9a1fdcf978967ac04df76f6283d0 (patch) | |
| tree | 14993080d3fb3d8ce7d8771f05c18027f571be0f | |
| parent | 461add8adf697a59e390dc4e07ae414939bb8abd (diff) | |
| download | php-git-0f4216298fbd9a1fdcf978967ac04df76f6283d0.tar.gz | |
Clean up and fix php_openssl_dh_pub_from_priv
| -rw-r--r-- | ext/openssl/openssl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 7e8d649659..1ebbe99c4e 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -4092,7 +4092,7 @@ zend_bool php_openssl_pkey_init_dsa(DSA *dsa, zval *data) /* }}} */ /* {{{ php_openssl_dh_pub_from_priv */ -static BIGNUM *php_openssl_dh_pub_from_priv(DH *dh, BIGNUM *priv_key, BIGNUM *g, BIGNUM *p) +static BIGNUM *php_openssl_dh_pub_from_priv(BIGNUM *priv_key, BIGNUM *g, BIGNUM *p) { BIGNUM *pub_key, *priv_key_const_time; BN_CTX *ctx; @@ -4110,7 +4110,7 @@ static BIGNUM *php_openssl_dh_pub_from_priv(DH *dh, BIGNUM *priv_key, BIGNUM *g, return NULL; } ctx = BN_CTX_new(); - if (priv_key_const_time == NULL) { + if (ctx == NULL) { BN_free(pub_key); BN_free(priv_key_const_time); php_openssl_store_errors(); @@ -4150,7 +4150,7 @@ zend_bool php_openssl_pkey_init_dh(DH *dh, zval *data) return DH_set0_key(dh, pub_key, priv_key); } if (priv_key) { - pub_key = php_openssl_dh_pub_from_priv(dh, priv_key, g, p); + pub_key = php_openssl_dh_pub_from_priv(priv_key, g, p); if (pub_key == NULL) { return 0; } |