emboss	2011-05-22 21:58:23 +0900 (Sun, 22 May 2011)

  New Revision: 31693

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31693

  Log:
    * ext/openssl/ossl_asn1.c: Use OpenSSL constants V_ASN1_xxx instead of
    hardcoded numbers for initializing class_tag_map.

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_asn1.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31692)
+++ ChangeLog	(revision 31693)
@@ -1,3 +1,8 @@
+Sun May 22 21:56:51 2011  Martin Bosslet  <Martin.Bosslet@g...>
+
+	* ext/openssl/ossl_asn1.c: Use OpenSSL constants V_ASN1_xxx instead of
+	hardcoded numbers for initializing class_tag_map.
+
 Sun May 22 21:29:29 2011  Hiroshi Nakamura  <nahi@r...>
 
 	* include/ruby/defines.h (CASEFOLD_FILESYSTEM): Revert r30508. See #4255.
Index: ext/openssl/ossl_asn1.c
===================================================================
--- ext/openssl/ossl_asn1.c	(revision 31692)
+++ ext/openssl/ossl_asn1.c	(revision 31693)
@@ -1771,28 +1771,28 @@
     rb_define_method(cASN1EndOfContent, "initialize", ossl_asn1eoc_initialize, 0);
 
     class_tag_map = rb_hash_new();
-    rb_hash_aset(class_tag_map, cASN1EndOfContent, INT2NUM(0));
-    rb_hash_aset(class_tag_map, cASN1Boolean, INT2NUM(1));
-    rb_hash_aset(class_tag_map, cASN1Integer, INT2NUM(2));
-    rb_hash_aset(class_tag_map, cASN1BitString, INT2NUM(3));
-    rb_hash_aset(class_tag_map, cASN1OctetString, INT2NUM(4));
-    rb_hash_aset(class_tag_map, cASN1Null, INT2NUM(5));
-    rb_hash_aset(class_tag_map, cASN1ObjectId, INT2NUM(6));
-    rb_hash_aset(class_tag_map, cASN1Enumerated, INT2NUM(10));
-    rb_hash_aset(class_tag_map, cASN1UTF8String, INT2NUM(12));
-    rb_hash_aset(class_tag_map, cASN1Sequence, INT2NUM(16));
-    rb_hash_aset(class_tag_map, cASN1Set, INT2NUM(17));
-    rb_hash_aset(class_tag_map, cASN1NumericString, INT2NUM(18));
-    rb_hash_aset(class_tag_map, cASN1PrintableString, INT2NUM(19));
-    rb_hash_aset(class_tag_map, cASN1T61String, INT2NUM(20));
-    rb_hash_aset(class_tag_map, cASN1VideotexString, INT2NUM(21));
-    rb_hash_aset(class_tag_map, cASN1IA5String, INT2NUM(22));
-    rb_hash_aset(class_tag_map, cASN1UTCTime, INT2NUM(23));
-    rb_hash_aset(class_tag_map, cASN1GeneralizedTime, INT2NUM(24));
-    rb_hash_aset(class_tag_map, cASN1GraphicString, INT2NUM(25));
-    rb_hash_aset(class_tag_map, cASN1ISO64String, INT2NUM(26));
-    rb_hash_aset(class_tag_map, cASN1GeneralString, INT2NUM(27));
-    rb_hash_aset(class_tag_map, cASN1UniversalString, INT2NUM(28));
-    rb_hash_aset(class_tag_map, cASN1BMPString, INT2NUM(30));
+    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(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_global_variable(&class_tag_map);
 }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/