[前][次][番号順一覧][スレッド一覧]

ruby-changes:72473

From: Jeremy <ko1@a...>
Date: Sat, 9 Jul 2022 00:31:56 +0900 (JST)
Subject: [ruby-changes:72473] aee36dd788 (master): [ruby/openssl] Fix build with LibreSSL 3.5

https://git.ruby-lang.org/ruby.git/commit/?id=aee36dd788

From aee36dd7880316a647ac2b3da98c2c1a14bf41c6 Mon Sep 17 00:00:00 2001
From: Jeremy Evans <code@j...>
Date: Fri, 25 Mar 2022 13:11:31 -0700
Subject: [ruby/openssl] Fix build with LibreSSL 3.5

https://github.com/ruby/openssl/commit/e25fb0d0d8
---
 ext/openssl/ossl_pkey.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
index 2a4835a28d..24d0da4683 100644
--- a/ext/openssl/ossl_pkey.c
+++ b/ext/openssl/ossl_pkey.c
@@ -670,7 +670,7 @@ ossl_pkey_export_traditional(int argc, VALUE *argv, VALUE self, int to_der) https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_pkey.c#L670
 	}
     }
     else {
-#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
+#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_LIBRESSL_PREREQ(3, 5, 0)
 	if (!PEM_write_bio_PrivateKey_traditional(bio, pkey, enc, NULL, 0,
 						  ossl_pem_passwd_cb,
 						  (void *)pass)) {
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]