diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/openssl/ossl_pkey_rsa.c | 10 |
2 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Apr 6 11:36:44 2011 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize): + pop pushed error after each try of reading. fixes #4550 + Tue Apr 5 20:33:43 2011 Tanaka Akira <akr@fsij.org> * include/ruby/encoding.h: parenthesize macro arguments. diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c index 519b1cfbf4..15c1d6934d 100644 --- a/ext/openssl/ossl_pkey_rsa.c +++ b/ext/openssl/ossl_pkey_rsa.c @@ -158,26 +158,34 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self) rsa = PEM_read_bio_RSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd); if (!rsa) { (void)BIO_reset(in); + (void)ERR_get_error(); rsa = PEM_read_bio_RSAPublicKey(in, NULL, NULL, NULL); } if (!rsa) { (void)BIO_reset(in); + (void)ERR_get_error(); rsa = PEM_read_bio_RSA_PUBKEY(in, NULL, NULL, NULL); } if (!rsa) { (void)BIO_reset(in); + (void)ERR_get_error(); rsa = d2i_RSAPrivateKey_bio(in, NULL); } if (!rsa) { (void)BIO_reset(in); + (void)ERR_get_error(); rsa = d2i_RSAPublicKey_bio(in, NULL); } if (!rsa) { (void)BIO_reset(in); + (void)ERR_get_error(); rsa = d2i_RSA_PUBKEY_bio(in, NULL); } BIO_free(in); - if (!rsa) ossl_raise(eRSAError, "Neither PUB key nor PRIV key:"); + if (!rsa) { + (void)ERR_get_error(); + ossl_raise(eRSAError, "Neither PUB key nor PRIV key:"); + } } if (!EVP_PKEY_assign_RSA(pkey, rsa)) { RSA_free(rsa); |