diff options
| author | Zachary Scott <e@zzak.io> | 2015-06-03 14:02:14 -0400 |
|---|---|---|
| committer | Zachary Scott <e@zzak.io> | 2015-06-03 14:02:14 -0400 |
| commit | 8706e768540ab7d556f1859f71d7ee3c8b40e25d (patch) | |
| tree | 53b7f857ccada137d2678adaf0a5408873d35809 /ext/openssl/ossl_pkey_dh.c | |
| parent | bd594af66966d8ab62e6963540b2caabc0cf3087 (diff) | |
| download | ruby-openssl-8706e768540ab7d556f1859f71d7ee3c8b40e25d.tar.gz | |
Upstream ruby/ruby@451fe26 from r50673
Diffstat (limited to 'ext/openssl/ossl_pkey_dh.c')
| -rw-r--r-- | ext/openssl/ossl_pkey_dh.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c index 9a58bdf4..234cdaa1 100644 --- a/ext/openssl/ossl_pkey_dh.c +++ b/ext/openssl/ossl_pkey_dh.c @@ -46,6 +46,7 @@ dh_instance(VALUE klass, DH *dh) if (!dh) { return Qfalse; } + obj = NewPKey(klass); if (!(pkey = EVP_PKEY_new())) { return Qfalse; } @@ -53,7 +54,7 @@ dh_instance(VALUE klass, DH *dh) EVP_PKEY_free(pkey); return Qfalse; } - WrapPKey(klass, obj, pkey); + SetPKey(obj, pkey); return obj; } @@ -66,10 +67,11 @@ ossl_dh_new(EVP_PKEY *pkey) if (!pkey) { obj = dh_instance(cDH, DH_new()); } else { + obj = NewPKey(cDH); if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DH) { ossl_raise(rb_eTypeError, "Not a DH key!"); } - WrapPKey(cDH, obj, pkey); + SetPKey(obj, pkey); } if (obj == Qfalse) { ossl_raise(eDHError, NULL); |