Merge pull request #1112 from luke-gruber/ssl_context_thread_safe_free

Make ossl_sslctx_type RUBY_TYPED_THREAD_SAFE_FREE

Author: rhenium

ext/openssl/ossl.h

@@ -22,6 +22,9 @@
 #else
 #define RUBY_TYPED_FROZEN_SHAREABLE 0
 #endif
+#if !defined(RUBY_TYPED_THREAD_SAFE_FREE)
+#define RUBY_TYPED_THREAD_SAFE_FREE RUBY_TYPED_FREE_IMMEDIATELY
+#endif
 
 #include <openssl/opensslv.h>
 

ext/openssl/ossl_bn.c

@@ -37,7 +37,7 @@ static const rb_data_type_t ossl_bn_type = {
     {
         0, ossl_bn_free,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FROZEN_SHAREABLE,
+    0, 0, RUBY_TYPED_THREAD_SAFE_FREE | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 /*

ext/openssl/ossl_cipher.c

@@ -40,7 +40,7 @@ static const rb_data_type_t ossl_cipher_type = {
     {
         0, ossl_cipher_free,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+    0, 0, RUBY_TYPED_THREAD_SAFE_FREE | RUBY_TYPED_WB_PROTECTED,
 };
 
 #ifdef OSSL_USE_PROVIDER
@@ -57,7 +57,7 @@ static const rb_data_type_t ossl_evp_cipher_holder_type = {
     {
         .dfree = ossl_evp_cipher_free,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+    0, 0, RUBY_TYPED_THREAD_SAFE_FREE | RUBY_TYPED_WB_PROTECTED,
 };
 #endif
 

ext/openssl/ossl_config.c

@@ -22,7 +22,7 @@ static const rb_data_type_t ossl_config_type = {
     {
         0, nconf_free,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FROZEN_SHAREABLE,
+    0, 0, RUBY_TYPED_THREAD_SAFE_FREE | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 CONF *

ext/openssl/ossl_digest.c

@@ -36,7 +36,7 @@ static const rb_data_type_t ossl_digest_type = {
     {
         0, ossl_digest_free,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+    0, 0, RUBY_TYPED_THREAD_SAFE_FREE | RUBY_TYPED_WB_PROTECTED,
 };
 
 #ifdef OSSL_USE_PROVIDER
@@ -53,7 +53,7 @@ static const rb_data_type_t ossl_evp_md_holder_type = {
     {
         .dfree = ossl_evp_md_free,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+    0, 0, RUBY_TYPED_THREAD_SAFE_FREE | RUBY_TYPED_WB_PROTECTED,
 };
 #endif
 

ext/openssl/ossl_engine.c

@@ -68,7 +68,7 @@ static const rb_data_type_t ossl_engine_type = {
     {
         0, ossl_engine_free,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+    0, 0, RUBY_TYPED_THREAD_SAFE_FREE | RUBY_TYPED_WB_PROTECTED,
 };
 
 /*

ext/openssl/ossl_hmac.c

@@ -43,7 +43,7 @@ static const rb_data_type_t ossl_hmac_type = {
     {
         0, ossl_hmac_free,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+    0, 0, RUBY_TYPED_THREAD_SAFE_FREE | RUBY_TYPED_WB_PROTECTED,
 };
 
 static VALUE

ext/openssl/ossl_hpke.c

@@ -78,7 +78,7 @@ static const rb_data_type_t ossl_hpke_ctx_type = {
     {
         0, ossl_hpke_ctx_free,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+    0, 0, RUBY_TYPED_THREAD_SAFE_FREE | RUBY_TYPED_WB_PROTECTED,
 };
 
 #define GetHpkeSuite(obj, suite) do {\
@@ -105,7 +105,7 @@ static const rb_data_type_t ossl_hpke_suite_type = {
     {
         0, ossl_hpke_suite_free, ossl_hpke_suite_memsize,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+    0, 0, RUBY_TYPED_THREAD_SAFE_FREE | RUBY_TYPED_WB_PROTECTED,
 };
 
 /*

ext/openssl/ossl_ns_spki.c

@@ -42,7 +42,7 @@ static const rb_data_type_t ossl_netscape_spki_type = {
     {
         0, ossl_netscape_spki_free,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+    0, 0, RUBY_TYPED_THREAD_SAFE_FREE | RUBY_TYPED_WB_PROTECTED,
 };
 
 static VALUE

ext/openssl/ossl_ocsp.c

@@ -52,7 +52,7 @@ static const rb_data_type_t ossl_ocsp_request_type = {
     {
         0, ossl_ocsp_request_free,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+    0, 0, RUBY_TYPED_THREAD_SAFE_FREE | RUBY_TYPED_WB_PROTECTED,
 };
 
 static void
@@ -66,7 +66,7 @@ static const rb_data_type_t ossl_ocsp_response_type = {
     {
         0, ossl_ocsp_response_free,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+    0, 0, RUBY_TYPED_THREAD_SAFE_FREE | RUBY_TYPED_WB_PROTECTED,
 };
 
 static void
@@ -80,7 +80,7 @@ static const rb_data_type_t ossl_ocsp_basicresp_type = {
     {
         0, ossl_ocsp_basicresp_free,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+    0, 0, RUBY_TYPED_THREAD_SAFE_FREE | RUBY_TYPED_WB_PROTECTED,
 };
 
 static void
@@ -94,7 +94,7 @@ static const rb_data_type_t ossl_ocsp_singleresp_type = {
     {
         0, ossl_ocsp_singleresp_free,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+    0, 0, RUBY_TYPED_THREAD_SAFE_FREE | RUBY_TYPED_WB_PROTECTED,
 };
 
 static void
@@ -108,7 +108,7 @@ static const rb_data_type_t ossl_ocsp_certid_type = {
     {
         0, ossl_ocsp_certid_free,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+    0, 0, RUBY_TYPED_THREAD_SAFE_FREE | RUBY_TYPED_WB_PROTECTED,
 };
 
 /*