rasn1 0.6.6 → 0.8.0

data/lib/rasn1/types/bit_string.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 Bit String
     # @author Sylvain Daubert
     class BitString < Primitive
-      TAG = 0x03
+      # BitString id value
+      ID = 3
 
       # @param [Integer] bit_length
       # @return [Integer]
@@ -22,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
@@ -44,38 +44,34 @@ module RASN1
       # @param [Integer] level
       # @return [String]
       def inspect(level=0)
-        str = ''
-        str << '  ' * level if level > 0
-        str << "#{name} " unless @name.nil?
-        str << "#{type}: #{value.inspect} (bit length: #{bit_length})"
+        str = common_inspect(level)
+        str << " #{value.inspect} (bit length: #{bit_length})"
       end
 
       private
 
-      def build_tag?
-        !(!@default.nil? and (@value.nil? or @value == @default and
-                              @bit_length == @default_bit_length)) and
-          !(optional? and @value.nil?)
+      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?
 
-        while @value.length * 8 < @bit_length
-          @value << "\x00"
-        end
+        @value << "\x00" while @value.length * 8 < @bit_length
         @value.force_encoding('BINARY')
 
         if @value.length * 8 > @bit_length
-          max_len = @bit_length / 8 + (@bit_length % 8 > 0 ? 1 : 0)
+          max_len = @bit_length / 8 + ((@bit_length % 8).positive? ? 1 : 0)
           @value = @value[0, max_len]
         end
 
         unused = @value.length * 8 - @bit_length
         der = [unused, @value].pack('CA*')
 
-        if unused > 0
-          last_byte = @value[-1].unpack('C').first
+        if unused.positive?
+          last_byte = @value[-1].unpack1('C')
           last_byte &= (0xff >> unused) << unused
           der[-1] = [last_byte].pack('C')
         end
@@ -83,7 +79,7 @@ module RASN1
         der
       end
 
-      def der_to_value(der, ber:false)
+      def der_to_value(der, ber: false)
         unused, @value = der.unpack('CA*')
         @bit_length = @value.length * 8 - unused
       end

data/lib/rasn1/types/boolean.rb

@@ -1,34 +1,37 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 Boolean
     # @author Sylvain Daubert
     class Boolean < Primitive
-      TAG = 0x01
+      # Boolean id value
+      ID = 0x01
+
+      # @private
+      DER_TRUE = 0xff
+      # @private
+      DER_FALSE = 0
 
       private
 
       def value_to_der
-        [@value ? 0xff : 0x00].pack('C')
+        [@value ? DER_TRUE : DER_FALSE].pack('C')
       end
 
       def der_to_value(der, ber: false)
-        unless der.size == 1
-          raise ASN1Error, "tag #@name: BOOLEAN should have a length of 1"
-        end
+        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 0
+        when DER_FALSE
           @value = false
-        when 0xff
+        when DER_TRUE
           @value = true
         else
-          if ber
-            @value = true
-          else
-            raise ASN1Error, "tag #@name: bad value 0x%02x for BOOLEAN" % bool
-          end
+          raise ASN1Error, "tag #{@name}: bad value 0x%02x for BOOLEAN" % bool unless ber
+
+          @value = true
         end
       end
     end

data/lib/rasn1/types/choice.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # A ASN.1 CHOICE is a choice between different types.
     #
     # == Create a CHOICE
@@ -31,7 +32,6 @@ module RASN1
     #   choice.chosen_value  # => "abc"
     # @author Sylvain Daubert
     class Choice < Base
-
       # Chosen type
       # @return [Integer] index of type in choice value
       attr_accessor :chosen
@@ -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
@@ -87,28 +87,23 @@ module RASN1
             next
           end
         end
-        raise ASN1Error, "CHOICE #@name: no type matching #{der.inspect}" unless parsed
+        raise ASN1Error, "CHOICE #{@name}: no type matching #{der.inspect}" unless parsed
       end
 
       def inspect(level=0)
-        str = ''
-        str << '  ' * level if level > 0
-        str << "#{name} " if name
-        str << "#{type}:"
-        if @chosen.nil?
-          str << ' not chosen!'
-        else
-          str << "\n#{@value[@chosen].inspect(level+1)}"
-        end
+        str = common_inspect(level)
+        str << if !defined? @chosen
+                 ' not chosen!'
+               else
+                 "\n#{@value[@chosen].inspect(level + 1)}"
+               end
       end
 
       private
 
       def check_chosen
-        raise ChoiceError if @chosen.nil?
+        raise ChoiceError if !defined?(@chosen) || @chosen.nil?
       end
     end
   end
 end
-
-      

data/lib/rasn1/types/constructed.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.
     # Base class for all ASN.1 constructed types
@@ -12,19 +13,18 @@ module RASN1
       def inspect(level=0)
         case @value
         when Array
-          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?
+              next if item.optional? && item.value.nil?
+
               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

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 Enumerated
     #
     # An enumerated type permits to assign names to integer values. It may be defined
@@ -21,7 +22,8 @@ module RASN1
       # @!attribute enum
       # @return [Hash]
 
-      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

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 GeneralizedTime
     #
     # +{#value} of a {GeneralizedTime} should be a ruby Time.
@@ -20,7 +21,8 @@ module RASN1
     # second are supported.
     # @author Sylvain Daubert
     class GeneralizedTime < Primitive
-      TAG = 24
+      # GeneralizedTime id value
+      ID = 24
 
       # Get ASN.1 type
       # @return [String]
@@ -29,50 +31,48 @@ module RASN1
       end
 
       private
-      
+
       def value_to_der
-        if @value.nsec > 0
+        if @value.nsec.positive?
           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 (date_hour[-1] != 'Z') && (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
+        elsif fraction[-1] == 'Z'
+          fraction = fraction[0...-1]
+          date_hour << 'Z'
         else
-          if fraction[-1] == 'Z'
-            fraction = fraction[0...-1]
-            date_hour << 'Z'
+          match = fraction.match(/(\d+)([+-]\d+)/)
+          if match
+            # fraction contains fraction and timezone info. Split them
+            fraction = match[1]
+            date_hour << match[2]
           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
+            # 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
         format = case date_hour.size
                  when 11
-                   frac_base = 60*60
+                   frac_base = 60 * 60
                    '%Y%m%d%HZ'
                  when 13
                    frac_base = 60
@@ -100,9 +100,7 @@ module RASN1
         # 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
+          @value = compare_time if compare_time.utc_offset != @value.utc_offset
         end
         @value += ".#{fraction}".to_r * frac_base unless fraction.nil?
       end

data/lib/rasn1/types/ia5string.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 IA5 String
     # @author Sylvain Daubert
     class IA5String < OctetString
-      TAG = 22
+      # IA5String id value
+      ID = 22
 
       # Get ASN.1 type
       # @return [String]
@@ -13,15 +15,15 @@ module RASN1
       end
 
       private
-      
+
       def value_to_der
         @value.to_s.force_encoding('US-ASCII').force_encoding('BINARY')
       end
 
-      def der_to_value(der, ber:false)
+      def der_to_value(der, ber: false)
         super
         @value.force_encoding('US-ASCII')
       end
-     end
+    end
   end
 end

data/lib/rasn1/types/integer.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 Integer
     # @author Sylvain Daubert
     class Integer < Primitive
       # @return [Hash,nil]
       attr_reader :enum
 
-      TAG = 0x02
+      # Integer id value
+      ID = 2
 
       # @overload initialize(options={})
       #   @option options [Hash] :enum enumeration hash. Keys are names, and values
@@ -21,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?
 
@@ -30,45 +31,39 @@ module RASN1
         self.value = @value
 
         case @default
-        when String,Symbol
-          unless @enum.has_key? @default
-            raise EnumeratedError, "TAG #@name: unknwon enumerated default value #@default"
-          end
+        when String, Symbol
+          raise EnumeratedError, "#{@name}: unknwon enumerated default value #@{default}" unless @enum.key? @default
         when ::Integer
-          if @enum.has_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.has_key? v
-            raise EnumeratedError, "TAG #@name: unknwon enumerated value #{v}"
-          end
-          @value = v
+          @value = val
         when ::Integer
           if @enum.nil?
-            @value = v
-          elsif @enum.has_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
 
@@ -86,18 +81,12 @@ module RASN1
 
       def int_value_to_der(value=nil)
         v = value || @value
-        size = v.bit_length / 8 + (v.bit_length % 8 > 0 ? 1 : 0)
-        size = 1 if size == 0
-        comp_value = if v > 0
-                       # 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 }
+        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)
+        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
 
@@ -108,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
 
@@ -126,11 +113,11 @@ 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
-        @enum.nil? ? self.class.new(@name) : self.class.new(@name, enum: @enum)
+        self.class.new(name: @name, enum: @enum)
       end
     end
   end