1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/openssl] pkey: fix interrupt handling in OpenSSL::PKey.generate_key

Browse Source 
rb_thread_call_without_gvl() can be interrupted, but it may be able to
resume the operation. Call rb_thread_check_ints() to see if it raises
an exception or not.

https://github.com/ruby/openssl/commit/88b90fb856
This commit is contained in:
Kazuki Yamaguchi 2021-04-05 00:30:01 +09:00
parent 8cfe92b8a2
commit 595644e4f6
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ext/openssl/ossl_pkey.c
View File

@ -239,7 +239,7 @@ struct pkey_blocking_generate_arg {
int state; int state;
int yield: 1; int yield: 1;
int genparam: 1; int genparam: 1;
int stop: 1; int interrupted: 1;
}; };
static VALUE static VALUE
@ -261,23 +261,31 @@ static int
pkey_gen_cb(EVP_PKEY_CTX *ctx) pkey_gen_cb(EVP_PKEY_CTX *ctx)
{ {
struct pkey_blocking_generate_arg *arg = EVP_PKEY_CTX_get_app_data(ctx); struct pkey_blocking_generate_arg *arg = EVP_PKEY_CTX_get_app_data(ctx);
int state;
if (arg->yield) { if (arg->yield) {
int state;
rb_protect(pkey_gen_cb_yield, (VALUE)ctx, &state); rb_protect(pkey_gen_cb_yield, (VALUE)ctx, &state);
if (state) { if (state) {
arg->stop = 1;
arg->state = state; arg->state = state;
return 0;
} }
} }
return !arg->stop; if (arg->interrupted) {
arg->interrupted = 0;
state = (int)(VALUE)rb_thread_call_with_gvl(call_check_ints, NULL);
if (state) {
arg->state = state;
return 0;
}
}
return 1;
} }
static void static void
pkey_blocking_gen_stop(void *ptr) pkey_blocking_gen_stop(void *ptr)
{ {
struct pkey_blocking_generate_arg *arg = ptr; struct pkey_blocking_generate_arg *arg = ptr;
arg->stop = 1; arg->interrupted = 1;
} }
static void * static void *