rasn1 0.6.6 → 0.8.0

data/lib/rasn1/types/null.rb

@@ -1,18 +1,17 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 Null
     # @author Sylvain Daubert
     class Null < Primitive
-      TAG = 0x05
+      # Null id value
+      ID = 0x05
 
       # @return [String]
       def inspect(level=0)
-        str = ''
-        str << '  ' * level if level > 0
-        str << "#{@name} " unless @name.nil?
-        str << "#{type}"
-        str << " OPTIONAL" if optional?
+        str = common_inspect(level)[0..-2] # remove terminal ':'
+        str << ' OPTIONAL' if optional?
         str
       end
 
@@ -23,7 +22,8 @@ module RASN1
       end
 
       def der_to_value(der, ber: false)
-        raise ASN1Error, "NULL TAG should not have content!" if der.length > 0
+        raise ASN1Error, 'NULL should not have content!' if der.length.positive?
+
         @value = nil
       end
     end

data/lib/rasn1/types/numeric_string.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 Numeric String
     # @author Sylvain Daubert
     class NumericString < OctetString
-      TAG = 18
+      # NumericString id value
+      ID = 18
 
       # Get ASN.1 type
       # @return [String]
@@ -13,21 +15,19 @@ module RASN1
       end
 
       private
-      
+
       def value_to_der
         check_characters
         @value.to_s.force_encoding('BINARY')
       end
 
-      def der_to_value(der, ber:false)
+      def der_to_value(der, ber: false)
         super
         check_characters
       end
 
       def check_characters
-        if @value.to_s =~ /([^0-9 ])/
-          raise ASN1Error, "NUMERIC STRING #@name: invalid character: '#{$1}'"
-        end
+        raise ASN1Error, "NUMERIC STRING #{@name}: invalid character: '#{$1}'" if @value.to_s =~ /([^0-9 ])/
       end
     end
   end

data/lib/rasn1/types/object_id.rb

@@ -1,77 +1,47 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 Object ID
     # @author Sylvain Daubert
     class ObjectId < Primitive
-      TAG = 6
+      # ObjectId id value
+      ID = 6
 
       private
 
       def value_to_der
-        ids = @value.split('.').map! { |str| str.to_i }
+        ids = @value.split('.').map!(&:to_i)
 
-        if ids[0] > 2
-          raise ASN1Error, 'OBJECT ID #@name: first subidentifier should be less than 3'
-        end
-        if ids[0] < 2 and ids[1] > 39
-          raise ASN1Error, 'OBJECT ID #@name: second subidentifier should be less than 40'
-        end
+        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)
 
         ids[0, 2] = ids[0] * 40 + ids[1]
         ids.map! do |v|
           next v if v < 128
 
-          ary = []
-          while v > 0
-            ary.unshift (v & 0x7f) | 0x80
-            v >>= 7
-          end
-          ary[-1] &= 0x7f
-          ary
+          unsigned_to_chained_octets(v)
         end
         ids.flatten.pack('C*')
       end
 
       def der_to_value(der, ber: false)
         bytes = der.unpack('C*')
-        ids = if bytes[0] < 80
-                remove = 1
-                [ bytes[0] / 40, bytes[0] % 40]
-              elsif bytes[0] < 128
-                remove = 1
-                [2, bytes[0] - 80]
-              else
-                remove = 1
-                second_id = bytes[0] & 0x7f
-                bytes[1..-1].each do |byte|
-                  remove += 1
-                  second_id <<= 7
-                  if byte < 128
-                    second_id |= byte
-                    break
-                  else
-                    second_id |= byte & 0x7f
-                  end
-                end
-                [2, second_id - 80]
-              end
 
-        id = 0
-        bytes.shift(remove)
+        ids = []
+        current_id = 0
         bytes.each do |byte|
-          if byte < 128
-            if id == 0
-              ids << byte
-            else
-              ids << ((id << 7) | byte)
-              id = 0
-            end
-          else
-            id = (id << 7) | (byte & 0x7f)
+          current_id = (current_id << 7) | (byte & 0x7f)
+          if (byte & 0x80).zero?
+            ids << current_id
+            current_id = 0
           end
         end
 
+        first_id = [2, ids.first / 40].min
+        second_id = ids.first - first_id * 40
+        ids[0..0] = [first_id, second_id]
+
         @value = ids.join('.')
       end
     end

data/lib/rasn1/types/octet_string.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 Octet String
     #
     # An OCTET STRINT may contain another primtive object:
@@ -11,13 +12,12 @@ module RASN1
     #  os.to_der   # => DER string with INTEGER in OCTET STRING
     # @author Sylvain Daubert
     class OctetString < Primitive
-      TAG = 0x04
+      # OctetString id value
+      ID = 4
 
       def inspect(level=0)
-        str = ''
-        str << '  ' * level if level > 0
-        str << "#{@name} " unless @name.nil?
-        str << "#{type}: #{value.inspect}"
+        str = common_inspect(level)
+        str << " #{value.inspect}"
       end
     end
   end

data/lib/rasn1/types/primitive.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # @abstract This class SHOULD be used as base class for all ASN.1 primitive
     #  types.
     # @author Sylvain Daubert

data/lib/rasn1/types/printable_string.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 Printable String
     # @author Sylvain Daubert
     class PrintableString < OctetString
-      TAG = 19
+      # PrintableString id value
+      ID = 19
 
       # Get ASN.1 type
       # @return [String]
@@ -13,21 +15,20 @@ module RASN1
       end
 
       private
-      
+
       def value_to_der
         check_characters
         @value.to_s.force_encoding('BINARY')
       end
 
-      def der_to_value(der, ber:false)
+      def der_to_value(der, ber: false)
         super
         check_characters
       end
 
       def check_characters
-        if @value.to_s =~ /([^a-zA-Z0-9 '=\(\)\+,\-\.\/:\?])/
-          raise ASN1Error, "PRINTABLE STRING #@name: invalid character: '#{$1}'"
-        end
+        m = @value.to_s.match(%r{([^a-zA-Z0-9 '=()+,\-./:?])})
+        raise ASN1Error, "PRINTABLE STRING #{@name}: invalid character: '#{m[1]}'" if m
       end
     end
   end

data/lib/rasn1/types/sequence.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 sequence
     #
     # A sequence is a collection of another ASN.1 types.
@@ -25,7 +26,8 @@ module RASN1
     #  seq.value    # => String
     # @author Sylvain Daubert
     class Sequence < Constructed
-      TAG = 0x10
+      # Sequence id value
+      ID = 0x10
 
       # @see Base#initialize
       def initialize(value_or_options={}, options={})
@@ -35,7 +37,19 @@ module RASN1
 
       def initialize_copy(other)
         super
-        @value = @value.map { |v| v.dup }
+        @value = @value.map(&:dup)
+      end
+
+      # Get element at index +idx+, or element of name +name+
+      # @param [Integer, String, Symbol] idx_or_name
+      # @return [Object]
+      def [](idx_or_name)
+        case idx_or_name
+        when Integer
+          @value[idx]
+        when String, Symbol
+          @value.find { |elt| elt.name == idx_or_name }
+        end
       end
 
       private
@@ -43,14 +57,14 @@ module RASN1
       def value_to_der
         case @value
         when Array
-          @value.map { |element| element.to_der }.join
+          @value.map(&:to_der).join
         else
           @value.to_s
         end
       end
 
-      def der_to_value(der, ber:false)
-        if @value.is_a?(Array) and !@value.empty?
+      def der_to_value(der, ber: false)
+        if @value.is_a?(Array) && !@value.empty?
           nb_bytes = 0
           @value.each do |element|
             nb_bytes += element.parse!(der[nb_bytes..-1])
@@ -58,7 +72,7 @@ module RASN1
         else
           @value = der
           der.length
-        end 
+        end
       end
     end
   end

data/lib/rasn1/types/sequence_of.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 SEQUENCE OF
     #
     # A SEQUENCE OF is an array of one ASN.1 type.
@@ -45,7 +46,8 @@ module RASN1
     #  seqof[0][:int].value    # => 12
     # @author Sylvain Daubert
     class SequenceOf < Constructed
-      TAG = Sequence::TAG
+      # SequenceOf id value
+      ID = Sequence::ID
 
       # @return [Class, Base]
       attr_reader :of_type
@@ -68,7 +70,7 @@ module RASN1
       def initialize_copy(other)
         super
         @of_type = @of_type.dup
-        @value = @value.map { |v| v.dup }
+        @value = @value.map(&:dup)
       end
 
       # Add an item to SEQUENCE OF
@@ -76,9 +78,11 @@ module RASN1
       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
@@ -112,17 +116,15 @@ module RASN1
       end
 
       def inspect(level=0)
-        str = ''
-        str << '  ' * level if level > 0
-        str << "#{@name} " unless @name.nil?
-        level = level.abs
-        str << "#{type}:\n"
-        level += 1
+        str = common_inspect(level)
+        str << "\n"
+        level = level.abs + 1
         @value.each do |item|
           case item
           when Base, Model
-            next if item.optional? and item.value.nil?
-            str << "#{item.inspect(level)}"
+            next if item.optional? && item.value.nil?
+
+            str << item.inspect(level)
             str << "\n" unless str.end_with?("\n")
           else
             str << '  ' * level + "#{item.inspect}\n"
@@ -142,10 +144,10 @@ module RASN1
       end
 
       def value_to_der
-        @value.map { |v| v.to_der }.join
+        @value.map(&:to_der).join
       end
 
-      def der_to_value(der, ber:false)
+      def der_to_value(der, ber: false)
         @value = []
         nb_bytes = 0
 

data/lib/rasn1/types/set.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 set
     #
     # A set is a collection of another ASN.1 types.
@@ -20,7 +21,8 @@ module RASN1
     #              ]
     # @author Sylvain Daubert
     class Set < Sequence
-      TAG = 0x11
+      # Set id value
+      ID = 0x11
     end
   end
 end

data/lib/rasn1/types/set_of.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 SET OF
     # @author Sylvain Daubert
     class SetOf < SequenceOf
-      TAG = Set::TAG
+      # SetOf id value
+      ID = Set::ID
 
       # A SET OF is encoded as a SET.
       # @return ['SET']
@@ -14,4 +16,3 @@ module RASN1
     end
   end
 end
-

data/lib/rasn1/types/utc_time.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 require 'date'
 
 module RASN1
   module Types
-
     # ASN.1 UTCTime
     #
     # +{#value} of a +UtcTime+ should be a ruby Time.
@@ -17,7 +18,8 @@ module RASN1
     # not.
     # @author Sylvain Daubert
     class UtcTime < Primitive
-      TAG = 23
+      # UtcTime id value
+      ID = 23
 
       # Get ASN.1 type
       # @return [String]
@@ -26,11 +28,11 @@ module RASN1
       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