diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2016-07-03 11:27:45 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-07-09 02:45:42 +0900 |
| commit | 6c09fd3ef5422d798f6674094b9f222c3abae660 (patch) | |
| tree | cdc087a5a4394f73295c9ea4671290f0b2ecb2b0 /ext/openssl/ossl_pkey.c | |
| parent | 1b8bcdb1dc06626a285859570a1e67037df47d8e (diff) | |
| download | ruby-openssl-topic/pkey-read-pkey-error.tar.gz | |
pkey: make PKey.read raise PKey::PKeyError rather than ArgumentErrortopic/pkey-read-pkey-error
PKey.read is a generic method to load an arbitrary PKey structure from a
PEM or DER encoded String. Each PKey classes's constructor also can load
from a String, but the behavior on error is different. While they raises
its own exception (are subclasses of PKey::PKeyError), PKey.read raises
ArgumentError. [Bug #11774]
Diffstat (limited to 'ext/openssl/ossl_pkey.c')
| -rw-r--r-- | ext/openssl/ossl_pkey.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c index 4ae8e14e..ee0575d8 100644 --- a/ext/openssl/ossl_pkey.c +++ b/ext/openssl/ossl_pkey.c @@ -158,7 +158,8 @@ ossl_pkey_new_from_data(int argc, VALUE *argv, VALUE self) BIO_free(bio); if (!pkey) - ossl_raise(rb_eArgError, "Could not parse PKey"); + ossl_raise(ePKeyError, "Could not parse PKey"); + return ossl_pkey_new(pkey); } |