diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-26 12:06:39 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-26 12:06:39 +0000 |
| commit | 84f2505263fb4b680df2d161c4a388c0ea028094 (patch) | |
| tree | a3f37692b026b7bfb23f35987f5c389093fbb195 /ext | |
| parent | b627a79590a3a115b28105538e10e71ac7e7e028 (diff) | |
| download | ruby-84f2505263fb4b680df2d161c4a388c0ea028094.tar.gz ruby-84f2505263fb4b680df2d161c4a388c0ea028094.tar.xz ruby-84f2505263fb4b680df2d161c4a388c0ea028094.zip | |
* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_verify): should clear error.
(fix http://bugs.debian.org/394336)
* ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11229 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/openssl/ossl_ns_spki.c | 1 | ||||
| -rw-r--r-- | ext/openssl/ossl_pkcs7.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/ext/openssl/ossl_ns_spki.c b/ext/openssl/ossl_ns_spki.c index 2e0e42aa1..738a203d9 100644 --- a/ext/openssl/ossl_ns_spki.c +++ b/ext/openssl/ossl_ns_spki.c @@ -70,6 +70,7 @@ ossl_spki_initialize(int argc, VALUE *argv, VALUE self) } NETSCAPE_SPKI_free(DATA_PTR(self)); DATA_PTR(self) = spki; + ERR_clear_error(); return self; } diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c index 8fa2824aa..04dd0d8d3 100644 --- a/ext/openssl/ossl_pkcs7.c +++ b/ext/openssl/ossl_pkcs7.c @@ -667,8 +667,10 @@ ossl_pkcs7_verify(int argc, VALUE *argv, VALUE self) } ok = PKCS7_verify(p7, x509s, x509st, in, out, flg); BIO_free(in); + if (ok < 0) ossl_raise(ePKCS7Error, NULL); msg = ERR_reason_error_string(ERR_get_error()); ossl_pkcs7_set_err_string(self, msg ? rb_str_new2(msg) : Qnil); + ERR_clear_error(); data = ossl_membio2str(out); ossl_pkcs7_set_data(self, data); sk_X509_pop_free(x509s, X509_free); |