rasn1 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9745a1fe5540da0693f4e9bf5048dd177c58e314917e6d606b1caa34fa0f138
-  data.tar.gz: 67f2bc01529e894be272fb905ded771a89f8bb6eb14bc1eac86178d3e7a72148
+  metadata.gz: c08cdf722e9b7662ef2bd5158658fecde6e1834af4d9e2c9651ee13136916383
+  data.tar.gz: 55f0019a6325ff72ce6c1f791d46d488e53416168db23c4a9ffecbc93cf32c03
 SHA512:
-  metadata.gz: dc403f68a96560969a2221bc255e9f9f56dacb90f174977067054830dd0b85afc53dd8c25b130ddda3d38b6fc8e3d9d6341e9e5a805dda59ea4b478d3b960a78
-  data.tar.gz: 201e5f5255a2ebb2a2d26c9fe2a75d9fed7f72d5e32f6ceb712e4ff0d01c81b38a896c31ee6bf446f74b9065f5ef6bab5cecdbf55e236dc53b53015ee959ee58
+  metadata.gz: de89acb4c79a7ea05c5801400b9b8973b6ab0481ab1107cb8122254541dc9f5ffeb806c28d8f2aca7266c8be5a02003d1ddaa4f9b7bb451619956546a96bffe6
+  data.tar.gz: c7ebbd8871eda39c362fd9950dc5ce85b5152dbff3230c97367dde58c1aa2fcacd521c70d15544ed28387a9cf28e6ee33d36a41755dec16bc896308a46c50470

data/lib/rasn1/model.rb

@@ -314,13 +314,13 @@ module RASN1
 
     # @return [String]
     def inspect(level=0)
-      '  ' * level + "#{@root} (#{type}) #{root.inspect(-level)}"
+      '  ' * level + "(#{type}) #{root.inspect(-level)}"
     end
 
     # Objects are equal if they have same class AND same DER
     # @param [Base] other
     # @return [Boolean]
-    def==(other)
+    def ==(other)
       (other.class == self.class) && (other.to_der == self.to_der)
     end
 
@@ -373,6 +373,21 @@ module RASN1
             else
               raise ArgumentError, "element #{name}: may only pass a Hash for Model elements"
             end
+          elsif value.is_a? Array
+            composed = if obj[name].is_a? Model
+                         obj[name].root
+                       else
+                         obj[name]
+                       end
+            if composed.of_type.is_a? Model
+              value.each do |el|
+                composed << initialize_elements(composed.of_type.class.new, el)
+              end
+            else
+              value.each do |el|
+                obj[name] << el
+              end
+            end
           else
             obj[name].value = value
           end

data/lib/rasn1/types/any.rb

@@ -36,12 +36,12 @@ module RASN1
         str << "#{@name} " unless @name.nil?
         if @value.nil?
           str << "(ANY) NULL"
-        elsif @value.is_a?(OctetString)
+        elsif @value.is_a?(OctetString) or @value.is_a?(BitString)
           str << "(ANY) #{@value.type}: #{value.value.inspect}"
         elsif @value.class < Base
           str << "(ANY) #{@value.type}: #{value.value}"
         else
-          str << "(ANY) #{value.to_s.inspect}"
+          str << "ANY: #{value.to_s.inspect}"
         end
       end
     end

data/lib/rasn1/types/base.rb

@@ -237,23 +237,16 @@ module RASN1
         value_to_der.size
       end
 
+      # @param [Integer] level
+      # @return [String]
       def inspect(level=0)
         str = ''
         str << '  ' * level if level > 0
         str << "#{@name} " unless @name.nil?
-        if self.class == Base
-          str << "#{type} (0x#{'%02x' % tag}): "
-          if @value.is_a?(Base)
-            str << value.inspect(level+1)
-          else
-            str << value.inspect
-          end
-        else
-          str << "#{type}: #{value.inspect}"
-          str << " OPTIONAL" if optional?
-          str << " DEFAULT #{@default}" unless @default.nil?
-          str
-        end
+        str << "#{type}: #{value.inspect}"
+        str << " OPTIONAL" if optional?
+        str << " DEFAULT #{@default}" unless @default.nil?
+        str
       end
 
       # Objects are equal if they have same class AND same DER

data/lib/rasn1/types/bit_string.rb

@@ -6,8 +6,9 @@ module RASN1
     class BitString < Primitive
       TAG = 0x03
 
-      # @return [Integer] bit length of bit string
-      attr_accessor :bit_length
+      # @param [Integer] bit_length
+      # @return [Integer]
+      attr_writer :bit_length
 
       # @overload initialize(options={})
       #   @param [Hash] options
@@ -28,8 +29,20 @@ module RASN1
           end
           @default_bit_length = opts[:bit_length]
         end
+        @bit_length = opts[:bit_length]
       end
 
+      # Get bit length
+      def bit_length
+        if @value.nil?
+          @default_bit_length
+        else
+          @bit_length
+        end
+      end
+
+      # @param [Integer] level
+      # @return [String]
       def inspect(level=0)
         str = ''
         str << '  ' * level if level > 0
@@ -46,7 +59,7 @@ module RASN1
       end
 
       def value_to_der
-        raise ASN1Error, "TAG #@name: bit length is not set" if @bit_length.nil?
+        raise ASN1Error, "TAG #@name: bit length is not set" if bit_length.nil?
 
         while @value.length * 8 < @bit_length
           @value << "\x00"

data/lib/rasn1/types/choice.rb

@@ -93,11 +93,12 @@ module RASN1
       def inspect(level=0)
         str = ''
         str << '  ' * level if level > 0
-        str << "#{name} #{type}: "
+        str << "#{name} " if name
+        str << "#{type}:"
         if @chosen.nil?
-          str << 'not chosen!'
+          str << ' not chosen!'
         else
-          str << @value[@chosen].inspect(level)
+          str << "\n#{@value[@chosen].inspect(level+1)}"
         end
       end
 

data/lib/rasn1/types/constructed.rb

@@ -22,10 +22,9 @@ module RASN1
             case item
             when Base, Model
               next if item.optional? and item.value.nil?
-              str << '  ' * level
               str << "#{item.inspect(level)}\n"
             else
-              str << item.inspect
+              str <<  '  ' * level + item.inspect + "\n"
             end
           end
           str

data/lib/rasn1/types/null.rb

@@ -6,6 +6,18 @@ module RASN1
     class Null < Primitive
       TAG = 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
+      end
+
+      private
+
       def value_to_der
         ''
       end

data/lib/rasn1/types/sequence_of.rb

@@ -99,9 +99,16 @@ module RASN1
         @value[idx]
       end
 
+      # Get length of SEQUENCE OF (ie number of elements)
+      # @return [Integer]
+      def length
+        @value.length
+      end
+
       def inspect(level=0)
         str = ''
         str << '  ' * level if level > 0
+        str << "#{@name} " unless @name.nil?
         level = level.abs
         str << "#{type}:\n"
         level += 1
@@ -109,11 +116,8 @@ module RASN1
           case item
           when Base, Model
             next if item.optional? and item.value.nil?
-            str << '  ' * level + "#{item.inspect(level)}"
-            str << "\n" unless item.is_a?(Model)
-          when Hash
-            type = of_type_class.new(item)
-            str << '  ' * level + "#{type.inspect(level)}"
+            str << "#{item.inspect(level)}"
+            str << "\n" unless str.end_with?("\n")
           else
             str << '  ' * level + "#{item.inspect}\n"
           end

data/lib/rasn1/version.rb

@@ -1,3 +1,3 @@
 module RASN1
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasn1
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-28 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard