rasn1 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1db3f68204210c681a17f1d0a367d680906997b8
-  data.tar.gz: 8fec0011426f3b19dd61ef1ba57d904e0de14596
+  metadata.gz: e9f8ffeb57fd641930cbe2e820c903102ed404e6
+  data.tar.gz: 8d214577ea3085f99a96926e9e26a81f3148e262
 SHA512:
-  metadata.gz: d1df79db814d23882b371fbe165c5966e19b75f17bacd9b97f2f9ad8b6dad967e060f01eff201389192562c54ad011ead484a1f0ce941dce33cdf081cc19978d
-  data.tar.gz: 7e4184159aee769387c5ecb62f6d1b02e48f477780597cc2dcd50d8bf6f1be93613e8319c90fdfdf4967e1f4f98ca9187c06911fa396fc229d40e4c461c12e3f
+  metadata.gz: c6a96e1e65a1fccaa036b984933fda1b3f5c43d03c0a6b05fb262b3b2a3a1cf6aebb4de0e87bf38455ea726f1a21ec793e307dfe24dd94b202ef0428b7db79dd
+  data.tar.gz: cbad3dcc907ef35b8bb6689fa4d35b04797c2374f7e9a7f9b26349b0da3bdb99ec71b7262c3018104175d64b9d3922bd0d8564b194f2616f3a02c60415ea631b

data/lib/rasn1/model.rb

@@ -260,8 +260,16 @@ module RASN1
       end
     end
 
+    # @return [String]
     def inspect(level=0)
-      '  ' * level + "#{type} #{root.inspect(-level)}"
+      '  ' * level + "#{@root} (#{type}) #{root.inspect(-level)}"
+    end
+
+    # Objects are equal if they have same class AND same DER
+    # @param [Base] other
+    # @return [Boolean]
+    def==(other)
+      (other.class == self.class) && (other.to_der == self.to_der)
     end
 
     private
@@ -321,18 +329,18 @@ module RASN1
     end
 
     def private_to_h(element)
-      if element.value.is_a? Array
+      if element.is_a?(Types::SequenceOf) or
+         (element.is_a?(Model) and element.root.is_a?(Types::SequenceOf))
+        element.value.map { |el| private_to_h(el) }
+      elsif element.value.is_a? Array
         h = {}
         element.value.each do |subel|
           case subel
           when Types::Sequence, Types::Set
             h[subel.name] = private_to_h(subel)
           when Model
-            h[@elements.key(subel)] = subel.to_h[subel.name]
-          when Hash, Array
-            # Array of Hash for SequenceOf and SetOf
-            # Array of Array of... of Hash are nested SequenceOf or SetOf
-            return element.value
+            this_name = @elements.key(subel) || element.name
+            h[this_name] = subel.to_h[subel.name]
           else
             next if subel.value.nil? and subel.optional?
             h[subel.name] = subel.value

data/lib/rasn1/types/any.rb

@@ -1,7 +1,9 @@
 module RASN1
   module Types
 
-    # ASN.1 ANY: accpets any types
+    # ASN.1 ANY: accepts any types
+    #
+    # If `any#value` is `nil`, `any` will be encoded as a {Null} object.
     # @author Sylvain Daubert
     class Any < Base
 
@@ -10,12 +12,15 @@ module RASN1
         case @value
         when Base, Model
           @value.to_der
+        when nil
+          Null.new(@name).to_der
         else
           @value.to_s
         end
       end
 
-      # Parse a DER string. This method updates object: {#value} will a DER string.
+      # Parse a DER string. This method updates object: {#value} will be a DER
+      # string.
       # @param [String] der DER string
       # @param [Boolean] ber if +true+, accept BER encoding
       # @return [Integer] total number of parsed bytes
@@ -24,6 +29,20 @@ module RASN1
         @value = der[0, total_length]
         total_length
       end
+
+      def inspect(level=0)
+        str = ''
+        str << '  ' * level if level > 0
+        if @value.nil?
+          str << "#{name} (ANY) NULL"
+        elsif @value.is_a?(OctetString)
+          str << "#{name} (ANY) #{@value.type}: #{value.value.inspect}"
+        elsif @value.class < Base
+          str << "#{name} (ANY) #{@value.type}: #{value.value}"
+        else
+          str << "#{name} (ANY) #{value.to_s.inspect}"
+        end
+      end
     end
   end
 end

data/lib/rasn1/types/base.rb

@@ -97,6 +97,11 @@ module RASN1
       # Used by +#dup+ and +#clone+. Deep copy @value.
       def initialize_copy(other)
         @value = @value.nil? ? nil : @value.dup
+        begin
+          @default = @default.dup
+        rescue TypeError => ex
+          raise unless ex.message =~ /can't (dup|clone)/
+        end
       end
 
       # Get value or default value
@@ -206,6 +211,13 @@ module RASN1
         str << "#{name} #{type}: #{value}"
       end
 
+      # Objects are equal if they have same class AND same DER
+      # @param [Base] other
+      # @return [Boolean]
+      def ==(other)
+        (other.class == self.class) && (other.to_der == self.to_der)
+      end
+
       private
 
       def set_options(options)

data/lib/rasn1/types/bit_string.rb

@@ -27,6 +27,12 @@ module RASN1
         end
       end
 
+      def inspect(level=0)
+        str = ''
+        str << '  ' * level if level > 0
+        str << "#{name} #{type}: #{value.inspect} (bit length: #{bit_length})"
+      end
+
       private
 
       def build_tag?
@@ -67,4 +73,3 @@ module RASN1
     end
   end
 end
-

data/lib/rasn1/types/choice.rb

@@ -90,6 +90,17 @@ module RASN1
         raise ASN1Error, "CHOICE #@name: no type matching #{der.inspect}" unless parsed
       end
 
+      def inspect(level=0)
+        str = ''
+        str << '  ' * level if level > 0
+        str << "#{name} #{type}: "
+        if @chosen.nil?
+          str << 'not chosen!'
+        else
+          str << @value[@chosen].inspect(level)
+        end
+      end
+
       private
 
       def check_chosen

data/lib/rasn1/types/constructed.rb

@@ -20,7 +20,6 @@ module RASN1
           @value.each do |item|
             case item
             when Base, Model
-              p item
               next if item.optional? and item.value.nil?
               str << '  ' * level + "#{item.inspect(level)}\n"
             else

data/lib/rasn1/types/sequence.rb

@@ -27,6 +27,27 @@ module RASN1
     class Sequence < Constructed
       TAG = 0x10
 
+      # @param [Symbol, String] name name for this tag in grammar
+      # @param [Hash] options
+      # @option options [Symbol] :class ASN.1 tag class. Default value is +:universal+.
+      #  If +:explicit+ or +:implicit:+ is defined, default value is +:context+.
+      # @option options [::Boolean] :optional define this tag as optional. Default
+      #   is +false+
+      # @option options [Object] :default default value for DEFAULT tag
+      # @option options [Object] :value value to set (default is +[]+)
+      # @option options [::Integer] :implicit define an IMPLICIT tagged type
+      # @option options [::Integer] :explicit define an EXPLICIT tagged type
+      # @option options [::Boolean] :constructed if +true+, set type as constructed.
+      #  May only be used when +:explicit+ is defined, else it is discarded.
+      def initialize(name, options={})
+        super(name, { value: [] }.merge(options))
+      end
+
+      def initialize_copy(other)
+        super
+        @value.map! { |v| v.dup }
+      end
+
       private
 
       def value_to_der
@@ -39,8 +60,7 @@ module RASN1
       end
 
       def der_to_value(der, ber:false)
-        case @value
-        when Array
+        if @value.is_a?(Array) and !@value.empty?
           nb_bytes = 0
           @value.each do |element|
             nb_bytes += element.parse!(der[nb_bytes..-1])

data/lib/rasn1/types/sequence_of.rb

@@ -12,7 +12,7 @@ module RASN1
     #  # Create a SEQUENCE OF INTEGER
     #  seqof = RASN1::Types::SequenceOf.new(:record, RASN1::Types::Integer)
     #  # Set integer values
-    #  seqof.value = [1, 2, 3, 4]
+    #  seqof.value << [1, 2, 3, 4]
     #
     # == Use with {Constructed} types
     # SEQUENCE OF may be used to create sequence of composed types. For example:
@@ -20,8 +20,8 @@ module RASN1
     #  commposed_type.value = [RASN1::Types::Integer(:id),
     #                          RASN1::Types::OctetString(:data)]
     #  seqof = RASN1::SequenceOf.new(:comp, composed_type)
-    #  seqof.value << [0, 'data0']
-    #  seqof.value << [1, 'data1']
+    #  seqof << [0, 'data0']
+    #  seqof << [1, 'data1']
     #
     # == Use with {Model}
     # SEQUENCE OF may also be used with a Model type:
@@ -32,12 +32,17 @@ module RASN1
     #
     #  seqof = RASN1::Types::SequenceOf.new(:record, MyModel)
     #  # set values
-    #  seqof.value << { bool: true, int: 12 }
-    #  seqof.value << { bool: false, int: 65535 }
+    #  seqof << { bool: true, int: 12 }
+    #  seqof << { bool: false, int: 65535 }
     #  # Generate DER string
     #  der = seqof.to_der    # => String
     #  # parse 
     #  seqof.parse! der
+    #
+    # After parsing, a SEQUENCE OF may be accessed as an Array:
+    #  seqof[0]                # => MyModel
+    #  seqof[0][:bool].value   # => true
+    #  seqof[0][:int].value    # => 12
     # @author Sylvain Daubert
     class SequenceOf < Constructed
       TAG = Sequence::TAG
@@ -54,6 +59,46 @@ module RASN1
         @value = []
       end
 
+      def initialize_copy(other)
+        super
+        @of_type = @of_type.dup
+        @value.map! { |v| v.dup }
+      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(nil, value: 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.name, value: [])
+          @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
+      end
+
+      # Get element of index +idx+
+      # @param [Integer] idx
+      # @return [Base]
+      def [](idx)
+        @value[idx]
+      end
+
       def inspect(level=0)
         str = ''
         str << '  ' * level if level > 0
@@ -87,34 +132,7 @@ module RASN1
       end
 
       def value_to_der
-        if composed_of_type?
-          @value.map do |ary|
-            s = of_type_class.new(@of_type.name)
-            sval = []
-            @of_type.value.each_with_index do |type, i|
-              type2 = type.dup
-              type2.value = ary[i]
-              sval << type2
-            end
-            s.value = sval
-            s.to_der
-          end.join
-        elsif of_type_class < Model
-          if of_type_class.new.root.is_a? SequenceOf
-            @value.map do |ary|
-              model = of_type_class.new
-              model.root.value = ary
-              model.to_der
-            end.join
-          else
-            @value.map do |hsh|
-              model = of_type_class.new(hsh)
-              model.to_der
-            end.join
-          end
-        else
-          @value.map { |v| of_type_class.new(:t, value: v).to_der }.join
-        end
+        @value.map { |v| v.to_der }.join
       end
 
       def der_to_value(der, ber:false)
@@ -130,15 +148,16 @@ module RASN1
                    of_type_class.new(:t)
                  end
           nb_bytes += type.parse!(der[nb_bytes, der.length])
-          value = if composed_of_type?
-                    type.value.map { |obj| obj.value }
-                  elsif of_type_class < Model
-                    type.to_h[type.to_h.keys.first]
-                  else
-                    type.value
-                  end
-          @value << value
+          #value = if composed_of_type?
+          #          type.value.map { |obj| obj.value }
+          #        elsif of_type_class < Model
+          #          type.to_h[type.to_h.keys.first]
+          #        else
+          #          type.value
+          #        end
+          @value << type
         end
+        #puts "#{name}: #{@value.inspect}"
       end
 
       def explicit_type

data/lib/rasn1/version.rb

@@ -1,3 +1,3 @@
 module RASN1
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/rasn1.gemspec

@@ -19,10 +19,9 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.1.0'
-
-  spec.add_dependency 'yard', '~>0.9'
+  spec.required_ruby_version = '>= 2.2.0'
 
+  spec.add_development_dependency 'yard', '~>0.9'
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasn1
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-03 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -17,7 +17,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -131,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="