Skip to content

Commit

Permalink
make bn shareable when frozen
Browse files Browse the repository at this point in the history
  • Loading branch information
HoneyryderChuck committed Oct 19, 2024
1 parent 8367b16 commit cc4fd69
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
6 changes: 6 additions & 0 deletions ext/openssl/ossl.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
#include <errno.h>
#include <ruby/io.h>
#include <ruby/thread.h>
#ifdef HAVE_RB_EXT_RACTOR_SAFE
#include <ruby/ractor.h>
#else
#define RUBY_TYPED_FROZEN_SHAREABLE 0
#endif

#include <openssl/opensslv.h>

#include <openssl/err.h>
Expand Down
10 changes: 5 additions & 5 deletions ext/openssl/ossl_bn.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
/* modified by Michal Rokos <[email protected]> */
#include "ossl.h"

#ifdef HAVE_RB_EXT_RACTOR_SAFE
#include <ruby/ractor.h>
#endif

#define NewBN(klass) \
TypedData_Wrap_Struct((klass), &ossl_bn_type, 0)
#define SetBN(obj, bn) do { \
Expand Down Expand Up @@ -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,
};

/*
Expand Down Expand Up @@ -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); \
Expand Down Expand Up @@ -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)); \
Expand Down Expand Up @@ -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) \
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit cc4fd69

Please sign in to comment.