rasn1 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8afb668f624fee248cce8fe52bd51b57dc42a88f
-  data.tar.gz: 041fe9c1bf42b220b616d4c751b7acef8e98afc8
+SHA256:
+  metadata.gz: a9745a1fe5540da0693f4e9bf5048dd177c58e314917e6d606b1caa34fa0f138
+  data.tar.gz: 67f2bc01529e894be272fb905ded771a89f8bb6eb14bc1eac86178d3e7a72148
 SHA512:
-  metadata.gz: 32f94898893e828e3bc37569bde1cea6e72c577e64748aa87e6c30ffca7065eeb0365c2f10c2d26db89ff71ca2d03f2d9c8281175544d3af0b87b6f263fec24a
-  data.tar.gz: 5261798fa1336eb18234316d4224bfb12a55fe6a6583c36fe01cc2f40eeeb68cbcb839af83d5ccd3ec031c7eb72c2d50143568ce267ce03587dc28020e564f6f
+  metadata.gz: dc403f68a96560969a2221bc255e9f9f56dacb90f174977067054830dd0b85afc53dd8c25b130ddda3d38b6fc8e3d9d6341e9e5a805dda59ea4b478d3b960a78
+  data.tar.gz: 201e5f5255a2ebb2a2d26c9fe2a75d9fed7f72d5e32f6ceb712e4ff0d01c81b38a896c31ee6bf446f74b9065f5ef6bab5cecdbf55e236dc53b53015ee959ee58

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
 install:
   - bundle install --path vendor/bundle --jobs=3 --retry=3
 script:

data/README.md

@@ -3,7 +3,7 @@
 
 # Rasn1
 
-Rasn1 will be a ruby ASN.1 library to encode, parse and decode ASN.1 data in DER format.
+Rasn1 is a ruby ASN.1 library to encode, parse and decode ASN.1 data in DER format.
 
 ## Installation
 

data/lib/rasn1/types.rb

@@ -67,3 +67,5 @@ require_relative 'types/set'
 require_relative 'types/set_of'
 require_relative 'types/choice'
 require_relative 'types/any'
+require_relative 'types/utc_time'
+require_relative 'types/generalized_time'

data/lib/rasn1/types/generalized_time.rb

@@ -0,0 +1,111 @@
+module RASN1
+  module Types
+
+    # ASN.1 GeneralizedTime
+    #
+    # +{#value} of a {GeneralizedTime} should be a ruby Time.
+    #
+    # ===Notes
+    # When encoding, resulting string is always a UTC time, appended with +Z+.
+    # Minutes and seconds are always generated. Fractions of second are generated
+    # if value Time object have them.
+    #
+    # On parsing, are supported:
+    # * UTC times (ending with +Z+),
+    # * local times (no suffix),
+    # * local times with difference between UTC and this local time (ending with
+    #   +sHHMM+, where +s+ is +++ or +-+, and +HHMM+ is the time differential
+    #   betwen UTC and local time).
+    # These times may include minutes and seconds. Fractions of hour, minute and
+    # second are supported.
+    # @author Sylvain Daubert
+    class GeneralizedTime < Primitive
+      TAG = 24
+
+      # Get ASN.1 type
+      # @return [String]
+      def self.type
+        'GeneralizedTime'
+      end
+
+      private
+      
+      def value_to_der
+        if @value.nsec > 0
+          der = @value.getutc.strftime('%Y%m%d%H%M%S.%9NZ')
+          der.sub(/0+Z/, 'Z')
+        else
+          @value.getutc.strftime('%Y%m%d%H%M%SZ')
+        end
+      end
+      
+      def der_to_value(der, ber: false)
+        date_hour, fraction = der.split('.')
+        utc_offset_forced = false
+        if fraction.nil?
+          if date_hour[-1] != 'Z' and date_hour !~ /[+-]\d+$/
+            # If not UTC, have to add offset with UTC to force
+            # DateTime#strptime to generate a local time. But this difference
+            # may be errored because of DST.
+            date_hour << Time.now.strftime('%z')
+            utc_offset_forced = true
+          end
+        else
+          if fraction[-1] == 'Z'
+            fraction = fraction[0...-1]
+            date_hour << 'Z'
+          else
+            match = fraction.match(/(\d+)([+-]\d+)/)
+            if match
+              # fraction contains fraction and timezone info. Split them
+              fraction = match[1]
+              date_hour << match[2]
+            else
+              # fraction only contains fraction.
+              # Have to add offset with UTC to force DateTime#strptime to
+              # generate a local time. But this difference may be errored
+              # because of DST.
+              date_hour << Time.now.strftime('%z')
+              utc_offset_forced = true
+            end
+          end
+        end
+        format = case date_hour.size
+                 when 11
+                   frac_base = 60*60
+                   '%Y%m%d%HZ'
+                 when 13
+                   frac_base = 60
+                   '%Y%m%d%H%MZ'
+                 when 15
+                   if date_hour[-1] == 'Z'
+                     frac_base = 1
+                     '%Y%m%d%H%M%SZ'
+                   else
+                     frac_base = 60 * 60
+                     '%Y%m%d%H%z'
+                   end
+                 when 17
+                   frac_base = 60
+                   '%Y%m%d%H%M%z'
+                 when 19
+                   frac_base = 1
+                   '%Y%m%d%H%M%S%z'
+                 else
+                   prefix = @name.nil? ? type : "tag #{@name}"
+                   raise ASN1Error, "#{prefix}: unrecognized format: #{der}"
+                 end
+        @value = DateTime.strptime(date_hour, format).to_time
+        # local time format.
+        # Check DST. There may be a shift of one hour...
+        if utc_offset_forced
+          compare_time = Time.new(*@value.to_a[0..5].reverse)
+          if compare_time.utc_offset != @value.utc_offset
+            @value = compare_time
+          end
+        end
+        @value += ".#{fraction}".to_r * frac_base unless fraction.nil?
+      end
+    end
+  end
+end

data/lib/rasn1/types/utc_time.rb

@@ -0,0 +1,53 @@
+require 'date'
+
+module RASN1
+  module Types
+
+    # ASN.1 UTCTime
+    #
+    # +{#value} of a +UtcTime+ should be a ruby Time.
+    #
+    # ===Notes
+    # When encoding, resulting string is always a UTC time, appended with +Z+.
+    # Seconds are always generated.
+    #
+    # On parsing, UTC times (ending with +Z+) and local times (ending with
+    # +sHHMM+, where +s+ is +++ or +-+, and +HHMM+ is the time differential
+    # betwen UTC and local time) are both supported. Seconds may be present or
+    # not.
+    # @author Sylvain Daubert
+    class UtcTime < Primitive
+      TAG = 23
+
+      # Get ASN.1 type
+      # @return [String]
+      def self.type
+        'UTCTime'
+      end
+
+      private
+      
+      def value_to_der
+        @value.getutc.strftime('%y%m%d%H%M%SZ')
+      end
+      
+      def der_to_value(der, ber: false)
+        format = case der.size
+                 when 11
+                   '%Y%m%d%H%MZ'
+                 when 13
+                   '%Y%m%d%H%M%SZ'
+                 when 15
+                   '%Y%m%d%H%M%z'
+                 when 17
+                   '%Y%m%d%H%M%S%z'
+                 else
+                   prefix = @name.nil? ? type : "tag #{@name}"
+                   raise ASN1Error, "#{prefix}: unrecognized format: #{der}"
+                 end
+        century = (Time.now.year / 100).to_s
+        @value = DateTime.strptime(century + der, format).to_time
+      end
+    end
+  end
+end

data/lib/rasn1/version.rb

@@ -1,3 +1,3 @@
 module RASN1
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/rasn1.gemspec

@@ -11,7 +11,10 @@ Gem::Specification.new do |spec|
   spec.email         = ['sylvain.daubert@laposte.net']
 
   spec.summary       = %q{Ruby ASN.1 library}
-  #spec.description   = %q{TODO: Write a longer description or delete this line.}
+  spec.description   = %q{
+  RASN1 is a pure ruby ASN.1 library. It may encode and decode DER and BER
+  encodings.
+}
   spec.homepage      = 'https://github.com/sdaubert/rasn1'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasn1
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-23 00:00:00.000000000 Z
+date: 2018-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -80,7 +80,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-description: 
+description: |2
+
+    RASN1 is a pure ruby ASN.1 library. It may encode and decode DER and BER
+    encodings.
 email:
 - sylvain.daubert@laposte.net
 executables: []
@@ -103,6 +106,7 @@ files:
 - lib/rasn1/types/choice.rb
 - lib/rasn1/types/constructed.rb
 - lib/rasn1/types/enumerated.rb
+- lib/rasn1/types/generalized_time.rb
 - lib/rasn1/types/ia5string.rb
 - lib/rasn1/types/integer.rb
 - lib/rasn1/types/null.rb
@@ -115,6 +119,7 @@ files:
 - lib/rasn1/types/sequence_of.rb
 - lib/rasn1/types/set.rb
 - lib/rasn1/types/set_of.rb
+- lib/rasn1/types/utc_time.rb
 - lib/rasn1/types/utf8_string.rb
 - lib/rasn1/types/visible_string.rb
 - lib/rasn1/version.rb
@@ -139,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby ASN.1 library