naruse	2012-02-08 10:36:19 +0900 (Wed, 08 Feb 2012)

  New Revision: 34472

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

  Log:
    merge revision(s) 34469: [Backport #5982]
    
    * ext/openssl/ossl_asn1.c: Call INT2NUM only once for GeneralString.
      Thanks to Mantas Mikulenas for noticing and providing a patch!
      [ruby-core:42358] [Bug #5972]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/openssl/ossl_asn1.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34471)
+++ ruby_1_9_3/ChangeLog	(revision 34472)
@@ -1,3 +1,9 @@
+Wed Feb 08 09:57:33 2012  Martin Bosslet  <Martin.Bosslet@g...>
+
+	* ext/openssl/ossl_asn1.c: Call INT2NUM only once for GeneralString.
+	  Thanks to Mantas Mikulenas for noticing and providing a patch!
+	  [ruby-core:42358] [Bug #5972]
+
 Wed Feb  8 10:34:59 2012  TAKAO Kouji  <kouji@t...>
 
 	* ext/readline/readline.c (readline_attempted_completion_function):
Index: ruby_1_9_3/ext/openssl/ossl_asn1.c
===================================================================
--- ruby_1_9_3/ext/openssl/ossl_asn1.c	(revision 34471)
+++ ruby_1_9_3/ext/openssl/ossl_asn1.c	(revision 34472)
@@ -1932,7 +1932,7 @@
     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, 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_global_variable(&class_tag_map);
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34471)
+++ ruby_1_9_3/version.h	(revision 34472)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 55
+#define RUBY_PATCHLEVEL 56
 
 #define RUBY_RELEASE_DATE "2012-02-08"
 #define RUBY_RELEASE_YEAR 2012

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