diff options
| author | Jakub Zelenka <bukka@php.net> | 2020-10-10 21:02:26 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2020-11-01 20:10:37 +0000 |
| commit | c3a6debc08ebdc1cc336eb2d13aae1988ccbe688 (patch) | |
| tree | d46d45cfd116c843c268a6ce586a1119c6a2917d /ext/openssl/openssl.c | |
| parent | 347a3f8736dabd0e2862ac5f673eab7650b0286e (diff) | |
| download | php-git-c3a6debc08ebdc1cc336eb2d13aae1988ccbe688.tar.gz | |
Bump minimal OpenSSL version to 1.0.2
Diffstat (limited to 'ext/openssl/openssl.c')
| -rw-r--r-- | ext/openssl/openssl.c | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 18c822ed67..113d0c2ec4 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -1149,13 +1149,6 @@ PHP_MINIT_FUNCTION(openssl) OpenSSL_add_all_ciphers(); OpenSSL_add_all_digests(); OpenSSL_add_all_algorithms(); - -#if !defined(OPENSSL_NO_AES) && defined(EVP_CIPH_CCM_MODE) && OPENSSL_VERSION_NUMBER < 0x100020000 - EVP_add_cipher(EVP_aes_128_ccm()); - EVP_add_cipher(EVP_aes_192_ccm()); - EVP_add_cipher(EVP_aes_256_ccm()); -#endif - SSL_load_error_strings(); #else OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL); @@ -3671,26 +3664,18 @@ static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request * req case OPENSSL_KEYTYPE_RSA: { RSA* rsaparam; -#if OPENSSL_VERSION_NUMBER < 0x10002000L - /* OpenSSL 1.0.2 deprecates RSA_generate_key */ - PHP_OPENSSL_RAND_ADD_TIME(); - rsaparam = (RSA*)RSA_generate_key(req->priv_key_bits, RSA_F4, NULL, NULL); -#else - { - BIGNUM *bne = (BIGNUM *)BN_new(); - if (BN_set_word(bne, RSA_F4) != 1) { - BN_free(bne); - php_error_docref(NULL, E_WARNING, "Failed setting exponent"); - return NULL; - } - rsaparam = RSA_new(); - PHP_OPENSSL_RAND_ADD_TIME(); - if (rsaparam == NULL || !RSA_generate_key_ex(rsaparam, req->priv_key_bits, bne, NULL)) { - php_openssl_store_errors(); - } + BIGNUM *bne = (BIGNUM *)BN_new(); + if (BN_set_word(bne, RSA_F4) != 1) { BN_free(bne); + php_error_docref(NULL, E_WARNING, "Failed setting exponent"); + return NULL; } -#endif + rsaparam = RSA_new(); + PHP_OPENSSL_RAND_ADD_TIME(); + if (rsaparam == NULL || !RSA_generate_key_ex(rsaparam, req->priv_key_bits, bne, NULL)) { + php_openssl_store_errors(); + } + BN_free(bne); if (rsaparam && EVP_PKEY_assign_RSA(req->priv_key, rsaparam)) { return_val = req->priv_key; } else { |