diff options
| author | Kazuki Yamaguchi <[email protected]> | 2017-03-16 16:06:53 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <[email protected]> | 2021-03-16 19:16:10 +0900 |
| commit | 27859c09a67768b06ad1db11a145cd6c548bbdf3 (patch) | |
| tree | bc999d3d3ba74b74e8910967168a2d988151536b /ext/openssl/ossl_pkey_dh.c | |
| parent | 10289e9f229dae499d8f9c4e8252aeb728117d28 (diff) | |
[ruby/openssl] pkey: simplify ossl_pkey_new()
ossl_{rsa,dsa,dh,ec}_new() called from this function are not used
anywhere else. Inline them into pkey_new0() and reduce code
duplication.
https://github.com/ruby/openssl/commit/94aeab2f26
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4275
Diffstat (limited to 'ext/openssl/ossl_pkey_dh.c')
| -rw-r--r-- | ext/openssl/ossl_pkey_dh.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c index bf4e3f9322..dff69cfc33 100644 --- a/ext/openssl/ossl_pkey_dh.c +++ b/ext/openssl/ossl_pkey_dh.c @@ -54,27 +54,6 @@ dh_instance(VALUE klass, DH *dh) return obj; } -VALUE -ossl_dh_new(EVP_PKEY *pkey) -{ - VALUE obj; - - if (!pkey) { - obj = dh_instance(cDH, DH_new()); - } else { - obj = NewPKey(cDH); - if (EVP_PKEY_base_id(pkey) != EVP_PKEY_DH) { - ossl_raise(rb_eTypeError, "Not a DH key!"); - } - SetPKey(obj, pkey); - } - if (obj == Qfalse) { - ossl_raise(eDHError, NULL); - } - - return obj; -} - /* * Private */ |