diff options
author | Koichi Sasada <ko1@atdot.net> | 2020-12-18 18:19:33 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-02-14 21:46:30 +0900 |
commit | 9e7cf9e930cb986a04e312cb576814254dff13be (patch) | |
tree | bdbb4566172e9c4f608f14cb65e8ecb277b163a3 /ext/openssl | |
parent | f2d004679a62408a89d7304b229c24e789b94776 (diff) | |
download | ruby-openssl-9e7cf9e930cb986a04e312cb576814254dff13be.tar.gz |
openssl is ractor-safe
ossl_bn_ctx is C's global variable and it should be ractor-local
to make it ractor-safe.
ruby/ruby@b5588edc0a538de840c79e0bbc9d271ba0c5a711
Diffstat (limited to 'ext/openssl')
-rw-r--r-- | ext/openssl/ossl.c | 4 | ||||
-rw-r--r-- | ext/openssl/ossl_bn.c | 40 | ||||
-rw-r--r-- | ext/openssl/ossl_bn.h | 3 |
3 files changed, 37 insertions, 10 deletions
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c index 523d72e2..34c6278f 100644 --- a/ext/openssl/ossl.c +++ b/ext/openssl/ossl.c @@ -1126,6 +1126,10 @@ ossl_crypto_fixed_length_secure_compare(VALUE dummy, VALUE str1, VALUE str2) void Init_openssl(void) { +#if HAVE_RB_EXT_RACTOR_SAFE + rb_ext_ractor_safe(true); +#endif + #undef rb_intern /* * Init timezone info diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c index 6493e051..ef26e5ce 100644 --- a/ext/openssl/ossl_bn.c +++ b/ext/openssl/ossl_bn.c @@ -9,6 +9,7 @@ */ /* modified by Michal Rokos <m.rokos@sh.cvut.cz> */ #include "ossl.h" +#include <ruby/ractor.h> #define NewBN(klass) \ TypedData_Wrap_Struct((klass), &ossl_bn_type, 0) @@ -150,12 +151,35 @@ ossl_bn_value_ptr(volatile VALUE *ptr) /* * Private */ -/* - * BN_CTX - is used in more difficult math. ops - * (Why just 1? Because Ruby itself isn't thread safe, - * we don't need to care about threads) - */ -BN_CTX *ossl_bn_ctx; + +void +ossl_bn_ctx_free(void *ptr) +{ + BN_CTX *ctx = (BN_CTX *)ptr; + BN_CTX_free(ctx); +} + +struct rb_ractor_local_storage_type ossl_bn_ctx_key_type = { + NULL, // mark + ossl_bn_ctx_free, +}; + +rb_ractor_local_key_t ossl_bn_ctx_key; + +BN_CTX * +ossl_bn_ctx_get(void) +{ + // stored in ractor local storage + + BN_CTX *ctx = rb_ractor_local_storage_ptr(ossl_bn_ctx_key); + if (!ctx) { + if (!(ctx = BN_CTX_new())) { + ossl_raise(rb_eRuntimeError, "Cannot init BN_CTX"); + } + rb_ractor_local_storage_ptr_set(ossl_bn_ctx_key, ctx); + } + return ctx; +} static VALUE ossl_bn_alloc(VALUE klass) @@ -1092,9 +1116,7 @@ Init_ossl_bn(void) eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError); #endif - if (!(ossl_bn_ctx = BN_CTX_new())) { - ossl_raise(rb_eRuntimeError, "Cannot init BN_CTX"); - } + ossl_bn_ctx_key = rb_ractor_local_storage_ptr_newkey(&ossl_bn_ctx_key_type); eBNError = rb_define_class_under(mOSSL, "BNError", eOSSLError); diff --git a/ext/openssl/ossl_bn.h b/ext/openssl/ossl_bn.h index a19ba194..1cc041fc 100644 --- a/ext/openssl/ossl_bn.h +++ b/ext/openssl/ossl_bn.h @@ -13,7 +13,8 @@ extern VALUE cBN; extern VALUE eBNError; -extern BN_CTX *ossl_bn_ctx; +BN_CTX *ossl_bn_ctx_get(void); +#define ossl_bn_ctx ossl_bn_ctx_get() #define GetBNPtr(obj) ossl_bn_value_ptr(&(obj)) |