kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[ruby/openssl] ts: use TS_VERIFY_CTX_set_certs instead of TS_VERIFY_CTS_set_certs

Browse source 
OpenSSL 3.0 fixed the typo in the function name and replaced the
current 'CTS' version with a macro.

https://github.com/ruby/openssl/commit/2be6779b08
This commit is contained in:
Kazuki Yamaguchi 2020-02-22 05:37:01 +09:00
parent 3d16401508
commit 19ef7082ba
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ext/openssl/extconf.rb
View file

@ -160,7 +160,7 @@ have_func("SSL_SESSION_get_protocol_version")
have_func("TS_STATUS_INFO_get0_status") have_func("TS_STATUS_INFO_get0_status")
have_func("TS_STATUS_INFO_get0_text") have_func("TS_STATUS_INFO_get0_text")
have_func("TS_STATUS_INFO_get0_failure_info") have_func("TS_STATUS_INFO_get0_failure_info")
have_func("TS_VERIFY_CTS_set_certs") have_func("TS_VERIFY_CTS_set_certs(NULL, NULL)", "openssl/ts.h")
have_func("TS_VERIFY_CTX_set_store") have_func("TS_VERIFY_CTX_set_store")
have_func("TS_VERIFY_CTX_add_flags") have_func("TS_VERIFY_CTX_add_flags")
have_func("TS_RESP_CTX_set_time_cb") have_func("TS_RESP_CTX_set_time_cb")
@ -173,6 +173,7 @@ have_func("EVP_PKEY_check")
# added in 3.0.0 # added in 3.0.0
have_func("SSL_set0_tmp_dh_pkey") have_func("SSL_set0_tmp_dh_pkey")
have_func("ERR_get_error_all") have_func("ERR_get_error_all")
have_func("TS_VERIFY_CTX_set_certs(NULL, NULL)", "openssl/ts.h")
Logging::message "=== Checking done. ===\n" Logging::message "=== Checking done. ===\n"

5
ext/openssl/openssl_missing.h
View file

@ -214,4 +214,9 @@ IMPL_PKEY_GETTER(EC_KEY, ec)
} while (0) } while (0)
#endif #endif
/* added in 3.0.0 */
#if !defined(HAVE_TS_VERIFY_CTX_SET_CERTS)
# define TS_VERIFY_CTX_set_certs(ctx, crts) TS_VERIFY_CTS_set_certs(ctx, crts)
#endif
#endif /* _OSSL_OPENSSL_MISSING_H_ */ #endif /* _OSSL_OPENSSL_MISSING_H_ */

2
ext/openssl/ossl_ts.c
View file

@ -826,7 +826,7 @@ ossl_ts_resp_verify(int argc, VALUE *argv, VALUE self)
X509_up_ref(cert); X509_up_ref(cert);
} }
TS_VERIFY_CTS_set_certs(ctx, x509inter); TS_VERIFY_CTX_set_certs(ctx, x509inter);
TS_VERIFY_CTX_add_flags(ctx, TS_VFY_SIGNATURE); TS_VERIFY_CTX_add_flags(ctx, TS_VFY_SIGNATURE);
TS_VERIFY_CTX_set_store(ctx, x509st); TS_VERIFY_CTX_set_store(ctx, x509st);