diff options
author | Kazuki Yamaguchi <k@rhe.jp> | 2016-05-18 01:06:14 +0900 |
---|---|---|
committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-05-18 13:05:33 +0900 |
commit | e0bf4c6884a6e3f92998fa34a13ec4a15a464516 (patch) | |
tree | d2b44188726eae2ab06a875f2a1a1779aad28ed5 /test/openssl/test_pkcs5.rb | |
parent | f7bfb15529d25cf247dcaaa8ccad431c11779c3e (diff) | |
download | ruby-e0bf4c6884a6e3f92998fa34a13ec4a15a464516.tar.gz |
openssl: clear OpenSSL error queue before return to Rubytopic/openssl-clear-error-queue
* ext/openssl/ossl_x509cert.c (ossl_x509_verify): X509_verify()
family may put errors on 0 return (0 means verification failure).
Clear OpenSSL error queue before return to Ruby. Since the queue is
thread global, remaining errors in the queue can cause an unexpected
error in the next OpenSSL operation. [ruby-core:48284] [Bug #7215]
* ext/openssl/ossl_x509crl.c (ossl_x509crl_verify): ditto.
* ext/openssl/ossl_x509req.c (ossl_x509req_verify): ditto.
* ext/openssl/ossl_x509store.c (ossl_x509stctx_verify): ditto.
* ext/openssl/ossl_pkey_dh.c (dh_generate): clear the OpenSSL error
queue before re-raising exception.
* ext/openssl/ossl_pkey_dsa.c (dsa_generate): ditto.
* ext/openssl/ossl_pkey_rsa.c (rsa_generate): ditto.
* ext/openssl/ossl_ssl.c (ossl_start_ssl): ditto.
* test/openssl: check that OpenSSL.errors is empty every time after
running a test case.
Diffstat (limited to 'test/openssl/test_pkcs5.rb')
-rw-r--r-- | test/openssl/test_pkcs5.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/openssl/test_pkcs5.rb b/test/openssl/test_pkcs5.rb index f38fd716b7..ad8132c263 100644 --- a/test/openssl/test_pkcs5.rb +++ b/test/openssl/test_pkcs5.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false require_relative 'utils' -class OpenSSL::TestPKCS5 < Test::Unit::TestCase +class OpenSSL::TestPKCS5 < OpenSSL::TestCase def test_pbkdf2_hmac_sha1_rfc6070_c_1_len_20 p ="password" |