diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-11-01 17:25:27 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-11-01 19:15:48 +0100 |
| commit | 34defbb784e2eb44a6e1560dd98f77ab44214b86 (patch) | |
| tree | 99889568fb32c624f0144410ccd7c4c0f22fc977 | |
| parent | f19950fea0ecf77a4d218075c8fcaefa3d986ac5 (diff) | |
| download | php-git-34defbb784e2eb44a6e1560dd98f77ab44214b86.tar.gz | |
Accept int parameter in the first place
This is more liberal then before, where that parameter (if given) had
to be IS_LONG, while now it would be converted to int according to weak
typing rules. This is, however, more what a developer would expect.
| -rw-r--r-- | ext/openssl/openssl.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 94335fadf9..9f59546650 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -1507,13 +1507,12 @@ PHP_FUNCTION(openssl_spki_new) const char *spkac = "SPKAC="; zend_long algo = OPENSSL_ALGO_MD5; - zval *method = NULL; zval * zpkey = NULL; EVP_PKEY * pkey = NULL; NETSCAPE_SPKI *spki=NULL; const EVP_MD *mdtype; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs|z", &zpkey, &challenge, &challenge_len, &method) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs|l", &zpkey, &challenge, &challenge_len, &algo) == FAILURE) { return; } RETVAL_FALSE; @@ -1528,14 +1527,6 @@ PHP_FUNCTION(openssl_spki_new) goto cleanup; } - if (method != NULL) { - if (Z_TYPE_P(method) == IS_LONG) { - algo = Z_LVAL_P(method); - } else { - php_error_docref(NULL, E_WARNING, "Algorithm must be of supported type"); - goto cleanup; - } - } mdtype = php_openssl_get_evp_md_from_algo(algo); if (!mdtype) { |