rasn1 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 884fa6f74d0b3074ef074d061301092d55df580b663714c4a962a7b8503d777d
-  data.tar.gz: 77cc3c5d7bf926463464ca4d37237f0cddc358e0d7b9aa3e85c15982ab3f3fc1
+  metadata.gz: 50b3f9ddc3a11279f36c21d14768a908b0fe4f22ff75d650791a7a58ac47eaa7
+  data.tar.gz: d229ea04a626e34d8411e3787101ace2c55e3cef7178b617073ed6b65fefb867
 SHA512:
-  metadata.gz: fee544874a10b10618cd596b1c30edd4ad70185a783eeadbe23a86fa2439339d7d025784be5adc76904e05856ac8791817a768c0603ece0141e38d2975e588ad
-  data.tar.gz: 39428eb166401712d44eb60c4413bcd919d4fca380213acbe1dc29c32425c03a8852e1f0afa8934f5a04c604b376ac3c47424754b358cae96cc685029c467da7
+  metadata.gz: 37ea433265c6229a89d896e47918c242b2edc48c24ffa585873e3706dfc3eaf73628b76c91bad3e15e1d969a5caf52237c92336aefdba2668f63f9468e7e2004
+  data.tar.gz: 0035453de20ea4873999ec18eb3065afa9f1fdddc2927f446ecd2b1851a3a0d1bef32b5bbc2d9029f804a57cd71fefbf95dae4cd4babae5f8491f1e9ea8057ad

data/README.md

@@ -1,4 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/rasn1.svg)](https://badge.fury.io/rb/rasn1)
+[![Action status](https://github.com/sdaubert/rasn1/workflows/ci/badge.svg?branch=master)](https://github.com/sdaubert/rasn1/actions?query=workflow%3Aci)
 
 # Rasn1
 

data/lib/rasn1/model.rb

@@ -299,6 +299,12 @@ module RASN1
     #  @param [Hash] options
     #  @return [Elem]
     #  @see Types::BitString#initialize
+    # @!method bmp_string(name, options)
+    #  @!scope class
+    #  @param [Symbol,String] name name of object in model
+    #  @param [Hash] options
+    #  @return [Elem]
+    #  @see Types::BmpString#initialize
     # @!method octet_string(name, options)
     #  @!scope class
     #  @param [Symbol,String] name name of object in model
@@ -317,6 +323,12 @@ module RASN1
     #  @param [Hash] options
     #  @return [Elem]
     #  @see Types::Enumerated#initialize
+    # @!method universal_string(name, options)
+    #  @!scope class
+    #  @param [Symbol,String] name name of object in model
+    #  @param [Hash] options
+    #  @return [Elem]
+    #  @see Types::UniversalString#initialize
     # @!method utf8_string(name, options)
     #  @!scope class
     #  @param [Symbol,String] name name of object in model

data/lib/rasn1/types/choice.rb

@@ -75,24 +75,27 @@ module RASN1
       # @return [Integer] total number of parsed bytes
       # @raise [ASN1Error] error on parsing
       def parse!(der, ber: false)
-        parsed = false
         @value.each_with_index do |element, i|
           @chosen = i
           nb_bytes = element.parse!(der, ber: ber)
-          parsed = true
           return nb_bytes
         rescue ASN1Error
           @chosen = nil
           next
         end
-        raise ASN1Error, "CHOICE #{@name}: no type matching #{der.inspect}" unless parsed
+
+        @no_value = true
+        @value = void_value
+        raise ASN1Error, "CHOICE #{@name}: no type matching #{der.inspect}" unless optional?
+
+        0
       end
 
       # @param [::Integer] level
       # @return [String]
       def inspect(level=0)
         str = common_inspect(level)
-        str << if defined? @chosen
+        str << if defined?(@chosen) && value?
                  "\n#{@value[@chosen].inspect(level + 1)}"
                else
                  ' not chosen!'

data/lib/rasn1/types/generalized_time.rb

@@ -71,19 +71,33 @@ module RASN1
       end
 
       def value_when_fraction_empty(date_hour)
-        if (date_hour[-1] != 'Z') && (date_hour !~ /[+-]\d+$/)
-          # If not UTC, have to add offset with UTC to force
-          # Strptime to generate a local time.
-          date_hour << Time.now.strftime('%z')
+        tz = if date_hour[-1] == 'Z'
+               date_hour.slice!(-1, 1)
+               '+00:00' # Ruby 3.0: to remove after end-of support of ruby 3.0
+             elsif date_hour.match?(/[+-]\d+$/)
+               # Ruby 3.0
+               # date_hour.slice!(-5, 5)
+               zone = date_hour.slice!(-5, 5)
+               zone[0, 3] << ':' << zone[3, 2]
+             end
+        year = date_hour.slice!(0, 4).to_i
+        others = date_hour.scan(/../).map(&:to_i)
+        # Ruby 3.0
+        # From 3.1: "Z" and "-0100" are supported
+        # Below 3.1: should be "-01:00" or "+00:00"
+        unless tz.nil?
+          others += [0] * (5 - others.size)
+          others << tz
         end
-
-        value_from(date_hour)
+        @value = Time.new(year, *others)
+        # From 3.1: replace all this code by: Time.new(year, *others, in: tz)
       end
 
       def value_when_fraction_ends_with_z(date_hour, fraction)
         fraction = fraction[0...-1]
         date_hour << 'Z'
-        frac_base = value_from(date_hour)
+        frac_base = compute_frac_base(date_hour)
+        value_when_fraction_empty(date_hour)
         fix_value(fraction, frac_base)
       end
 
@@ -93,42 +107,32 @@ module RASN1
           # 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 Strptime to
-          # generate a local time.
-          date_hour << Time.now.strftime('%z')
         end
 
-        frac_base = value_from(date_hour)
+        frac_base = compute_frac_base(date_hour)
+        value_when_fraction_empty(date_hour)
         fix_value(fraction, frac_base)
       end
 
-      def value_from(date_hour)
-        format, frac_base = strformat(date_hour)
-        @value = Strptime.new(format).exec(date_hour)
-        frac_base
-      end
-
       def fix_value(fraction, frac_base)
         frac = ".#{fraction}".to_r * frac_base
         @value = (@value + frac) unless fraction.nil?
       end
 
-      def strformat(date_hour)
+      def compute_frac_base(date_hour)
         case date_hour.size
-        when 11
-          ['%Y%m%d%H%z', HOUR_TO_SEC]
-        when 13, 17
-          ['%Y%m%d%H%M%z', MINUTE_TO_SEC]
+        when 10, 11
+          HOUR_TO_SEC
+        when 12, 13, 17
+          MINUTE_TO_SEC
         when 15
           if date_hour[-1] == 'Z'
-            ['%Y%m%d%H%M%S%z', SECOND_TO_SEC]
+            SECOND_TO_SEC
           else
-            ['%Y%m%d%H%z', HOUR_TO_SEC]
+            HOUR_TO_SEC
           end
-        when 19
-          ['%Y%m%d%H%M%S%z', SECOND_TO_SEC]
+        when 14, 19
+          SECOND_TO_SEC
         else
           prefix = @name.nil? ? type : "tag #{@name}"
           raise ASN1Error, "#{prefix}: unrecognized format: #{date_hour}"

data/lib/rasn1/types/universal_string.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module RASN1
+  module Types
+    # ASN.1 UniversalString
+    # @since 0.13.0
+    # @author zeroSteiner
+    class UniversalString < OctetString
+      # UniversalString id value
+      ID = 28
+
+      # Get ASN.1 type
+      # @return [String]
+      def self.type
+        'UniversalString'
+      end
+
+      private
+
+      def value_to_der
+        @value.to_s.dup.encode('UTF-32BE').b
+      end
+
+      def der_to_value(der, ber: false)
+        super
+        @value = der.to_s.dup.force_encoding('UTF-32BE')
+      end
+    end
+  end
+end

data/lib/rasn1/types.rb

@@ -128,6 +128,7 @@ require_relative 'types/null'
 require_relative 'types/object_id'
 require_relative 'types/enumerated'
 require_relative 'types/bmp_string'
+require_relative 'types/universal_string'
 require_relative 'types/utf8_string'
 require_relative 'types/numeric_string'
 require_relative 'types/printable_string'

data/lib/rasn1/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RASN1
-  VERSION = '0.12.1'
+  VERSION = '0.13.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasn1
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Sylvain Daubert
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-23 00:00:00.000000000 Z
+date: 2024-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: strptime
@@ -64,6 +64,7 @@ files:
 - lib/rasn1/types/sequence_of.rb
 - lib/rasn1/types/set.rb
 - lib/rasn1/types/set_of.rb
+- lib/rasn1/types/universal_string.rb
 - lib/rasn1/types/utc_time.rb
 - lib/rasn1/types/utf8_string.rb
 - lib/rasn1/types/visible_string.rb
@@ -77,7 +78,7 @@ metadata:
   source_code_uri: https://github.com/sdaubert/rasn1
   bug_tracker_uri: https://github.com/sdaubert/rasn1/issues
   documentation_uri: https://www.rubydoc.info/gems/rasn1
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - RASN1 - A pure ruby ASN.1 library
@@ -91,15 +92,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
-signing_key: 
+rubygems_version: 3.3.15
+signing_key:
 specification_version: 4
 summary: Ruby ASN.1 library
 test_files: []