defining asn1 constants and factory methods in ruby

Author: HoneyryderChuck

ext/openssl/ossl_asn1.c

@@ -143,20 +143,7 @@ VALUE cASN1Data;
 static VALUE cASN1Primitive;
 static VALUE cASN1Constructive;
 
-static VALUE cASN1EndOfContent;
-static VALUE cASN1Boolean;                           /* BOOLEAN           */
-static VALUE cASN1Integer, cASN1Enumerated;          /* INTEGER           */
-static VALUE cASN1BitString;                         /* BIT STRING        */
-static VALUE cASN1OctetString, cASN1UTF8String;      /* STRINGs           */
-static VALUE cASN1NumericString, cASN1PrintableString;
-static VALUE cASN1T61String, cASN1VideotexString;
-static VALUE cASN1IA5String, cASN1GraphicString;
-static VALUE cASN1ISO64String, cASN1GeneralString;
-static VALUE cASN1UniversalString, cASN1BMPString;
-static VALUE cASN1Null;                              /* NULL              */
 static VALUE cASN1ObjectId;                          /* OBJECT IDENTIFIER */
-static VALUE cASN1UTCTime, cASN1GeneralizedTime;     /* TIME              */
-static VALUE cASN1Sequence, cASN1Set;                /* CONSTRUCTIVE      */
 
 static VALUE sym_IMPLICIT, sym_EXPLICIT;
 static VALUE sym_UNIVERSAL, sym_APPLICATION, sym_CONTEXT_SPECIFIC, sym_PRIVATE;
@@ -177,49 +164,6 @@ obj_to_asn1obj(VALUE obj)
 
 /********/
 
-typedef struct {
-    const char *name;
-    VALUE *klass;
-} ossl_asn1_info_t;
-
-static const ossl_asn1_info_t ossl_asn1_info[] = {
-    { "EOC",               &cASN1EndOfContent,    },  /*  0 */
-    { "BOOLEAN",           &cASN1Boolean,         },  /*  1 */
-    { "INTEGER",           &cASN1Integer,         },  /*  2 */
-    { "BIT_STRING",        &cASN1BitString,       },  /*  3 */
-    { "OCTET_STRING",      &cASN1OctetString,     },  /*  4 */
-    { "NULL",              &cASN1Null,            },  /*  5 */
-    { "OBJECT",            &cASN1ObjectId,        },  /*  6 */
-    { "OBJECT_DESCRIPTOR", NULL,                  },  /*  7 */
-    { "EXTERNAL",          NULL,                  },  /*  8 */
-    { "REAL",              NULL,                  },  /*  9 */
-    { "ENUMERATED",        &cASN1Enumerated,      },  /* 10 */
-    { "EMBEDDED_PDV",      NULL,                  },  /* 11 */
-    { "UTF8STRING",        &cASN1UTF8String,      },  /* 12 */
-    { "RELATIVE_OID",      NULL,                  },  /* 13 */
-    { "[UNIVERSAL 14]",    NULL,                  },  /* 14 */
-    { "[UNIVERSAL 15]",    NULL,                  },  /* 15 */
-    { "SEQUENCE",          &cASN1Sequence,        },  /* 16 */
-    { "SET",               &cASN1Set,             },  /* 17 */
-    { "NUMERICSTRING",     &cASN1NumericString,   },  /* 18 */
-    { "PRINTABLESTRING",   &cASN1PrintableString, },  /* 19 */
-    { "T61STRING",         &cASN1T61String,       },  /* 20 */
-    { "VIDEOTEXSTRING",    &cASN1VideotexString,  },  /* 21 */
-    { "IA5STRING",         &cASN1IA5String,       },  /* 22 */
-    { "UTCTIME",           &cASN1UTCTime,         },  /* 23 */
-    { "GENERALIZEDTIME",   &cASN1GeneralizedTime, },  /* 24 */
-    { "GRAPHICSTRING",     &cASN1GraphicString,   },  /* 25 */
-    { "ISO64STRING",       &cASN1ISO64String,     },  /* 26 */
-    { "GENERALSTRING",     &cASN1GeneralString,   },  /* 27 */
-    { "UNIVERSALSTRING",   &cASN1UniversalString, },  /* 28 */
-    { "CHARACTER_STRING",  NULL,                  },  /* 29 */
-    { "BMPSTRING",         &cASN1BMPString,       },  /* 30 */
-};
-
-enum {ossl_asn1_info_size = (sizeof(ossl_asn1_info)/sizeof(ossl_asn1_info[0]))};
-
-static VALUE class_tag_map;
-
 /*
  * call-seq:
  *    OpenSSL::ASN1::ObjectId.register(object_id, short_name, long_name)
@@ -347,40 +291,10 @@ ossl_asn1obj_eq(VALUE self, VALUE other)
     return rb_str_equal(oid1, oid2);
 }
 
-#define OSSL_ASN1_IMPL_FACTORY_METHOD(klass) \
-static VALUE ossl_asn1_##klass(int argc, VALUE *argv, VALUE self)\
-{ return rb_funcallv_public(cASN1##klass, rb_intern("new"), argc, argv); }
-
-OSSL_ASN1_IMPL_FACTORY_METHOD(Boolean)
-OSSL_ASN1_IMPL_FACTORY_METHOD(Integer)
-OSSL_ASN1_IMPL_FACTORY_METHOD(Enumerated)
-OSSL_ASN1_IMPL_FACTORY_METHOD(BitString)
-OSSL_ASN1_IMPL_FACTORY_METHOD(OctetString)
-OSSL_ASN1_IMPL_FACTORY_METHOD(UTF8String)
-OSSL_ASN1_IMPL_FACTORY_METHOD(NumericString)
-OSSL_ASN1_IMPL_FACTORY_METHOD(PrintableString)
-OSSL_ASN1_IMPL_FACTORY_METHOD(T61String)
-OSSL_ASN1_IMPL_FACTORY_METHOD(VideotexString)
-OSSL_ASN1_IMPL_FACTORY_METHOD(IA5String)
-OSSL_ASN1_IMPL_FACTORY_METHOD(GraphicString)
-OSSL_ASN1_IMPL_FACTORY_METHOD(ISO64String)
-OSSL_ASN1_IMPL_FACTORY_METHOD(GeneralString)
-OSSL_ASN1_IMPL_FACTORY_METHOD(UniversalString)
-OSSL_ASN1_IMPL_FACTORY_METHOD(BMPString)
-OSSL_ASN1_IMPL_FACTORY_METHOD(Null)
-OSSL_ASN1_IMPL_FACTORY_METHOD(ObjectId)
-OSSL_ASN1_IMPL_FACTORY_METHOD(UTCTime)
-OSSL_ASN1_IMPL_FACTORY_METHOD(GeneralizedTime)
-OSSL_ASN1_IMPL_FACTORY_METHOD(Sequence)
-OSSL_ASN1_IMPL_FACTORY_METHOD(Set)
-OSSL_ASN1_IMPL_FACTORY_METHOD(EndOfContent)
-
 void
 Init_ossl_asn1(void)
 {
 #undef rb_intern
-    VALUE ary;
-    int i;
 
 #if 0
     mOSSL = rb_define_module("OpenSSL");
@@ -409,55 +323,12 @@ Init_ossl_asn1(void)
      * classes defined in it.
      */
     eASN1Error = rb_define_class_under(mASN1, "ASN1Error", eOSSLError);
-    ary = rb_ary_new();
-
-    /*
-     * Array storing tag names at the tag's index.
-     */
-    rb_define_const(mASN1, "UNIVERSAL_TAG_NAME", ary);
-    for(i = 0; i < ossl_asn1_info_size; i++){
-	if(ossl_asn1_info[i].name[0] == '[') continue;
-	rb_define_const(mASN1, ossl_asn1_info[i].name, INT2NUM(i));
-	rb_ary_store(ary, i, rb_str_new2(ossl_asn1_info[i].name));
-    }
-
 
     cASN1Data = rb_define_class_under(mASN1, "ASN1Data", rb_cObject);
     cASN1Primitive = rb_define_class_under(mASN1, "Primitive", cASN1Data);
 
     cASN1Constructive = rb_define_class_under(mASN1,"Constructive", cASN1Data);
-#define OSSL_ASN1_DEFINE_CLASS(name, super) \
-do{\
-    cASN1##name = rb_define_class_under(mASN1, #name, cASN1##super);\
-    rb_define_module_function(mASN1, #name, ossl_asn1_##name, -1);\
-}while(0)
-
-    OSSL_ASN1_DEFINE_CLASS(Boolean, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(Integer, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(Enumerated, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(BitString, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(OctetString, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(UTF8String, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(NumericString, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(PrintableString, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(T61String, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(VideotexString, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(IA5String, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(GraphicString, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(ISO64String, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(GeneralString, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(UniversalString, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(BMPString, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(Null, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(ObjectId, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(UTCTime, Primitive);
-    OSSL_ASN1_DEFINE_CLASS(GeneralizedTime, Primitive);
-
-    OSSL_ASN1_DEFINE_CLASS(Sequence, Constructive);
-    OSSL_ASN1_DEFINE_CLASS(Set, Constructive);
-
-    OSSL_ASN1_DEFINE_CLASS(EndOfContent, Data);
-
+    cASN1ObjectId = rb_define_class_under(mASN1,"ObjectId", cASN1Primitive);
 
 #if 0
     cASN1ObjectId = rb_define_class_under(mASN1, "ObjectId", cASN1Primitive);  /* let rdoc know */
@@ -469,30 +340,4 @@ do{\
     rb_define_alias(cASN1ObjectId, "short_name", "sn");
     rb_define_alias(cASN1ObjectId, "long_name", "ln");
     rb_define_method(cASN1ObjectId, "==", ossl_asn1obj_eq, 1);
-
-    class_tag_map = rb_hash_new();
-    rb_hash_aset(class_tag_map, cASN1EndOfContent, INT2NUM(V_ASN1_EOC));
-    rb_hash_aset(class_tag_map, cASN1Boolean, INT2NUM(V_ASN1_BOOLEAN));
-    rb_hash_aset(class_tag_map, cASN1Integer, INT2NUM(V_ASN1_INTEGER));
-    rb_hash_aset(class_tag_map, cASN1BitString, INT2NUM(V_ASN1_BIT_STRING));
-    rb_hash_aset(class_tag_map, cASN1OctetString, INT2NUM(V_ASN1_OCTET_STRING));
-    rb_hash_aset(class_tag_map, cASN1Null, INT2NUM(V_ASN1_NULL));
-    rb_hash_aset(class_tag_map, cASN1ObjectId, INT2NUM(V_ASN1_OBJECT));
-    rb_hash_aset(class_tag_map, cASN1Enumerated, INT2NUM(V_ASN1_ENUMERATED));
-    rb_hash_aset(class_tag_map, cASN1UTF8String, INT2NUM(V_ASN1_UTF8STRING));
-    rb_hash_aset(class_tag_map, cASN1Sequence, INT2NUM(V_ASN1_SEQUENCE));
-    rb_hash_aset(class_tag_map, cASN1Set, INT2NUM(V_ASN1_SET));
-    rb_hash_aset(class_tag_map, cASN1NumericString, INT2NUM(V_ASN1_NUMERICSTRING));
-    rb_hash_aset(class_tag_map, cASN1PrintableString, INT2NUM(V_ASN1_PRINTABLESTRING));
-    rb_hash_aset(class_tag_map, cASN1T61String, INT2NUM(V_ASN1_T61STRING));
-    rb_hash_aset(class_tag_map, cASN1VideotexString, INT2NUM(V_ASN1_VIDEOTEXSTRING));
-    rb_hash_aset(class_tag_map, cASN1IA5String, INT2NUM(V_ASN1_IA5STRING));
-    rb_hash_aset(class_tag_map, cASN1UTCTime, INT2NUM(V_ASN1_UTCTIME));
-    rb_hash_aset(class_tag_map, cASN1GeneralizedTime, INT2NUM(V_ASN1_GENERALIZEDTIME));
-    rb_hash_aset(class_tag_map, cASN1GraphicString, INT2NUM(V_ASN1_GRAPHICSTRING));
-    rb_hash_aset(class_tag_map, cASN1ISO64String, INT2NUM(V_ASN1_ISO64STRING));
-    rb_hash_aset(class_tag_map, cASN1GeneralString, INT2NUM(V_ASN1_GENERALSTRING));
-    rb_hash_aset(class_tag_map, cASN1UniversalString, INT2NUM(V_ASN1_UNIVERSALSTRING));
-    rb_hash_aset(class_tag_map, cASN1BMPString, INT2NUM(V_ASN1_BMPSTRING));
-    rb_define_const(mASN1, "CLASS_TAG_MAP", class_tag_map);
 }

lib/openssl.rb

@@ -10,9 +10,10 @@
   (See the file 'COPYING'.)
 =end
 
+require_relative 'openssl/asn1'
+
 require 'openssl.so'
 
-require_relative 'openssl/asn1'
 require_relative 'openssl/bn'
 require_relative 'openssl/cipher'
 require_relative 'openssl/digest'