rasn1 0.8.0 → 0.9.0

data/lib/rasn1/types/ia5string.rb

@@ -22,7 +22,7 @@ module RASN1
 
       def der_to_value(der, ber: false)
         super
-        @value.force_encoding('US-ASCII')
+        @value.to_s.force_encoding('US-ASCII')
       end
     end
   end

data/lib/rasn1/types/integer.rb

@@ -11,97 +11,117 @@ module RASN1
       # Integer id value
       ID = 2
 
-      # @overload initialize(options={})
-      #   @option options [Hash] :enum enumeration hash. Keys are names, and values
-      #     are integers.
-      #   @raise [EnumeratedError] +:default+ value is unknown when +:enum+ key is present
-      # @overload initialize(value, options={})
-      #   @param [Object] value value to set for this ASN.1 object
-      #   @option options [Hash] :enum enumeration hash. Keys are names, and values
-      #     are integers. This key is mandatory.
-      #   @raise [EnumeratedError] +:default+ value is unknown when +:enum+ key is present
+      # @option options [Hash] :enum enumeration hash. Keys are names, and values
+      #   are integers.
+      # @raise [EnumeratedError] +:default+ value is unknown when +:enum+ key is present
       # @see Base#initialize common options to all ASN.1 types
-      def initialize(value_or_options={}, options={})
+      def initialize(options={})
         super
-        @enum = @options[:enum]
-
-        return if @enum.nil?
-
-        # To ensure @value has the correct type
-        self.value = @value
-
-        case @default
-        when String, Symbol
-          raise EnumeratedError, "#{@name}: unknwon enumerated default value #@{default}" unless @enum.key? @default
-        when ::Integer
-          raise EnumeratedError, "#{@name}: default value #@{default} not in enumeration" unless @enum.value? @default
-
-          @default = @enum.key(@default)
-        when nil
-        else
-          raise TypeError, "#{@name}: #{@default.class} not handled as default value"
-        end
+        initialize_enum(@options[:enum])
       end
 
       # @param [Integer,String,Symbol,nil] v
-      # @return [String,Symbol,nil]
+      # @return [void]
       def value=(val)
+        @no_value = false
         case val
         when String, Symbol
-          raise EnumeratedError, "#{@name} has no :enum" if @enum.nil?
-          raise EnumeratedError, "#{@name}: unknwon enumerated value #{val}" unless @enum.key? val
-
-          @value = val
+          value_from_string_or_symbol(val)
         when ::Integer
-          if @enum.nil?
-            @value = val
-          elsif @enum.value? val
-            @value = @enum.key(val)
-          else
-            raise EnumeratedError, "#{@name}: #{val} not in enumeration"
-          end
+          value_from_integer(val)
         when nil
-          @value = nil
+          @no_value = true
+          @value = void_value
         else
           raise EnumeratedError, "#{@name}: not in enumeration"
         end
       end
 
+      # @return [Integer]
+      def void_value
+        0
+      end
+
       # Integer value
       # @return [Integer]
       def to_i
-        if @enum.nil?
-          @value || @default || 0
+        if @enum.empty?
+          value? ? @value : @default || 0
         else
-          @enum[@value || @default] || 0
+          @enum[value? ? @value : @default] || 0
         end
       end
 
       private
 
-      def int_value_to_der(value=nil)
-        v = value || @value
-        size = v.bit_length / 8 + ((v.bit_length % 8).positive? ? 1 : 0)
-        size = 1 if size.zero?
-        comp_value = v >= 0 ? v : (~(-v) + 1) & ((1 << (size * 8)) - 1)
+      def initialize_enum(enum)
+        @enum = enum || {}
+        return if @enum.empty?
+
+        # To ensure @value has the correct type
+        self.value = @value if value?
+
+        check_enum_default
+      end
+
+      def check_enum_default
+        case @default
+        when String, Symbol
+          raise EnumeratedError, "#{@name}: unknwon enumerated default value #@{default}" unless @enum.key?(@default)
+        when ::Integer
+          raise EnumeratedError, "#{@name}: default value #@{default} not in enumeration" unless @enum.value?(@default)
+
+          @default = @enum.key(@default)
+        when nil
+        else
+          raise TypeError, "#{@name}: #{@default.class} not handled as default value"
+        end
+      end
+
+      def value_from_string_or_symbol(val)
+        raise EnumeratedError, "#{@name} has no :enum" if @enum.empty?
+        raise EnumeratedError, "#{@name}: unknwon enumerated value #{val}" unless @enum.key? val
+
+        @value = val
+      end
+
+      def value_from_integer(val)
+        if @enum.empty?
+          @value = val
+        elsif @enum.value? val
+          @value = @enum.key(val)
+        else
+          raise EnumeratedError, "#{@name}: #{val} not in enumeration"
+        end
+      end
+
+      def int_value_to_der(value)
+        size = compute_size(value)
+        comp_value = value >= 0 ? value : (~(-value) + 1) & ((1 << (size * 8)) - 1)
         ary = comp_value.digits(256)
         # v is > 0 and its MSBit is 1. Add a 0 byte to mark it as positive
-        ary << 0 if v.positive? && (v >> (size * 8 - 1) == 1)
+        ary << 0 if value.positive? && (value >> (size * 8 - 1) == 1)
         ary.reverse.pack('C*')
       end
 
+      def compute_size(value)
+        size = value.bit_length / 8 + ((value.bit_length % 8).positive? ? 1 : 0)
+        size = 1 if size.zero?
+        size
+      end
+
       def value_to_der
         case @value
         when String, Symbol
-          int_value_to_der @enum[@value]
+          int_value_to_der(@enum[@value])
         when ::Integer
-          int_value_to_der
+          int_value_to_der(@value)
         else
           raise TypeError, "#{@name}: #{@value.class} not handled"
         end
       end
 
-      def der_to_int_value(der, ber: false)
+      def der_to_int_value(der, ber: false) # rubocop:disable Lint/UnusedMethodArgument
         ary = der.unpack('C*')
         v = ary.reduce(0) { |len, b| (len << 8) | b }
         v = -((~v & ((1 << v.bit_length) - 1)) + 1) if ary[0] & 0x80 == 0x80
@@ -110,10 +130,11 @@ module RASN1
 
       def der_to_value(der, ber: false)
         @value = der_to_int_value(der, ber: ber)
-        return if @enum.nil?
+        return if @enum.empty?
 
+        int_value = @value
         @value = @enum.key(@value)
-        raise EnumeratedError, "#{@name}: value #{v} not in enumeration" if @value.nil?
+        raise EnumeratedError, "#{@name}: value #{int_value} not in enumeration" unless value?
       end
 
       def explicit_type

data/lib/rasn1/types/null.rb

@@ -21,10 +21,11 @@ module RASN1
         ''
       end
 
-      def der_to_value(der, ber: false)
+      def der_to_value(der, ber: false) # rubocop:disable Lint/UnusedMethodArgument
         raise ASN1Error, 'NULL should not have content!' if der.length.positive?
 
-        @value = nil
+        @no_value = true
+        @value = void_value
       end
     end
   end

data/lib/rasn1/types/object_id.rb

@@ -11,7 +11,7 @@ module RASN1
       private
 
       def value_to_der
-        ids = @value.split('.').map!(&:to_i)
+        ids = @value.to_s.split('.').map!(&:to_i)
 
         raise ASN1Error, "OBJECT ID #{@name}: first subidentifier should be less than 3" if ids[0] > 2
         raise ASN1Error, "OBJECT ID #{@name}: second subidentifier should be less than 40" if (ids[0] < 2) && (ids[1] > 39)
@@ -25,7 +25,7 @@ module RASN1
         ids.flatten.pack('C*')
       end
 
-      def der_to_value(der, ber: false)
+      def der_to_value(der, ber: false) # rubocop:disable Lint/UnusedMethodArgument
         bytes = der.unpack('C*')
 
         ids = []

data/lib/rasn1/types/sequence.rb

@@ -30,23 +30,36 @@ module RASN1
       ID = 0x10
 
       # @see Base#initialize
-      def initialize(value_or_options={}, options={})
+      def initialize(options={})
         super
+        @no_value = false
         @value ||= []
       end
 
       def initialize_copy(other)
         super
-        @value = @value.map(&:dup)
+        @value = case @value
+                 when Array
+                   @value.map(&:dup)
+                 else
+                   @value.dup
+                 end
+      end
+
+      # @return [Array]
+      def void_value
+        []
       end
 
       # Get element at index +idx+, or element of name +name+
       # @param [Integer, String, Symbol] idx_or_name
-      # @return [Object]
+      # @return [Object,nil]
       def [](idx_or_name)
+        return unless @value.is_a?(Array)
+
         case idx_or_name
         when Integer
-          @value[idx]
+          @value[idx_or_name.to_i]
         when String, Symbol
           @value.find { |elt| elt.name == idx_or_name }
         end
@@ -63,7 +76,7 @@ module RASN1
         end
       end
 
-      def der_to_value(der, ber: false)
+      def der_to_value(der, ber: false) # rubocop:disable Lint/UnusedMethodArgument
         if @value.is_a?(Array) && !@value.empty?
           nb_bytes = 0
           @value.each do |element|
@@ -74,6 +87,10 @@ module RASN1
           der.length
         end
       end
+
+      def explicit_type
+        self.class.new(value: @value)
+      end
     end
   end
 end

data/lib/rasn1/types/sequence_of.rb

@@ -64,7 +64,7 @@ module RASN1
       def initialize(of_type, options={})
         super(options)
         @of_type = of_type
-        @value = []
+        @no_value = false
       end
 
       def initialize_copy(other)
@@ -73,33 +73,18 @@ module RASN1
         @value = @value.map(&:dup)
       end
 
+      # @return [Array]
+      def void_value
+        []
+      end
+
       # Add an item to SEQUENCE OF
       # @param [Array,Hash, Model]
       def <<(obj)
-        if of_type_class < Primitive
-          raise ASN1Error, 'object to add should be an Array' unless obj.is_a?(Array)
-
-          @value += obj.map { |item| @of_type.new(item) }
-        elsif composed_of_type?
-          raise ASN1Error, 'object to add should be an Array' unless obj.is_a?(Array)
-
-          new_value = of_type_class.new
-          @of_type.value.each_with_index do |type, i|
-            type2 = type.dup
-            type2.value = obj[i]
-            new_value.value << type2
-          end
-          @value << new_value
-        elsif of_type_class < Model
-          case obj
-          when Hash
-            @value << @of_type.new(obj)
-          when of_type_class
-            @value << obj
-          else
-            raise ASN1Error, "object to add should be a #{of_type_class} or a Hash"
-          end
-        end
+        return push_array_of_primitive(obj) if of_type_class < Primitive
+        return push_composed_array(obj) if composed_of_type?
+
+        push_model(obj)
       end
 
       # Get element of index +idx+
@@ -140,24 +125,22 @@ module RASN1
       end
 
       def composed_of_type?
-        [Sequence, Set].include? of_type_class
+        !@of_type.is_a?(Class) && [Sequence, Set].include?(of_type_class)
       end
 
       def value_to_der
         @value.map(&:to_der).join
       end
 
-      def der_to_value(der, ber: false)
+      def der_to_value(der, ber: false) # rubocop:disable Lint/UnusedMethodArgument
         @value = []
         nb_bytes = 0
 
         while nb_bytes < der.length
-          type = if composed_of_type?
+          type = if composed_of_type? && !@of_type.is_a?(Class)
                    @of_type.dup
-                 elsif of_type_class < Model
-                   of_type_class.new
                  else
-                   of_type_class.new(:t)
+                   of_type_class.new
                  end
           nb_bytes += type.parse!(der[nb_bytes, der.length])
           @value << type
@@ -167,6 +150,35 @@ module RASN1
       def explicit_type
         self.class.new(self.of_type)
       end
+
+      def push_array_of_primitive(obj)
+        raise ASN1Error, 'object to add should be an Array' unless obj.is_a?(Array)
+
+        @value += obj.map { |item| of_type_class.new(value: item) }
+      end
+
+      def push_composed_array(obj)
+        raise ASN1Error, 'object to add should be an Array' unless obj.is_a?(Array)
+
+        new_value = of_type_class.new
+        @of_type.value.each_with_index do |type, i|
+          type2 = type.dup
+          type2.value = obj[i]
+          new_value.value << type2
+        end
+        @value << new_value
+      end
+
+      def push_model(obj)
+        case obj
+        when Hash
+          @value << of_type_class.new(obj)
+        when of_type_class
+          @value << obj
+        else
+          raise ASN1Error, "object to add should be a #{of_type_class} or a Hash"
+        end
+      end
     end
   end
 end

data/lib/rasn1/types/utc_time.rb

@@ -33,7 +33,7 @@ module RASN1
         @value.getutc.strftime('%y%m%d%H%M%SZ')
       end
 
-      def der_to_value(der, ber: false)
+      def der_to_value(der, ber: false) # rubocop:disable Lint/UnusedMethodArgument
         format = case der.size
                  when 11
                    '%Y%m%d%H%MZ'

data/lib/rasn1/types/utf8_string.rb

@@ -22,7 +22,7 @@ module RASN1
 
       def der_to_value(der, ber: false)
         super
-        @value.force_encoding('UTF-8')
+        @value = der.force_encoding('UTF-8')
       end
     end
   end

data/lib/rasn1/types.rb

@@ -24,15 +24,16 @@ module RASN1
     # @return [Array] Return ASN.1 class as Symbol, contructed/primitive as Symbol,
     #                 ID and size of identifier octets
     def self.decode_identifier_octets(der)
-      first_octet = der[0].unpack1('C')
+      first_octet = der.unpack1('C').to_i
       asn1_class = Types::Base::CLASSES.key(first_octet & Types::Base::CLASS_MASK)
       pc = (first_octet & Types::Constructed::ASN1_PC).positive? ? :constructed : :primitive
       id = first_octet & Types::Base::MULTI_OCTETS_ID
 
       size = if id == Types::Base::MULTI_OCTETS_ID
                id = 0
-               1.upto(der.size - 1) do |i|
-                 octet = der[i].unpack1('C')
+               der.bytes.each_with_index do |octet, i|
+                 next if i.zero?
+
                  id = (id << 7) | (octet & 0x7f)
                  break i + 1 if (octet & 0x80).zero?
                end
@@ -50,18 +51,7 @@ module RASN1
     # @raise [ASN1Error] +tag+ is out of range
     def self.id2type(der)
       # Define a cache for well-known ASN.1 types
-      unless defined? @id2types
-        constructed = self.constructed - [Types::SequenceOf, Types::SetOf]
-        primitives = self.primitives - [Types::Enumerated]
-        ary = (primitives + constructed).map do |type|
-          next unless type.const_defined? :ID
-
-          [type::ID, type]
-        end
-        @id2types = Hash[ary]
-        @id2types.default = Types::Base
-        @id2types.freeze
-      end
+      self.generate_id2type_cache unless defined? @id2types
 
       asn1class, pc, id, = self.decode_identifier_octets(der)
       # cache_id: check versus class and 5 LSB bits
@@ -72,6 +62,17 @@ module RASN1
       options[:tag_value] = id if klass == Types::Base
       klass.new(options)
     end
+
+    # @private Generate cache for {.id2type}
+    def self.generate_id2type_cache
+      constructed = self.constructed - [Types::SequenceOf, Types::SetOf]
+      primitives = self.primitives - [Types::Enumerated]
+      ary = (primitives + constructed).select { |type| type.const_defined? :ID }
+                                      .map { |type| [type::ID, type] }
+      @id2types = ary.to_h
+      @id2types.default = Types::Base
+      @id2types.freeze
+    end
   end
 end
 

data/lib/rasn1/version.rb

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

data/lib/rasn1.rb

@@ -46,7 +46,7 @@ module RASN1
     until der.empty?
       type = Types.id2type(der)
       type.parse!(der, ber: ber)
-      root = type if root.nil?
+      root ||= type
 
       if [Types::Sequence, Types::Set].include? type.class
         subder = type.value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasn1
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2021-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -114,15 +114,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Ruby ASN.1 library