diff options
| author | Zachary Scott <e@zzak.io> | 2015-03-25 21:33:52 -0700 |
|---|---|---|
| committer | Zachary Scott <e@zzak.io> | 2015-03-25 21:33:52 -0700 |
| commit | 30b43508092659adc0a9f7f038c5e0f9f4435de3 (patch) | |
| tree | e28946b3d63f89b5b7de3442d220f1fe50d35eba /ext/openssl/ossl_pkey.c | |
| parent | 86eb72136fdbc11c125d13c675759b380132be03 (diff) | |
| download | ruby-openssl-30b43508092659adc0a9f7f038c5e0f9f4435de3.tar.gz | |
Upstream the following commits from trunk ruby:
- r49681: 97f9589c4b0641141af32244021dd9eba001b3c7
- r49682: c5d781dded856a86609ebd9fd4904c3e9f3474fd
- r49948: aaf2d070a8351dc3118422bae478978f3d3e3966
- r49954: ddf2558a167652cfec6a901b2116b832221e6e83b
- r49955: 9941f348e056a5e717cb943cee37ba8ba2396e6f
Fixes #6 and #7
Diffstat (limited to 'ext/openssl/ossl_pkey.c')
| -rw-r--r-- | ext/openssl/ossl_pkey.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c index aa9b046d..f781677c 100644 --- a/ext/openssl/ossl_pkey.c +++ b/ext/openssl/ossl_pkey.c @@ -199,7 +199,7 @@ GetPrivPKeyPtr(VALUE obj) { EVP_PKEY *pkey; - if (rb_funcall(obj, id_private_q, 0, NULL) != Qtrue) { + if (rb_funcallv(obj, id_private_q, 0, NULL) != Qtrue) { ossl_raise(rb_eArgError, "Private key is needed."); } SafeGetPKey(obj, pkey); @@ -223,7 +223,7 @@ DupPrivPKeyPtr(VALUE obj) { EVP_PKEY *pkey; - if (rb_funcall(obj, id_private_q, 0, NULL) != Qtrue) { + if (rb_funcallv(obj, id_private_q, 0, NULL) != Qtrue) { ossl_raise(rb_eArgError, "Private key is needed."); } SafeGetPKey(obj, pkey); @@ -290,7 +290,7 @@ ossl_pkey_sign(VALUE self, VALUE digest, VALUE data) unsigned int buf_len; VALUE str; - if (rb_funcall(self, id_private_q, 0, NULL) != Qtrue) { + if (rb_funcallv(self, id_private_q, 0, NULL) != Qtrue) { ossl_raise(rb_eArgError, "Private key is needed."); } GetPKey(self, pkey); |