pkcs12: allocate OpenSSL objects in #initialize{,_copy}

Author: rhenium

ext/openssl/ossl_pkcs12.c

@@ -4,14 +4,6 @@
  */
 #include "ossl.h"
 
-#define NewPKCS12(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_pkcs12_type, 0)
-
-#define SetPKCS12(obj, p12) do { \
-    if(!(p12)) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \
-    RTYPEDDATA_DATA(obj) = (p12); \
-} while (0)
-
 #define GetPKCS12(obj, p12) do { \
     TypedData_Get_Struct((obj), PKCS12, &ossl_pkcs12_type, (p12)); \
     if(!(p12)) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \
@@ -50,32 +42,23 @@ static const rb_data_type_t ossl_pkcs12_type = {
 static VALUE
 ossl_pkcs12_s_allocate(VALUE klass)
 {
-    PKCS12 *p12;
-    VALUE obj;
-
-    obj = NewPKCS12(klass);
-    if(!(p12 = PKCS12_new())) ossl_raise(ePKCS12Error, NULL);
-    SetPKCS12(obj, p12);
-
-    return obj;
+    return TypedData_Wrap_Struct(klass, &ossl_pkcs12_type, NULL);
 }
 
 /* :nodoc: */
 static VALUE
 ossl_pkcs12_initialize_copy(VALUE self, VALUE other)
 {
-    PKCS12 *p12, *p12_old, *p12_new;
+    PKCS12 *p12, *p12_new;
 
-    rb_check_frozen(self);
-    GetPKCS12(self, p12_old);
+    ossl_want_uninitialized(self, &ossl_pkcs12_type);
     GetPKCS12(other, p12);
 
-    p12_new = ASN1_dup((i2d_of_void *)i2d_PKCS12, (d2i_of_void *)d2i_PKCS12, (char *)p12);
+    p12_new = ASN1_dup((i2d_of_void *)i2d_PKCS12, (d2i_of_void *)d2i_PKCS12,
+                       p12);
     if (!p12_new)
         ossl_raise(ePKCS12Error, "ASN1_dup");
-
-    SetPKCS12(self, p12_new);
-    PKCS12_free(p12_old);
+    RTYPEDDATA_DATA(self) = p12_new;
 
     return self;
 }
@@ -145,13 +128,13 @@ ossl_pkcs12_s_create(int argc, VALUE *argv, VALUE self)
     }
 #endif
 
-    obj = NewPKCS12(cPKCS12);
+    obj = ossl_pkcs12_s_allocate(cPKCS12);
     x509s = NIL_P(ca) ? NULL : ossl_x509_ary2sk(ca);
     p12 = PKCS12_create(passphrase, friendlyname, key, x509, x509s,
                         nkey, ncert, kiter, miter, ktype);
     sk_X509_pop_free(x509s, X509_free);
     if(!p12) ossl_raise(ePKCS12Error, NULL);
-    SetPKCS12(obj, p12);
+    RTYPEDDATA_DATA(obj) = p12;
 
     ossl_pkcs12_set_key(obj, pkey);
     ossl_pkcs12_set_cert(obj, cert);
@@ -191,7 +174,7 @@ ossl_x509_sk2ary_i(VALUE arg)
 static VALUE
 ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self)
 {
-    PKCS12 *p12, *p12_orig = DATA_PTR(self);
+    PKCS12 *p12;
     BIO *in;
     VALUE arg, pass, pkey, cert, ca;
     char *passphrase;
@@ -200,14 +183,21 @@ ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self)
     STACK_OF(X509) *x509s = NULL;
     int st = 0;
 
-    if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) return self;
+    rb_scan_args(argc, argv, "02", &arg, &pass);
+    ossl_want_uninitialized(self, &ossl_pkcs12_type);
+    if (argc == 0) {
+        p12 = PKCS12_new();
+        if (!p12)
+            ossl_raise(ePKCS12Error, "PKCS12_new");
+        RTYPEDDATA_DATA(self) = p12;
+        return self;
+    }
     passphrase = NIL_P(pass) ? NULL : StringValueCStr(pass);
     in = ossl_obj2bio(&arg);
     p12 = d2i_PKCS12_bio(in, NULL);
     BIO_free(in);
     if (!p12)
         ossl_raise(ePKCS12Error, "d2i_PKCS12_bio");
-    PKCS12_free(p12_orig);
     RTYPEDDATA_DATA(self) = p12;
 
     pkey = cert = ca = Qnil;