From 731d3ec3012f125131d5c992394af17c5ff9e9e3 Mon Sep 17 00:00:00 2001 From: Kazuki Yamaguchi Date: Sun, 9 Jun 2024 20:56:43 +0900 Subject: [PATCH] [ruby/openssl] ossl.c: use OPENSSL_init_ssl() and OpenSSL_version() with LibreSSL LibreSSL 2.7.0 added support for OPENSSL_init_ssl() and OpenSSL_version(). https://github.com/ruby/openssl/commit/1328415097 --- ext/openssl/ossl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c index 1eb0f95fdb..a9bfc6bdcb 100644 --- a/ext/openssl/ossl.c +++ b/ext/openssl/ossl.c @@ -1050,7 +1050,7 @@ Init_openssl(void) /* * Init all digests, ciphers */ -#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000 +#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_IS_LIBRESSL if (!OPENSSL_init_ssl(0, NULL)) rb_raise(rb_eRuntimeError, "OPENSSL_init_ssl"); #else @@ -1075,7 +1075,7 @@ Init_openssl(void) /* * Version of OpenSSL the ruby OpenSSL extension is running with */ -#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000 +#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_IS_LIBRESSL rb_define_const(mOSSL, "OPENSSL_LIBRARY_VERSION", rb_str_new2(OpenSSL_version(OPENSSL_VERSION))); #else rb_define_const(mOSSL, "OPENSSL_LIBRARY_VERSION", rb_str_new2(SSLeay_version(SSLEAY_VERSION)));