From cc4fd698685acb472767927f6b52cda82e46e524 Mon Sep 17 00:00:00 2001 From: HoneyryderChuck Date: Sat, 19 Oct 2024 17:09:51 +0100 Subject: [PATCH] make bn shareable when frozen --- ext/openssl/ossl.h | 6 ++++++ ext/openssl/ossl_bn.c | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index c3140ac3e..e665d0c53 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -17,6 +17,12 @@ #include #include #include +#ifdef HAVE_RB_EXT_RACTOR_SAFE +#include +#else +#define RUBY_TYPED_FROZEN_SHAREABLE 0 +#endif + #include #include diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c index 7393fdea5..7bd52549a 100644 --- a/ext/openssl/ossl_bn.c +++ b/ext/openssl/ossl_bn.c @@ -10,10 +10,6 @@ /* modified by Michal Rokos */ #include "ossl.h" -#ifdef HAVE_RB_EXT_RACTOR_SAFE -#include -#endif - #define NewBN(klass) \ TypedData_Wrap_Struct((klass), &ossl_bn_type, 0) #define SetBN(obj, bn) do { \ @@ -41,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, + 0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FROZEN_SHAREABLE, }; /* @@ -693,6 +689,7 @@ BIGNUM_3c(mod_exp) ossl_bn_##func(VALUE self, VALUE bit) \ { \ BIGNUM *bn; \ + rb_check_frozen(self); \ GetBN(self, bn); \ if (BN_##func(bn, NUM2INT(bit)) <= 0) { \ ossl_raise(eBNError, NULL); \ @@ -748,6 +745,7 @@ ossl_bn_is_bit_set(VALUE self, VALUE bit) BIGNUM *bn, *result; \ int b; \ VALUE obj; \ + rb_check_frozen(self); \ b = NUM2INT(bits); \ GetBN(self, bn); \ obj = NewBN(rb_obj_class(self)); \ @@ -782,6 +780,7 @@ BIGNUM_SHIFT(rshift) { \ BIGNUM *bn; \ int b; \ + rb_check_frozen(self); \ b = NUM2INT(bits); \ GetBN(self, bn); \ if (BN_##func(bn, bn, b) <= 0) \ @@ -1191,6 +1190,7 @@ ossl_bn_set_flags(VALUE self, VALUE arg) BIGNUM *bn; GetBN(self, bn); + rb_check_frozen(self); BN_set_flags(bn, NUM2INT(arg)); return Qnil; }