rasn1 0.7.1 → 0.8.0

data/lib/rasn1/types/bit_string.rb

@@ -5,8 +5,8 @@ module RASN1
     # ASN.1 Bit String
     # @author Sylvain Daubert
     class BitString < Primitive
-      # BitString tag value
-      TAG = 0x03
+      # BitString id value
+      ID = 3
 
       # @param [Integer] bit_length
       # @return [Integer]
@@ -24,14 +24,12 @@ module RASN1
       # @see Base#initialize common options to all ASN.1 types
       def initialize(value_or_options={}, options={})
         super
-        opts = value_or_options.is_a?(Hash) ? value_or_options : options
         if @default
-          if opts[:bit_length].nil?
-            raise ASN1Error, "TAG #{@name}: default bit length is not defined"
-          end
-          @default_bit_length = opts[:bit_length]
+          raise ASN1Error, "#{@name}: default bit length is not defined" if @options[:bit_length].nil?
+
+          @default_bit_length = @options[:bit_length]
         end
-        @bit_length = opts[:bit_length]
+        @bit_length = @options[:bit_length]
       end
 
       # Get bit length
@@ -52,14 +50,14 @@ module RASN1
 
       private
 
-      def build_tag?
+      def can_build?
         !(!@default.nil? && (@value.nil? || (@value == @default) &&
                               (@bit_length == @default_bit_length))) &&
           !(optional? && @value.nil?)
       end
 
       def value_to_der
-        raise ASN1Error, "TAG #{@name}: bit length is not set" if bit_length.nil?
+        raise ASN1Error, "#{@name}: bit length is not set" if bit_length.nil?
 
         @value << "\x00" while @value.length * 8 < @bit_length
         @value.force_encoding('BINARY')
@@ -73,7 +71,7 @@ module RASN1
         der = [unused, @value].pack('CA*')
 
         if unused.positive?
-          last_byte = @value[-1].unpack('C').first
+          last_byte = @value[-1].unpack1('C')
           last_byte &= (0xff >> unused) << unused
           der[-1] = [last_byte].pack('C')
         end

data/lib/rasn1/types/boolean.rb

@@ -5,8 +5,8 @@ module RASN1
     # ASN.1 Boolean
     # @author Sylvain Daubert
     class Boolean < Primitive
-      # Boolean tag value
-      TAG = 0x01
+      # Boolean id value
+      ID = 0x01
 
       # @private
       DER_TRUE = 0xff
@@ -22,7 +22,7 @@ module RASN1
       def der_to_value(der, ber: false)
         raise ASN1Error, "tag #{@name}: BOOLEAN should have a length of 1" unless der.size == 1
 
-        bool = der.unpack('C').first
+        bool = der.unpack1('C')
         case bool
         when DER_FALSE
           @value = false

data/lib/rasn1/types/choice.rb

@@ -79,7 +79,7 @@ module RASN1
         @value.each_with_index do |element, i|
           begin
             @chosen = i
-            nb_bytes = element.parse!(der)
+            nb_bytes = element.parse!(der, ber: ber)
             parsed = true
             return nb_bytes
           rescue ASN1Error

data/lib/rasn1/types/constructed.rb

@@ -23,7 +23,8 @@ module RASN1
 
               str << "#{item.inspect(level)}\n"
             else
-              str << '  ' * level + item.inspect + "\n"
+              str << '  ' * level
+              str << "#{item.inspect}\n"
             end
           end
           str

data/lib/rasn1/types/enumerated.rb

@@ -22,8 +22,8 @@ module RASN1
       # @!attribute enum
       # @return [Hash]
 
-      # Enumerated tag value
-      TAG = 0x0a
+      # Enumerated id value
+      ID = 0x0a
 
       # @overload initialize(options={})
       #   @option options [Hash] :enum enumeration hash. Keys are names, and values

data/lib/rasn1/types/generalized_time.rb

@@ -21,8 +21,8 @@ module RASN1
     # second are supported.
     # @author Sylvain Daubert
     class GeneralizedTime < Primitive
-      # GeneralizedTime tag value
-      TAG = 24
+      # GeneralizedTime id value
+      ID = 24
 
       # Get ASN.1 type
       # @return [String]

data/lib/rasn1/types/ia5string.rb

@@ -5,8 +5,8 @@ module RASN1
     # ASN.1 IA5 String
     # @author Sylvain Daubert
     class IA5String < OctetString
-      # IA5String tag value
-      TAG = 22
+      # IA5String id value
+      ID = 22
 
       # Get ASN.1 type
       # @return [String]

data/lib/rasn1/types/integer.rb

@@ -8,8 +8,8 @@ module RASN1
       # @return [Hash,nil]
       attr_reader :enum
 
-      # Integer tag value
-      TAG = 0x02
+      # Integer id value
+      ID = 2
 
       # @overload initialize(options={})
       #   @option options [Hash] :enum enumeration hash. Keys are names, and values
@@ -23,8 +23,7 @@ module RASN1
       # @see Base#initialize common options to all ASN.1 types
       def initialize(value_or_options={}, options={})
         super
-        opts = value_or_options.is_a?(Hash) ? value_or_options : options
-        @enum = opts[:enum]
+        @enum = @options[:enum]
 
         return if @enum.nil?
 
@@ -33,44 +32,38 @@ module RASN1
 
         case @default
         when String, Symbol
-          unless @enum.key? @default
-            raise EnumeratedError, "TAG #{@name}: unknwon enumerated default value #@{default}"
-          end
+          raise EnumeratedError, "#{@name}: unknwon enumerated default value #@{default}" unless @enum.key? @default
         when ::Integer
-          if @enum.value? @default
-            @default = @enum.key(@default)
-          else
-            raise EnumeratedError, "TAG #{@name}: default value #@{default} not in enumeration"
-          end
+          raise EnumeratedError, "#{@name}: default value #@{default} not in enumeration" unless @enum.value? @default
+
+          @default = @enum.key(@default)
         when nil
         else
-          raise TypeError, "TAG #{@name}: #{@default.class} not handled as default value"
+          raise TypeError, "#{@name}: #{@default.class} not handled as default value"
         end
       end
 
       # @param [Integer,String,Symbol,nil] v
       # @return [String,Symbol,nil]
-      def value=(v)
-        case v
-        when String,Symbol
-          raise EnumeratedError, "TAG #{@name} has no :enum" if @enum.nil?
+      def value=(val)
+        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
 
-          unless @enum.key? v
-            raise EnumeratedError, "TAG #{@name}: unknwon enumerated value #{v}"
-          end
-          @value = v
+          @value = val
         when ::Integer
           if @enum.nil?
-            @value = v
-          elsif @enum.value? v
-            @value = @enum.key(v)
+            @value = val
+          elsif @enum.value? val
+            @value = @enum.key(val)
           else
-            raise EnumeratedError, "TAG #{@name}: #{v} not in enumeration"
+            raise EnumeratedError, "#{@name}: #{val} not in enumeration"
           end
         when nil
           @value = nil
         else
-          raise EnumeratedError, "TAG #{@name}: not in enumeration"
+          raise EnumeratedError, "#{@name}: not in enumeration"
         end
       end
 
@@ -90,16 +83,10 @@ module RASN1
         v = value || @value
         size = v.bit_length / 8 + ((v.bit_length % 8).positive? ? 1 : 0)
         size = 1 if size.zero?
-        comp_value = if v.positive?
-                       # If MSB is 1, increment size to set initial octet
-                       # to 0 to amrk it as a positive integer
-                       size += 1 if v >> (size * 8 - 1) == 1
-                       v
-                     else
-                       ~v.abs + 1
-                     end
-        ary = []
-        size.times { ary << (comp_value & 0xff); comp_value >>= 8 }
+        comp_value = v >= 0 ? v : (~(-v) + 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.reverse.pack('C*')
       end
 
@@ -110,16 +97,14 @@ module RASN1
         when ::Integer
           int_value_to_der
         else
-          raise TypeError, "TAG #{@name}: #{@value.class} not handled"
+          raise TypeError, "#{@name}: #{@value.class} not handled"
         end
       end
 
       def der_to_int_value(der, ber: false)
         ary = der.unpack('C*')
         v = ary.reduce(0) { |len, b| (len << 8) | b }
-        if ary[0] & 0x80 == 0x80
-          v = -((~v & ((1 << v.bit_length) - 1)) + 1)
-        end
+        v = -((~v & ((1 << v.bit_length) - 1)) + 1) if ary[0] & 0x80 == 0x80
         v
       end
 
@@ -128,7 +113,7 @@ module RASN1
         return if @enum.nil?
 
         @value = @enum.key(@value)
-        raise EnumeratedError, "TAG #{@name}: value #{v} not in enumeration" if @value.nil?
+        raise EnumeratedError, "#{@name}: value #{v} not in enumeration" if @value.nil?
       end
 
       def explicit_type

data/lib/rasn1/types/null.rb

@@ -5,8 +5,8 @@ module RASN1
     # ASN.1 Null
     # @author Sylvain Daubert
     class Null < Primitive
-      # Null tag value
-      TAG = 0x05
+      # Null id value
+      ID = 0x05
 
       # @return [String]
       def inspect(level=0)
@@ -22,7 +22,7 @@ module RASN1
       end
 
       def der_to_value(der, ber: false)
-        raise ASN1Error, 'NULL TAG should not have content!' if der.length.positive?
+        raise ASN1Error, 'NULL should not have content!' if der.length.positive?
 
         @value = nil
       end

data/lib/rasn1/types/numeric_string.rb

@@ -5,8 +5,8 @@ module RASN1
     # ASN.1 Numeric String
     # @author Sylvain Daubert
     class NumericString < OctetString
-      # NumericString tag value
-      TAG = 18
+      # NumericString id value
+      ID = 18
 
       # Get ASN.1 type
       # @return [String]
@@ -21,15 +21,13 @@ module RASN1
         @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

@@ -2,77 +2,46 @@
 
 module RASN1
   module Types
-
     # ASN.1 Object ID
     # @author Sylvain Daubert
     class ObjectId < Primitive
-      # ObjectId tag value
-      TAG = 6
+      # ObjectId id value
+      ID = 6
 
       private
 
       def value_to_der
         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) && (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.positive?
-            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*')
-        nr_bytes_to_remove = 1
-        ids = if bytes[0] < 80
-                [bytes[0] / 40, bytes[0] % 40]
-              elsif bytes[0] < 128
-                [2, bytes[0] - 80]
-              else
-                second_id = bytes[0] & 0x7f
-                bytes[1..-1].each do |byte|
-                  nr_bytes_to_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(nr_bytes_to_remove)
+        ids = []
+        current_id = 0
         bytes.each do |byte|
-          if byte < 128
-            if id.zero?
-              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

@@ -12,8 +12,8 @@ module RASN1
     #  os.to_der   # => DER string with INTEGER in OCTET STRING
     # @author Sylvain Daubert
     class OctetString < Primitive
-      # OctetString tag value
-      TAG = 0x04
+      # OctetString id value
+      ID = 4
 
       def inspect(level=0)
         str = common_inspect(level)

data/lib/rasn1/types/printable_string.rb

@@ -5,8 +5,8 @@ module RASN1
     # ASN.1 Printable String
     # @author Sylvain Daubert
     class PrintableString < OctetString
-      # PrintableString tag value
-      TAG = 19
+      # PrintableString id value
+      ID = 19
 
       # Get ASN.1 type
       # @return [String]
@@ -21,15 +21,14 @@ module RASN1
         @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

@@ -26,8 +26,8 @@ module RASN1
     #  seq.value    # => String
     # @author Sylvain Daubert
     class Sequence < Constructed
-      # Sequence tag value
-      TAG = 0x10
+      # Sequence id value
+      ID = 0x10
 
       # @see Base#initialize
       def initialize(value_or_options={}, options={})