diff options
| author | Kazuki Yamaguchi <[email protected]> | 2025-01-14 21:49:12 +0900 |
|---|---|---|
| committer | git <[email protected]> | 2025-01-20 17:12:57 +0000 |
| commit | 441862dc9f11d83e9e35c3b965fe84e42e178a35 (patch) | |
| tree | 1f38daba4a711c0c88442ff82aca19ff6539fc95 /ext/openssl/ossl_pkcs12.c | |
| parent | 010e8bff88b50a1c43515e3aa16030ec7a2b90c3 (diff) | |
[ruby/openssl] Require OpenSSL 1.1.0 or later
Drop support for OpenSSL 1.0.2. It has reached upstream EOL in 2019-12.
Most distributions that shipped with OpenSSL 1.0.2 have also reached
EOL, or provide a newer version in the package repository:
- RHEL 7 (EOL 2024-06)
- Ubuntu 16.04 LTS (EOL 2021-04)
- Amazon Linux 2 (EOL 2026-06, but OpenSSL 1.1.1 can be installed via
the openssl11{,-devel} package)
https://github.com/ruby/openssl/commit/38ec6fd50e
Diffstat (limited to 'ext/openssl/ossl_pkcs12.c')
| -rw-r--r-- | ext/openssl/ossl_pkcs12.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ext/openssl/ossl_pkcs12.c b/ext/openssl/ossl_pkcs12.c index bda90aec3e..2466b5565f 100644 --- a/ext/openssl/ossl_pkcs12.c +++ b/ext/openssl/ossl_pkcs12.c @@ -201,12 +201,8 @@ ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self) BIO_free(in); pkey = cert = ca = Qnil; - /* OpenSSL's bug; PKCS12_parse() puts errors even if it succeeds. - * Fixed in OpenSSL 1.0.0t, 1.0.1p, 1.0.2d */ - ERR_set_mark(); if(!PKCS12_parse(pkcs, passphrase, &key, &x509, &x509s)) ossl_raise(ePKCS12Error, "PKCS12_parse"); - ERR_pop_to_mark(); if (key) { pkey = rb_protect(ossl_pkey_new_i, (VALUE)key, &st); if (st) goto err; |