diff options
author | Kazuki Yamaguchi <k@rhe.jp> | 2018-08-08 17:25:26 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-08 17:25:26 +0900 |
commit | a1e8aacaef3cc9f95ccbdba653a82e1a334cdeb4 (patch) | |
tree | ddc2b8514da2c9507d8dd5b118d05a95346ccba7 | |
parent | 54adb0dd7c33d863341570bdc781ead25e2c3a78 (diff) | |
parent | 8bb519b11cacd65b6043e5cde007f0765049d283 (diff) | |
download | ruby-openssl-a1e8aacaef3cc9f95ccbdba653a82e1a334cdeb4.tar.gz |
Merge pull request #205 from rhenium/ky/pkey-generate-interrupt-resume
pkey: resume key generation after interrupt [Bug #14882]
-rw-r--r-- | ext/openssl/ossl_pkey.c | 28 | ||||
-rw-r--r-- | ext/openssl/ossl_pkey.h | 2 |
2 files changed, 26 insertions, 4 deletions
diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c index cae7b475..b4a412c1 100644 --- a/ext/openssl/ossl_pkey.c +++ b/ext/openssl/ossl_pkey.c @@ -20,6 +20,21 @@ static ID id_private_q; /* * callback for generating keys */ +static VALUE +call_check_ints0(VALUE arg) +{ + rb_thread_check_ints(); + return Qnil; +} + +static void * +call_check_ints(void *arg) +{ + int state; + rb_protect(call_check_ints0, Qnil, &state); + return (void *)(VALUE)state; +} + int ossl_generate_cb_2(int p, int n, BN_GENCB *cb) { @@ -38,11 +53,18 @@ ossl_generate_cb_2(int p, int n, BN_GENCB *cb) */ rb_protect(rb_yield, ary, &state); if (state) { - arg->stop = 1; arg->state = state; + return 0; + } + } + 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; } } - if (arg->stop) return 0; return 1; } @@ -50,7 +72,7 @@ void ossl_generate_cb_stop(void *ptr) { struct ossl_generate_cb_arg *arg = (struct ossl_generate_cb_arg *)ptr; - arg->stop = 1; + arg->interrupted = 1; } static void diff --git a/ext/openssl/ossl_pkey.h b/ext/openssl/ossl_pkey.h index a0b49744..5c8ccc0f 100644 --- a/ext/openssl/ossl_pkey.h +++ b/ext/openssl/ossl_pkey.h @@ -41,7 +41,7 @@ extern const rb_data_type_t ossl_evp_pkey_type; struct ossl_generate_cb_arg { int yield; - int stop; + int interrupted; int state; }; int ossl_generate_cb_2(int p, int n, BN_GENCB *cb); |