From 460c8907c99e2b90a5fb0cb6c18f2537fd4e60e1 Mon Sep 17 00:00:00 2001 From: emboss Date: Wed, 8 Feb 2012 01:03:16 +0000 Subject: [PATCH] * 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34469 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/openssl/ossl_asn1.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 987d277988..97ce436471 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Feb 08 09:57:33 2012 Martin Bosslet + + * 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 08 09:19:00 2012 Martin Bosslet * ext/openssl/ossl_cipher.c: Add warning about key as IV. diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c index 75d6bcbe01..5cee8066ef 100644 --- a/ext/openssl/ossl_asn1.c +++ b/ext/openssl/ossl_asn1.c @@ -1932,7 +1932,7 @@ do{\ 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);