From 8b8e1d7f9b6b5a335864bbd0716df2af1ec41d91 Mon Sep 17 00:00:00 2001

From: Kazuki Yamaguchi <k@rhe.jp>

Date: Thu, 16 Mar 2017 16:06:53 +0900

Subject: [PATCH 1/5] 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.

---

 ext/openssl/ossl_pkey.c     | 22 +++++++++-------------

 ext/openssl/ossl_pkey.h     |  3 ---

 ext/openssl/ossl_pkey_dh.c  | 21 ---------------------

 ext/openssl/ossl_pkey_dsa.c | 21 ---------------------

 ext/openssl/ossl_pkey_ec.c  | 20 --------------------

 ext/openssl/ossl_pkey_rsa.c | 22 ----------------------

 6 files changed, 9 insertions(+), 100 deletions(-)

diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c

index 23204087ac..c6dbf57272 100644

--- a/ext/openssl/ossl_pkey.c

+++ b/ext/openssl/ossl_pkey.c

@@ -95,7 +95,7 @@ const rb_data_type_t ossl_evp_pkey_type = {

 static VALUE

 pkey_new0(EVP_PKEY *pkey)

 {

-    VALUE obj;

+    VALUE klass, obj;

     int type;

     if (!pkey || (type = EVP_PKEY_base_id(pkey)) == EVP_PKEY_NONE)

@@ -103,26 +103,22 @@ pkey_new0(EVP_PKEY *pkey)

     switch (type) {

 #if !defined(OPENSSL_NO_RSA)

-    case EVP_PKEY_RSA:

-	return ossl_rsa_new(pkey);

+      case EVP_PKEY_RSA: klass = cRSA; break;

 #endif

 #if !defined(OPENSSL_NO_DSA)

-    case EVP_PKEY_DSA:

-	return ossl_dsa_new(pkey);

+      case EVP_PKEY_DSA: klass = cDSA; break;

 #endif

 #if !defined(OPENSSL_NO_DH)

-    case EVP_PKEY_DH:

-	return ossl_dh_new(pkey);

+      case EVP_PKEY_DH:  klass = cDH; break;

 #endif

 #if !defined(OPENSSL_NO_EC)

-    case EVP_PKEY_EC:

-	return ossl_ec_new(pkey);

+      case EVP_PKEY_EC:  klass = cEC; break;

 #endif

-    default:

-	obj = NewPKey(cPKey);

-	SetPKey(obj, pkey);

-	return obj;

+      default:           klass = cPKey; break;

     }

+    obj = NewPKey(klass);

+    SetPKey(obj, pkey);

+    return obj;

 }

 VALUE

diff --git a/ext/openssl/ossl_pkey.h b/ext/openssl/ossl_pkey.h

index 0db59305f7..e363a261c2 100644

--- a/ext/openssl/ossl_pkey.h

+++ b/ext/openssl/ossl_pkey.h

@@ -56,7 +56,6 @@ void Init_ossl_pkey(void);

 extern VALUE cRSA;

 extern VALUE eRSAError;

-VALUE ossl_rsa_new(EVP_PKEY *);

 void Init_ossl_rsa(void);

 /*

@@ -65,7 +64,6 @@ void Init_ossl_rsa(void);

 extern VALUE cDSA;

 extern VALUE eDSAError;

-VALUE ossl_dsa_new(EVP_PKEY *);

 void Init_ossl_dsa(void);

 /*

@@ -74,7 +72,6 @@ void Init_ossl_dsa(void);

 extern VALUE cDH;

 extern VALUE eDHError;

-VALUE ossl_dh_new(EVP_PKEY *);

 void Init_ossl_dh(void);

 /*

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

  */

diff --git a/ext/openssl/ossl_pkey_dsa.c b/ext/openssl/ossl_pkey_dsa.c

index 431c20e05c..e9be9ac482 100644

--- a/ext/openssl/ossl_pkey_dsa.c

+++ b/ext/openssl/ossl_pkey_dsa.c

@@ -68,27 +68,6 @@ dsa_instance(VALUE klass, DSA *dsa)

     return obj;

 }

-VALUE

-ossl_dsa_new(EVP_PKEY *pkey)

-{

-    VALUE obj;

-

-    if (!pkey) {

-	obj = dsa_instance(cDSA, DSA_new());

-    } else {

-	obj = NewPKey(cDSA);

-	if (EVP_PKEY_base_id(pkey) != EVP_PKEY_DSA) {

-	    ossl_raise(rb_eTypeError, "Not a DSA key!");

-	}

-	SetPKey(obj, pkey);

-    }

-    if (obj == Qfalse) {

-	ossl_raise(eDSAError, NULL);

-    }

-

-    return obj;

-}

-

 /*

  * Private

  */

diff --git a/ext/openssl/ossl_pkey_ec.c b/ext/openssl/ossl_pkey_ec.c

index fc2bc6c815..eabf495f19 100644

--- a/ext/openssl/ossl_pkey_ec.c

+++ b/ext/openssl/ossl_pkey_ec.c

@@ -84,26 +84,6 @@ static VALUE ec_instance(VALUE klass, EC_KEY *ec)

     return obj;

 }

-VALUE ossl_ec_new(EVP_PKEY *pkey)

-{

-    VALUE obj;

-

-    if (!pkey) {

-	obj = ec_instance(cEC, EC_KEY_new());

-    } else {

-	obj = NewPKey(cEC);

-	if (EVP_PKEY_base_id(pkey) != EVP_PKEY_EC) {

-	    ossl_raise(rb_eTypeError, "Not a EC key!");

-	}

-	SetPKey(obj, pkey);

-    }

-    if (obj == Qfalse) {

-	ossl_raise(eECError, NULL);

-    }

-

-    return obj;

-}

-

 /*

  * Creates a new EC_KEY on the EC group obj. arg can be an EC::Group or a String

  * representing an OID.

diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c

index 761866c66a..c1ae44fe40 100644

--- a/ext/openssl/ossl_pkey_rsa.c

+++ b/ext/openssl/ossl_pkey_rsa.c

@@ -69,28 +69,6 @@ rsa_instance(VALUE klass, RSA *rsa)

     return obj;

 }

-VALUE

-ossl_rsa_new(EVP_PKEY *pkey)

-{

-    VALUE obj;

-

-    if (!pkey) {

-	obj = rsa_instance(cRSA, RSA_new());

-    }

-    else {

-	obj = NewPKey(cRSA);

-	if (EVP_PKEY_base_id(pkey) != EVP_PKEY_RSA) {

-	    ossl_raise(rb_eTypeError, "Not a RSA key!");

-	}

-	SetPKey(obj, pkey);

-    }

-    if (obj == Qfalse) {

-	ossl_raise(eRSAError, NULL);

-    }

-

-    return obj;

-}

-

 /*

  * Private

  */

-- 

2.32.0

From 2b0d259ef7aae707922996d305675a68dad27abd Mon Sep 17 00:00:00 2001

From: Kazuki Yamaguchi <k@rhe.jp>

Date: Thu, 16 Mar 2017 16:09:35 +0900

Subject: [PATCH 2/5] pkey: inline {rsa,dsa,dh,ec}_instance()

Merge the code into the callers so that the wrapping Ruby object is

allocated before the raw key object is allocated. This prevents possible

memory leak on Ruby object allocation failure, and also reduces the

lines of code.

---

 ext/openssl/ossl_pkey_dh.c  | 63 ++++++++++++----------------------

 ext/openssl/ossl_pkey_dsa.c | 68 ++++++++++++++-----------------------

 ext/openssl/ossl_pkey_ec.c  | 34 ++++---------------

 ext/openssl/ossl_pkey_rsa.c | 67 +++++++++++++-----------------------

 4 files changed, 76 insertions(+), 156 deletions(-)

diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c

index dff69cfc33..bc50e5566b 100644

--- a/ext/openssl/ossl_pkey_dh.c

+++ b/ext/openssl/ossl_pkey_dh.c

@@ -29,31 +29,6 @@

 VALUE cDH;

 VALUE eDHError;

-/*

- * Public

- */

-static VALUE

-dh_instance(VALUE klass, DH *dh)

-{

-    EVP_PKEY *pkey;

-    VALUE obj;

-

-    if (!dh) {

-	return Qfalse;

-    }

-    obj = NewPKey(klass);

-    if (!(pkey = EVP_PKEY_new())) {

-	return Qfalse;

-    }

-    if (!EVP_PKEY_assign_DH(pkey, dh)) {

-	EVP_PKEY_free(pkey);

-	return Qfalse;

-    }

-    SetPKey(obj, pkey);

-

-    return obj;

-}

-

 /*

  * Private

  */

@@ -84,7 +59,7 @@ dh_generate(int size, int gen)

     if (!dh || !cb) {

 	DH_free(dh);

 	BN_GENCB_free(cb);

-	return NULL;

+        ossl_raise(eDHError, "malloc failure");

     }

     if (rb_block_given_p())

@@ -110,12 +85,12 @@ dh_generate(int size, int gen)

 	    ossl_clear_error();

 	    rb_jump_tag(cb_arg.state);

 	}

-	return NULL;

+        ossl_raise(eDHError, "DH_generate_parameters_ex");

     }

     if (!DH_generate_key(dh)) {

         DH_free(dh);

-        return NULL;

+        ossl_raise(eDHError, "DH_generate_key");

     }

     return dh;

@@ -136,6 +111,7 @@ dh_generate(int size, int gen)

 static VALUE

 ossl_dh_s_generate(int argc, VALUE *argv, VALUE klass)

 {

+    EVP_PKEY *pkey;

     DH *dh ;

     int g = 2;

     VALUE size, gen, obj;

@@ -143,13 +119,14 @@ ossl_dh_s_generate(int argc, VALUE *argv, VALUE klass)

     if (rb_scan_args(argc, argv, "11", &size, &gen) == 2) {

 	g = NUM2INT(gen);

     }

+    obj = rb_obj_alloc(klass);

+    GetPKey(obj, pkey);

+

     dh = dh_generate(NUM2INT(size), g);

-    obj = dh_instance(klass, dh);

-    if (obj == Qfalse) {

-	DH_free(dh);

-	ossl_raise(eDHError, NULL);

+    if (!EVP_PKEY_assign_DH(pkey, dh)) {

+        DH_free(dh);

+        ossl_raise(eDHError, "EVP_PKEY_assign_DH");

     }

-

     return obj;

 }

@@ -195,9 +172,7 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self)

 	if (!NIL_P(gen)) {

 	    g = NUM2INT(gen);

 	}

-	if (!(dh = dh_generate(NUM2INT(arg), g))) {

-	    ossl_raise(eDHError, NULL);

-	}

+        dh = dh_generate(NUM2INT(arg), g);

     }

     else {

 	arg = ossl_to_der_if_possible(arg);

@@ -434,17 +409,21 @@ ossl_dh_to_text(VALUE self)

 static VALUE

 ossl_dh_to_public_key(VALUE self)

 {

+    EVP_PKEY *pkey;

     DH *orig_dh, *dh;

     VALUE obj;

+    obj = rb_obj_alloc(rb_obj_class(self));

+    GetPKey(obj, pkey);

+

     GetDH(self, orig_dh);

-    dh = DHparams_dup(orig_dh); /* err check perfomed by dh_instance */

-    obj = dh_instance(rb_obj_class(self), dh);

-    if (obj == Qfalse) {

-	DH_free(dh);

-	ossl_raise(eDHError, NULL);

+    dh = DHparams_dup(orig_dh);

+    if (!dh)

+        ossl_raise(eDHError, "DHparams_dup");

+    if (!EVP_PKEY_assign_DH(pkey, dh)) {

+        DH_free(dh);

+        ossl_raise(eDHError, "EVP_PKEY_assign_DH");

     }

-

     return obj;

 }

diff --git a/ext/openssl/ossl_pkey_dsa.c b/ext/openssl/ossl_pkey_dsa.c

index e9be9ac482..c907f31c19 100644

--- a/ext/openssl/ossl_pkey_dsa.c

+++ b/ext/openssl/ossl_pkey_dsa.c

@@ -43,31 +43,6 @@ DSA_PRIVATE(VALUE obj, DSA *dsa)

 VALUE cDSA;

 VALUE eDSAError;

-/*

- * Public

- */

-static VALUE

-dsa_instance(VALUE klass, DSA *dsa)

-{

-    EVP_PKEY *pkey;

-    VALUE obj;

-

-    if (!dsa) {

-	return Qfalse;

-    }

-    obj = NewPKey(klass);

-    if (!(pkey = EVP_PKEY_new())) {

-	return Qfalse;

-    }

-    if (!EVP_PKEY_assign_DSA(pkey, dsa)) {

-	EVP_PKEY_free(pkey);

-	return Qfalse;

-    }

-    SetPKey(obj, pkey);

-

-    return obj;

-}

-

 /*

  * Private

  */

@@ -100,9 +75,9 @@ dsa_generate(int size)

     unsigned long h;

     if (!dsa || !cb) {

-	DSA_free(dsa);

-	BN_GENCB_free(cb);

-	return NULL;

+        DSA_free(dsa);

+        BN_GENCB_free(cb);

+        ossl_raise(eDSAError, "malloc failure");

     }

     if (rb_block_given_p())

@@ -132,12 +107,12 @@ dsa_generate(int size)

 	    ossl_clear_error();

 	    rb_jump_tag(cb_arg.state);

 	}

-	return NULL;

+        ossl_raise(eDSAError, "DSA_generate_parameters_ex");

     }

     if (!DSA_generate_key(dsa)) {

-	DSA_free(dsa);

-	return NULL;

+        DSA_free(dsa);

+        ossl_raise(eDSAError, "DSA_generate_key");

     }

     return dsa;

@@ -157,14 +132,18 @@ dsa_generate(int size)

 static VALUE

 ossl_dsa_s_generate(VALUE klass, VALUE size)

 {

-    DSA *dsa = dsa_generate(NUM2INT(size)); /* err handled by dsa_instance */

-    VALUE obj = dsa_instance(klass, dsa);

+    EVP_PKEY *pkey;

+    DSA *dsa;

+    VALUE obj;

-    if (obj == Qfalse) {

-	DSA_free(dsa);

-	ossl_raise(eDSAError, NULL);

-    }

+    obj = rb_obj_alloc(klass);

+    GetPKey(obj, pkey);

+    dsa = dsa_generate(NUM2INT(size));

+    if (!EVP_PKEY_assign_DSA(pkey, dsa)) {

+        DSA_free(dsa);

+        ossl_raise(eDSAError, "EVP_PKEY_assign_DSA");

+    }

     return obj;

 }

@@ -460,20 +439,23 @@ ossl_dsa_to_text(VALUE self)

 static VALUE

 ossl_dsa_to_public_key(VALUE self)

 {

-    EVP_PKEY *pkey;

+    EVP_PKEY *pkey, *pkey_new;

     DSA *dsa;

     VALUE obj;

     GetPKeyDSA(self, pkey);

-    /* err check performed by dsa_instance */

+    obj = rb_obj_alloc(rb_obj_class(self));

+    GetPKey(obj, pkey_new);

+

 #define DSAPublicKey_dup(dsa) (DSA *)ASN1_dup( \

 	(i2d_of_void *)i2d_DSAPublicKey, (d2i_of_void *)d2i_DSAPublicKey, (char *)(dsa))

     dsa = DSAPublicKey_dup(EVP_PKEY_get0_DSA(pkey));

 #undef DSAPublicKey_dup

-    obj = dsa_instance(rb_obj_class(self), dsa);

-    if (obj == Qfalse) {

-	DSA_free(dsa);

-	ossl_raise(eDSAError, NULL);

+    if (!dsa)

+        ossl_raise(eDSAError, "DSAPublicKey_dup");

+    if (!EVP_PKEY_assign_DSA(pkey_new, dsa)) {

+        DSA_free(dsa);

+        ossl_raise(eDSAError, "EVP_PKEY_assign_DSA");

     }

     return obj;

 }

diff --git a/ext/openssl/ossl_pkey_ec.c b/ext/openssl/ossl_pkey_ec.c

index eabf495f19..aec9d1e60f 100644

--- a/ext/openssl/ossl_pkey_ec.c

+++ b/ext/openssl/ossl_pkey_ec.c

@@ -63,27 +63,6 @@ static ID id_i_group;

 static VALUE ec_group_new(const EC_GROUP *group);

 static VALUE ec_point_new(const EC_POINT *point, const EC_GROUP *group);

-static VALUE ec_instance(VALUE klass, EC_KEY *ec)

-{

-    EVP_PKEY *pkey;

-    VALUE obj;

-

-    if (!ec) {

-	return Qfalse;

-    }

-    obj = NewPKey(klass);

-    if (!(pkey = EVP_PKEY_new())) {

-	return Qfalse;

-    }

-    if (!EVP_PKEY_assign_EC_KEY(pkey, ec)) {

-	EVP_PKEY_free(pkey);

-	return Qfalse;

-    }

-    SetPKey(obj, pkey);

-

-    return obj;

-}

-

 /*

  * Creates a new EC_KEY on the EC group obj. arg can be an EC::Group or a String

  * representing an OID.

@@ -130,17 +109,18 @@ ec_key_new_from_group(VALUE arg)

 static VALUE

 ossl_ec_key_s_generate(VALUE klass, VALUE arg)

 {

+    EVP_PKEY *pkey;

     EC_KEY *ec;

     VALUE obj;

-    ec = ec_key_new_from_group(arg);

+    obj = rb_obj_alloc(klass);

+    GetPKey(obj, pkey);

-    obj = ec_instance(klass, ec);

-    if (obj == Qfalse) {

-	EC_KEY_free(ec);

-	ossl_raise(eECError, NULL);

+    ec = ec_key_new_from_group(arg);

+    if (!EVP_PKEY_assign_EC_KEY(pkey, ec)) {

+        EC_KEY_free(ec);

+        ossl_raise(eECError, "EVP_PKEY_assign_EC_KEY");

     }

-

     if (!EC_KEY_generate_key(ec))

 	ossl_raise(eECError, "EC_KEY_generate_key");

diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c

index c1ae44fe40..fbdb9c8960 100644

--- a/ext/openssl/ossl_pkey_rsa.c

+++ b/ext/openssl/ossl_pkey_rsa.c

@@ -44,31 +44,6 @@ RSA_PRIVATE(VALUE obj, RSA *rsa)

 VALUE cRSA;

 VALUE eRSAError;

-/*

- * Public

- */

-static VALUE

-rsa_instance(VALUE klass, RSA *rsa)

-{

-    EVP_PKEY *pkey;

-    VALUE obj;

-

-    if (!rsa) {

-	return Qfalse;

-    }

-    obj = NewPKey(klass);

-    if (!(pkey = EVP_PKEY_new())) {

-	return Qfalse;

-    }

-    if (!EVP_PKEY_assign_RSA(pkey, rsa)) {

-	EVP_PKEY_free(pkey);

-	return Qfalse;

-    }

-    SetPKey(obj, pkey);

-

-    return obj;

-}

-

 /*

  * Private

  */

@@ -102,7 +77,7 @@ rsa_generate(int size, unsigned long exp)

 	RSA_free(rsa);

 	BN_free(e);

 	BN_GENCB_free(cb);

-	return NULL;

+        ossl_raise(eRSAError, "malloc failure");

     }

     for (i = 0; i < (int)sizeof(exp) * 8; ++i) {

 	if (exp & (1UL << i)) {

@@ -110,7 +85,7 @@ rsa_generate(int size, unsigned long exp)

 		BN_free(e);

 		RSA_free(rsa);

 		BN_GENCB_free(cb);

-		return NULL;

+                ossl_raise(eRSAError, "BN_set_bit");

 	    }

 	}

     }

@@ -139,7 +114,7 @@ rsa_generate(int size, unsigned long exp)

 	    ossl_clear_error();

 	    rb_jump_tag(cb_arg.state);

 	}

-	return NULL;

+        ossl_raise(eRSAError, "RSA_generate_key_ex");

     }

     return rsa;

@@ -158,26 +133,26 @@ static VALUE

 ossl_rsa_s_generate(int argc, VALUE *argv, VALUE klass)

 {

 /* why does this method exist?  why can't initialize take an optional exponent? */

+    EVP_PKEY *pkey;

     RSA *rsa;

     VALUE size, exp;

     VALUE obj;

     rb_scan_args(argc, argv, "11", &size, &exp);

+    obj = rb_obj_alloc(klass);

+    GetPKey(obj, pkey);

-    rsa = rsa_generate(NUM2INT(size), NIL_P(exp) ? RSA_F4 : NUM2ULONG(exp)); /* err handled by rsa_instance */

-    obj = rsa_instance(klass, rsa);

-

-    if (obj == Qfalse) {

-	RSA_free(rsa);

-	ossl_raise(eRSAError, NULL);

+    rsa = rsa_generate(NUM2INT(size), NIL_P(exp) ? RSA_F4 : NUM2ULONG(exp));

+    if (!EVP_PKEY_assign_RSA(pkey, rsa)) {

+        RSA_free(rsa);

+        ossl_raise(eRSAError, "EVP_PKEY_assign_RSA");

     }

-

     return obj;

 }

 /*

  * call-seq:

- *   RSA.new(key_size)                 => RSA instance

+ *   RSA.new(size [, exponent])        => RSA instance

  *   RSA.new(encoded_key)              => RSA instance

  *   RSA.new(encoded_key, pass_phrase) => RSA instance

  *

@@ -206,10 +181,11 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)

     GetPKey(self, pkey);

     if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) {

 	rsa = RSA_new();

+        if (!rsa)

+            ossl_raise(eRSAError, "RSA_new");

     }

     else if (RB_INTEGER_TYPE_P(arg)) {

 	rsa = rsa_generate(NUM2INT(arg), NIL_P(pass) ? RSA_F4 : NUM2ULONG(pass));

-	if (!rsa) ossl_raise(eRSAError, NULL);

     }

     else {

 	pass = ossl_pem_passwd_value(pass);

@@ -243,7 +219,7 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)

     }

     if (!EVP_PKEY_assign_RSA(pkey, rsa)) {

 	RSA_free(rsa);

-	ossl_raise(eRSAError, NULL);

+	ossl_raise(eRSAError, "EVP_PKEY_assign_RSA");

     }

     return self;

@@ -787,17 +763,20 @@ ossl_rsa_to_text(VALUE self)

 static VALUE

 ossl_rsa_to_public_key(VALUE self)

 {

-    EVP_PKEY *pkey;

+    EVP_PKEY *pkey, *pkey_new;

     RSA *rsa;

     VALUE obj;

     GetPKeyRSA(self, pkey);

-    /* err check performed by rsa_instance */

+    obj = rb_obj_alloc(rb_obj_class(self));

+    GetPKey(obj, pkey_new);

+

     rsa = RSAPublicKey_dup(EVP_PKEY_get0_RSA(pkey));

-    obj = rsa_instance(rb_obj_class(self), rsa);

-    if (obj == Qfalse) {

-	RSA_free(rsa);

-	ossl_raise(eRSAError, NULL);

+    if (!rsa)

+        ossl_raise(eRSAError, "RSAPublicKey_dup");

+    if (!EVP_PKEY_assign_RSA(pkey_new, rsa)) {

+        RSA_free(rsa);

+        ossl_raise(eRSAError, "EVP_PKEY_assign_RSA");

     }

     return obj;

 }

-- 

2.32.0

From 1e1fedc6c2c9d42bc76b5a24bf0f39c8101f8d53 Mon Sep 17 00:00:00 2001

From: Kazuki Yamaguchi <k@rhe.jp>

Date: Sat, 18 Mar 2017 17:26:33 +0900

Subject: [PATCH 3/5] pkey: have PKey.read parse PEM-encoded DHParameter

Try PEM_read_bio_Parameters(). Only PEM format is supported at the

moment since corresponding d2i_* functions are not provided by OpenSSL.

---

 ext/openssl/ossl_pkey.c      | 3 +++

 test/openssl/test_pkey_dh.rb | 2 ++

 test/openssl/utils.rb        | 3 ---

 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c

index c6dbf57272..a00d66aada 100644

--- a/ext/openssl/ossl_pkey.c

+++ b/ext/openssl/ossl_pkey.c

@@ -178,6 +178,9 @@ ossl_pkey_new_from_data(int argc, VALUE *argv, VALUE self)

     OSSL_BIO_reset(bio);

     if ((pkey = PEM_read_bio_PUBKEY(bio, NULL, NULL, NULL)))

 	goto ok;

+    OSSL_BIO_reset(bio);