Skip to content

Commit d4c5afb

Browse files
committed
ts: use TS_VERIFY_CTX_set_certs instead of TS_VERIFY_CTS_set_certs
OpenSSL 3.0 fixed the typo in the function name and replaced the current 'CTS' version with a macro.
1 parent d436868 commit d4c5afb

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

ext/openssl/extconf.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def find_openssl_library
160160
have_func("TS_STATUS_INFO_get0_status")
161161
have_func("TS_STATUS_INFO_get0_text")
162162
have_func("TS_STATUS_INFO_get0_failure_info")
163-
have_func("TS_VERIFY_CTS_set_certs")
163+
have_func("TS_VERIFY_CTS_set_certs(NULL, NULL)", "openssl/ts.h")
164164
have_func("TS_VERIFY_CTX_set_store")
165165
have_func("TS_VERIFY_CTX_add_flags")
166166
have_func("TS_RESP_CTX_set_time_cb")
@@ -173,6 +173,7 @@ def find_openssl_library
173173
# added in 3.0.0
174174
have_func("SSL_set0_tmp_dh_pkey")
175175
have_func("ERR_get_error_all")
176+
have_func("TS_VERIFY_CTX_set_certs(NULL, NULL)", "openssl/ts.h")
176177

177178
Logging::message "=== Checking done. ===\n"
178179

ext/openssl/openssl_missing.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,4 +214,9 @@ IMPL_PKEY_GETTER(EC_KEY, ec)
214214
} while (0)
215215
#endif
216216

217+
/* added in 3.0.0 */
218+
#if !defined(HAVE_TS_VERIFY_CTX_SET_CERTS)
219+
# define TS_VERIFY_CTX_set_certs(ctx, crts) TS_VERIFY_CTS_set_certs(ctx, crts)
220+
#endif
221+
217222
#endif /* _OSSL_OPENSSL_MISSING_H_ */

ext/openssl/ossl_ts.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ ossl_ts_resp_verify(int argc, VALUE *argv, VALUE self)
826826
X509_up_ref(cert);
827827
}
828828

829-
TS_VERIFY_CTS_set_certs(ctx, x509inter);
829+
TS_VERIFY_CTX_set_certs(ctx, x509inter);
830830
TS_VERIFY_CTX_add_flags(ctx, TS_VFY_SIGNATURE);
831831
TS_VERIFY_CTX_set_store(ctx, x509st);
832832

0 commit comments

Comments
 (0)