diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-04-06 06:14:05 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-04-06 06:14:05 +0000 |
commit | d5b1fde5c783bdf3a7e316760313d08d5a0c868e (patch) | |
tree | 250444ce5cddf990808b59816d7a37621f9a864d /ext/openssl/ossl_pkey_dh.c | |
parent | 6fc7c377bc818269926b777b5b767dd57efb0c27 (diff) |
* ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize):
pop pushed error after each try of reading. fixes #4550
* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
* ext/openssl/ossl_pkey_ec.c (ossl_ec_initialize): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl/ossl_pkey_dh.c')
-rw-r--r-- | ext/openssl/ossl_pkey_dh.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c index 53e6925371..b812bf391d 100644 --- a/ext/openssl/ossl_pkey_dh.c +++ b/ext/openssl/ossl_pkey_dh.c @@ -170,10 +170,14 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self) dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL); if (!dh){ (void)BIO_reset(in); + (void)ERR_get_error(); dh = d2i_DHparams_bio(in, NULL); } BIO_free(in); - if (!dh) ossl_raise(eDHError, NULL); + if (!dh) { + (void)ERR_get_error(); + ossl_raise(eDHError, NULL); + } } if (!EVP_PKEY_assign_DH(pkey, dh)) { DH_free(dh); |