nagachika	2013-07-28 21:49:00 +0900 (Sun, 28 Jul 2013)

  New Revision: 42215

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

  Log:
    merge revision(s) 42126: [Backport #8664]
    
    * ext/openssl/ossl_asn1.c (asn1time_to_time):  Implement YYMMDDhhmmZ
      format for ASN.1 UTCTime.  [ruby-trunk - Bug #8664]
    
    * test/openssl/test_asn1.rb:  Test for the above.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/ext/openssl/ossl_asn1.c
    branches/ruby_2_0_0/test/openssl/test_asn1.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 42214)
+++ ruby_2_0_0/ChangeLog	(revision 42215)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Jul 28 21:44:57 2013  Eric Hodel  <drbrain@s...>
+
+	* ext/openssl/ossl_asn1.c (asn1time_to_time):  Implement YYMMDDhhmmZ
+	  format for ASN.1 UTCTime.  [ruby-trunk - Bug #8664]
+	* test/openssl/test_asn1.rb:  Test for the above.
+
 Fri Jul 26 00:38:58 2013  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* lib/rubygems: Update to RubyGems 2.0.6. [ruby-core:56160]
Index: ruby_2_0_0/ext/openssl/ossl_asn1.c
===================================================================
--- ruby_2_0_0/ext/openssl/ossl_asn1.c	(revision 42214)
+++ ruby_2_0_0/ext/openssl/ossl_asn1.c	(revision 42215)
@@ -33,15 +33,22 @@ asn1time_to_time(ASN1_TIME *time) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/openssl/ossl_asn1.c#L33
 {
     struct tm tm;
     VALUE argv[6];
+    int count;
 
     if (!time || !time->data) return Qnil;
     memset(&tm, 0, sizeof(struct tm));
 
     switch (time->type) {
     case V_ASN1_UTCTIME:
-	if (sscanf((const char *)time->data, "%2d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
-    		&tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
-	    ossl_raise(rb_eTypeError, "bad UTCTIME format");
+	count = sscanf((const char *)time->data, "%2d%2d%2d%2d%2d%2dZ",
+		&tm.tm_year, &tm.tm_mon, &tm.tm_mday, &tm.tm_hour, &tm.tm_min,
+		&tm.tm_sec);
+
+	if (count == 5) {
+	    tm.tm_sec = 0;
+	} else if (count != 6) {
+	    ossl_raise(rb_eTypeError, "bad UTCTIME format: \"%s\"",
+		    time->data);
 	}
 	if (tm.tm_year < 69) {
 	    tm.tm_year += 2000;
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 42214)
+++ ruby_2_0_0/version.h	(revision 42215)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-07-26"
-#define RUBY_PATCHLEVEL 280
+#define RUBY_RELEASE_DATE "2013-07-28"
+#define RUBY_PATCHLEVEL 281
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_DAY 28
 
 #include "ruby/version.h"
 
Index: ruby_2_0_0/test/openssl/test_asn1.rb
===================================================================
--- ruby_2_0_0/test/openssl/test_asn1.rb	(revision 42214)
+++ ruby_2_0_0/test/openssl/test_asn1.rb	(revision 42215)
@@ -263,6 +263,14 @@ rEzBQ0F9dUyqQ9gyRg8KHhDfv9HzT1d/rnUZMkoo https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/openssl/test_asn1.rb#L263
     end
   end
 
+  def test_decode_utctime
+    expected = Time.at 1374535380
+    assert_equal expected, OpenSSL::ASN1.decode("\x17\v1307222323Z").value
+
+    expected += 17
+    assert_equal expected, OpenSSL::ASN1.decode("\x17\r130722232317Z").value
+  end
+
   def test_create_inf_length_primitive
     expected = %w{ 24 80 04 01 61 00 00 }
     raw = [expected.join('')].pack('H*')

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r42126


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