x509*: allocate OpenSSL objects in #initialize{,_copy}

Author: rhenium

ext/openssl/ossl_x509attr.c

@@ -9,14 +9,6 @@
  */
 #include "ossl.h"
 
-#define NewX509Attr(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_x509attr_type, 0)
-#define SetX509Attr(obj, attr) do { \
-    if (!(attr)) { \
-        ossl_raise(rb_eRuntimeError, "ATTR wasn't initialized!"); \
-    } \
-    RTYPEDDATA_DATA(obj) = (attr); \
-} while (0)
 #define GetX509Attr(obj, attr) do { \
     TypedData_Get_Struct((obj), X509_ATTRIBUTE, &ossl_x509attr_type, (attr)); \
     if (!(attr)) { \
@@ -44,6 +36,12 @@ static const rb_data_type_t ossl_x509attr_type = {
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
 };
 
+static VALUE
+ossl_x509attr_alloc(VALUE klass)
+{
+    return TypedData_Wrap_Struct(klass, &ossl_x509attr_type, NULL);
+}
+
 /*
  * Public
  */
@@ -53,12 +51,12 @@ ossl_x509attr_new(const X509_ATTRIBUTE *attr)
     X509_ATTRIBUTE *new;
     VALUE obj;
 
-    obj = NewX509Attr(cX509Attr);
+    obj = ossl_x509attr_alloc(cX509Attr);
     /* OpenSSL 1.1.1 takes a non-const pointer */
     new = X509_ATTRIBUTE_dup((X509_ATTRIBUTE *)attr);
     if (!new)
         ossl_raise(eX509AttrError, "X509_ATTRIBUTE_dup");
-    SetX509Attr(obj, new);
+    RTYPEDDATA_DATA(obj) = new;
 
     return obj;
 }
@@ -73,23 +71,6 @@ GetX509AttrPtr(VALUE obj)
     return attr;
 }
 
-/*
- * Private
- */
-static VALUE
-ossl_x509attr_alloc(VALUE klass)
-{
-    X509_ATTRIBUTE *attr;
-    VALUE obj;
-
-    obj = NewX509Attr(klass);
-    if (!(attr = X509_ATTRIBUTE_new()))
-        ossl_raise(eX509AttrError, NULL);
-    SetX509Attr(obj, attr);
-
-    return obj;
-}
-
 /*
  * call-seq:
  *    Attribute.new(oid [, value]) => attr
@@ -98,21 +79,27 @@ static VALUE
 ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE oid, value;
-    X509_ATTRIBUTE *attr, *x;
+    X509_ATTRIBUTE *attr;
     const unsigned char *p;
 
-    GetX509Attr(self, attr);
-    if(rb_scan_args(argc, argv, "11", &oid, &value) == 1){
+    rb_scan_args(argc, argv, "11", &oid, &value);
+    ossl_want_uninitialized(self, &ossl_x509attr_type);
+    if (argc == 1) {
         oid = ossl_to_der_if_possible(oid);
         StringValue(oid);
         p = (unsigned char *)RSTRING_PTR(oid);
-        x = d2i_X509_ATTRIBUTE(&attr, &p, RSTRING_LEN(oid));
-        DATA_PTR(self) = attr;
-        if(!x){
-            ossl_raise(eX509AttrError, NULL);
-        }
+        attr = d2i_X509_ATTRIBUTE(NULL, &p, RSTRING_LEN(oid));
+        if (!attr)
+            ossl_raise(eX509AttrError, "d2i_X509_ATTRIBUTE");
+        RTYPEDDATA_DATA(self) = attr;
         return self;
     }
+
+    attr = X509_ATTRIBUTE_new();
+    if (!attr)
+        ossl_raise(eX509AttrError, "X509_ATTRIBUTE_new");
+    RTYPEDDATA_DATA(self) = attr;
+
     rb_funcall(self, rb_intern("oid="), 1, oid);
     rb_funcall(self, rb_intern("value="), 1, value);
 
@@ -123,18 +110,15 @@ ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_x509attr_initialize_copy(VALUE self, VALUE other)
 {
-    X509_ATTRIBUTE *attr, *attr_other, *attr_new;
+    X509_ATTRIBUTE *attr_other, *attr_new;
 
-    rb_check_frozen(self);
-    GetX509Attr(self, attr);
+    ossl_want_uninitialized(self, &ossl_x509attr_type);
     GetX509Attr(other, attr_other);
 
     attr_new = X509_ATTRIBUTE_dup(attr_other);
     if (!attr_new)
         ossl_raise(eX509AttrError, "X509_ATTRIBUTE_dup");
-
-    SetX509Attr(self, attr_new);
-    X509_ATTRIBUTE_free(attr);
+    RTYPEDDATA_DATA(self) = attr_new;
 
     return self;
 }
@@ -203,7 +187,7 @@ ossl_x509attr_set_value(VALUE self, VALUE value)
             sk_ASN1_TYPE_pop_free(sk, ASN1_TYPE_free);
             ossl_raise(eX509AttrError, "X509_ATTRIBUTE_create_by_OBJ");
         }
-        SetX509Attr(self, new_attr);
+        RTYPEDDATA_DATA(self) = new_attr;
         X509_ATTRIBUTE_free(attr);
         attr = new_attr;
     }

ext/openssl/ossl_x509cert.c

@@ -9,14 +9,6 @@
  */
 #include "ossl.h"
 
-#define NewX509(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_x509_type, 0)
-#define SetX509(obj, x509) do { \
-    if (!(x509)) { \
-        ossl_raise(rb_eRuntimeError, "CERT wasn't initialized!"); \
-    } \
-    RTYPEDDATA_DATA(obj) = (x509); \
-} while (0)
 #define GetX509(obj, x509) do { \
     TypedData_Get_Struct((obj), X509, &ossl_x509_type, (x509)); \
     if (!(x509)) { \
@@ -44,6 +36,12 @@ static const rb_data_type_t ossl_x509_type = {
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
 };
 
+static VALUE
+ossl_x509_alloc(VALUE klass)
+{
+    return TypedData_Wrap_Struct(klass, &ossl_x509_type, NULL);
+}
+
 /*
  * Public
  */
@@ -53,12 +51,12 @@ ossl_x509_new(const X509 *x509)
     X509 *new;
     VALUE obj;
 
-    obj = NewX509(cX509Cert);
+    obj = ossl_x509_alloc(cX509Cert);
     /* OpenSSL 1.1.1 takes a non-const pointer */
     new = X509_dup((X509 *)x509);
     if (!new)
         ossl_raise(eX509CertError, "X509_dup");
-    SetX509(obj, new);
+    RTYPEDDATA_DATA(obj) = new;
 
     return obj;
 }
@@ -85,23 +83,6 @@ DupX509CertPtr(VALUE obj)
     return x509;
 }
 
-/*
- * Private
- */
-static VALUE
-ossl_x509_alloc(VALUE klass)
-{
-    X509 *x509;
-    VALUE obj;
-
-    obj = NewX509(klass);
-    x509 = X509_new();
-    if (!x509) ossl_raise(eX509CertError, NULL);
-    SetX509(obj, x509);
-
-    return obj;
-}
-
 /*
  * call-seq:
  *    Certificate.new => cert
@@ -111,12 +92,16 @@ static VALUE
 ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
 {
     BIO *in;
-    X509 *x509, *x509_orig = RTYPEDDATA_DATA(self);
+    X509 *x509;
     VALUE arg;
 
-    rb_check_frozen(self);
-    if (rb_scan_args(argc, argv, "01", &arg) == 0) {
-        /* create just empty X509Cert */
+    rb_scan_args(argc, argv, "01", &arg);
+    ossl_want_uninitialized(self, &ossl_x509_type);
+    if (argc == 0) {
+        x509 = X509_new();
+        if (!x509)
+            ossl_raise(eX509CertError, "X509_new");
+        RTYPEDDATA_DATA(self) = x509;
         return self;
     }
     arg = ossl_to_der_if_possible(arg);
@@ -131,7 +116,6 @@ ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
         ossl_raise(eX509CertError, "PEM_read_bio_X509");
 
     RTYPEDDATA_DATA(self) = x509;
-    X509_free(x509_orig);
 
     return self;
 }
@@ -140,19 +124,15 @@ ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_x509_copy(VALUE self, VALUE other)
 {
-    X509 *a, *b, *x509;
-
-    rb_check_frozen(self);
-    if (self == other) return self;
+    X509 *b, *x509;
 
-    GetX509(self, a);
+    ossl_want_uninitialized(self, &ossl_x509_type);
     GetX509(other, b);
 
     x509 = X509_dup(b);
-    if (!x509) ossl_raise(eX509CertError, NULL);
-
-    DATA_PTR(self) = x509;
-    X509_free(a);
+    if (!x509)
+        ossl_raise(eX509CertError, "X509_dup");
+    RTYPEDDATA_DATA(self) = x509;
 
     return self;
 }

ext/openssl/ossl_x509crl.c

@@ -9,14 +9,6 @@
  */
 #include "ossl.h"
 
-#define NewX509CRL(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_x509crl_type, 0)
-#define SetX509CRL(obj, crl) do { \
-    if (!(crl)) { \
-        ossl_raise(rb_eRuntimeError, "CRL wasn't initialized!"); \
-    } \
-    RTYPEDDATA_DATA(obj) = (crl); \
-} while (0)
 #define GetX509CRL(obj, crl) do { \
     TypedData_Get_Struct((obj), X509_CRL, &ossl_x509crl_type, (crl)); \
     if (!(crl)) { \
@@ -44,6 +36,12 @@ static const rb_data_type_t ossl_x509crl_type = {
     0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
 };
 
+static VALUE
+ossl_x509crl_alloc(VALUE klass)
+{
+    return TypedData_Wrap_Struct(klass, &ossl_x509crl_type, NULL);
+}
+
 /*
  * PUBLIC
  */
@@ -63,30 +61,12 @@ ossl_x509crl_new(const X509_CRL *crl)
     X509_CRL *tmp;
     VALUE obj;
 
-    obj = NewX509CRL(cX509CRL);
+    obj = ossl_x509crl_alloc(cX509CRL);
     /* OpenSSL 1.1.1 takes a non-const pointer */
     tmp = X509_CRL_dup((X509_CRL *)crl);
     if (!tmp)
         ossl_raise(eX509CRLError, "X509_CRL_dup");
-    SetX509CRL(obj, tmp);
-
-    return obj;
-}
-
-/*
- * PRIVATE
- */
-static VALUE
-ossl_x509crl_alloc(VALUE klass)
-{
-    X509_CRL *crl;
-    VALUE obj;
-
-    obj = NewX509CRL(klass);
-    if (!(crl = X509_CRL_new())) {
-        ossl_raise(eX509CRLError, NULL);
-    }
-    SetX509CRL(obj, crl);
+    RTYPEDDATA_DATA(obj) = tmp;
 
     return obj;
 }
@@ -95,11 +75,16 @@ static VALUE
 ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
 {
     BIO *in;
-    X509_CRL *crl, *crl_orig = RTYPEDDATA_DATA(self);
+    X509_CRL *crl;
     VALUE arg;
 
-    rb_check_frozen(self);
-    if (rb_scan_args(argc, argv, "01", &arg) == 0) {
+    rb_scan_args(argc, argv, "01", &arg);
+    ossl_want_uninitialized(self, &ossl_x509crl_type);
+    if (argc == 0) {
+        crl = X509_CRL_new();
+        if (!crl)
+            ossl_raise(eX509CRLError, "X509_CRL_new");
+        RTYPEDDATA_DATA(self) = crl;
         return self;
     }
     arg = ossl_to_der_if_possible(arg);
@@ -112,9 +97,7 @@ ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
     BIO_free(in);
     if (!crl)
         ossl_raise(eX509CRLError, "PEM_read_bio_X509_CRL");
-
     RTYPEDDATA_DATA(self) = crl;
-    X509_CRL_free(crl_orig);
 
     return self;
 }
@@ -123,17 +106,14 @@ ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_x509crl_copy(VALUE self, VALUE other)
 {
-    X509_CRL *a, *b, *crl;
+    X509_CRL *b, *crl;
 
-    rb_check_frozen(self);
-    if (self == other) return self;
-    GetX509CRL(self, a);
+    ossl_want_uninitialized(self, &ossl_x509crl_type);
     GetX509CRL(other, b);
     if (!(crl = X509_CRL_dup(b))) {
         ossl_raise(eX509CRLError, NULL);
     }
-    X509_CRL_free(a);
-    DATA_PTR(self) = crl;
+    RTYPEDDATA_DATA(self) = crl;
 
     return self;
 }