diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/openssl/ossl_asn1.c | 13 | ||||
| -rw-r--r-- | test/openssl/test_asn1.rb | 8 | ||||
| -rw-r--r-- | version.h | 6 |
4 files changed, 27 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Sun Jul 28 21:44:57 2013 Eric Hodel <drbrain@segment7.net> + + * 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@ruby-lang.org> * lib/rubygems: Update to RubyGems 2.0.6. [ruby-core:56160] diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c index 81881517d3..6b4d523ee3 100644 --- a/ext/openssl/ossl_asn1.c +++ b/ext/openssl/ossl_asn1.c @@ -33,15 +33,22 @@ asn1time_to_time(ASN1_TIME *time) { 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; diff --git a/test/openssl/test_asn1.rb b/test/openssl/test_asn1.rb index 736655a30b..3ea2638b0b 100644 --- a/test/openssl/test_asn1.rb +++ b/test/openssl/test_asn1.rb @@ -263,6 +263,14 @@ rEzBQ0F9dUyqQ9gyRg8KHhDfv9HzT1d/rnUZMkoombwYBRIUChGCYV0GnJcan2Zm 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*') @@ -1,10 +1,10 @@ #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" |