rasn1 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d54d76005f13feca236452aa2a5bfeb4f260d187ae2ad26fbe598b4b6f2bbf8
-  data.tar.gz: 8554ee3f4a4cf278af9dca1707842dbfe44d0aa495a0b60fe389d9bf08351b07
+  metadata.gz: 1889a0ada74e2d9255ce6af799caa441fd2d2cacfaf0097b5afd1730ed9a9fd9
+  data.tar.gz: e0453969129814385bd272c362373b12ae0e38201145280c360ac3696dd95cb1
 SHA512:
-  metadata.gz: 1c334783007d9fb69cb9176b9f2da4e6db3037aadbaad2c4d8070878e475b47c7700ff779d11b184b4881e54cd0810dfa231365c777d090503360a1d36af7ae2
-  data.tar.gz: 9a997e1123a8fd23743b03f533e59a5c0d9848713f27910c1b93858c388fd86ecdf8cb7742f6ecd250b5dc5a42d3ec0d48fa4421ddf16c9f118f7e68e7b60ab0
+  metadata.gz: 4dc47229a202f0bfa7d56a129cd5e1807009b9147da6e844d5a47589fbf0e8eab9bebbb51f81866a0222eb4a6dbf953d381f266ec332e697b6caf1b894fa6c18
+  data.tar.gz: 4fc5127882d478d111452dff0cac6e226d270f47b4798b6a365f735c0bb1402ec417640b48be9839f7336fcf6d526f2a771d90bdc6ed64b0cefc3258d9e22bff

data/.rubocop.yml

@@ -1,4 +1,3 @@
-TargetRubyVersion: 2.3
 Layout/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: no_space
 Lint/EmptyWhen:

data/lib/rasn1/model.rb

@@ -60,6 +60,8 @@ module RASN1
   class Model
 
     class << self
+      # @return [Hash]
+      attr_reader :options
 
       # Use another model in this model
       # @param [String,Symbol] name
@@ -90,7 +92,7 @@ module RASN1
       # @return [void]
       def inherited(klass)
         super
-        root = @root
+        root = defined?(@root )? @root : nil
         klass.class_eval { @root = root }
       end
 
@@ -218,7 +220,7 @@ module RASN1
       # Give type name (aka class name)
       # @return [String]
       def type
-        return @type if @type
+        return @type if defined? @type
         @type = self.to_s.gsub(/.*::/, '')
       end
 
@@ -347,7 +349,7 @@ module RASN1
       root = self.class.class_eval { @root }
       @root = root[0]
       @elements = {}
-      @elements[@root] = get_type(root[1], self.class.class_eval { @options } || {})
+      @elements[@root] = get_type(root[1], self.class.options || {})
       root
     end
 

data/lib/rasn1/types/any.rb

@@ -3,7 +3,7 @@ module RASN1
 
     # ASN.1 ANY: accepts any types
     #
-    # If `any#value` is `nil`, `any` will be encoded as a {Null} object.
+    # If `any#value` is `nil` and Any object is not {#optional?}, `any` will be encoded as a {Null} object.
     # @author Sylvain Daubert
     class Any < Base
 
@@ -13,7 +13,7 @@ module RASN1
         when Base, Model
           @value.to_der
         when nil
-          Null.new.to_der
+          optional? ? '' : Null.new.to_der
         else
           @value.to_s
         end
@@ -25,6 +25,12 @@ module RASN1
       # @param [Boolean] ber if +true+, accept BER encoding
       # @return [Integer] total number of parsed bytes
       def parse!(der, ber: false)
+        if der.nil? or der.empty?
+          return 0 if optional?
+
+          raise ASN1Error, "Expected ANY but get nothing"
+        end
+
         total_length,  = get_data(der, ber)
         @value = der[0, total_length]
         total_length

data/lib/rasn1/types/base.rb

@@ -70,7 +70,7 @@ module RASN1
       # Get ASN.1 type
       # @return [String]
       def self.type
-        return @type if @type
+        return @type if defined? @type
         @type = self.to_s.gsub(/.*::/, '').gsub(/([a-z0-9])([A-Z])/, '\1 \2').upcase
       end
 
@@ -168,14 +168,14 @@ module RASN1
       # @return [::Boolean,nil] return +nil+ if not tagged, return +true+
       #   if explicit, else +false+
       def explicit?
-        @tag.nil? ? @tag : @tag == :explicit
+        !defined?(@tag) ? nil : @tag == :explicit
       end
 
       # Say if a tagged type is implicit
       # @return [::Boolean,nil] return +nil+ if not tagged, return +true+
       #   if implicit, else +false+
       def implicit?
-        @tag.nil? ? @tag : @tag == :implicit
+        !defined?(@tag) ? nil : @tag == :implicit
       end
 
       # @abstract This method SHOULD be partly implemented by subclasses, which
@@ -211,7 +211,7 @@ module RASN1
              else    # false
                0
              end
-        (@tag_value || self.class::TAG) | CLASSES[@asn1_class] | pc
+        tag_value | CLASSES[@asn1_class] | pc
       end
 
       # @abstract This method SHOULD be partly implemented by subclasses to parse
@@ -326,7 +326,7 @@ module RASN1
           @constructed = options[:constructed]
         end
 
-        @asn1_class = :context if @tag and @asn1_class == :universal
+        @asn1_class = :context if defined?(@tag) && (@asn1_class == :universal)
       end
 
       def build_tag?
@@ -349,8 +349,14 @@ module RASN1
         end
       end
 
+      def tag_value
+        return @tag_value if defined? @tag_value
+
+        self.class::TAG
+      end
+
       def encode_tag
-        if (@tag_value || self.class::TAG) <= MAX_TAG
+        if tag_value <= MAX_TAG
           [tag].pack('C')
         else
           raise ASN1Error, 'multi-byte tag value are not supported'
@@ -426,7 +432,8 @@ module RASN1
       end
 
       def raise_tag_error(tag)
-        msg = "Expected #{self2name} but get #{tag2name(tag)}"
+        msg = name.nil? ? '' : "#{name}: "
+        msg << "Expected #{self2name} but get #{tag2name(tag)}"
         raise ASN1Error, msg
       end
 
@@ -434,7 +441,7 @@ module RASN1
         name = CLASSES.key(tag & 0xc0).to_s.upcase
         name << " #{tag & Constructed::ASN1_PC > 0 ? 'CONSTRUCTED' : 'PRIMITIVE'}"
         if implicit? || explicit?
-          name << ' 0x%02X' % (tag & 0x1f)
+          name << ' 0x%02X (0x%02X)' % [tag & 0x1f, tag]
         else
           name << ' ' << self.class.type
         end
@@ -449,7 +456,7 @@ module RASN1
         type =  Types.constants.map { |c| Types.const_get(c) }.
                   select { |klass| klass < Primitive || klass < Constructed }.
                   find { |klass| klass::TAG == itag & 0x1f }
-        name << " #{type.nil? ? "0x%02X" % (itag & 0x1f) : type.encode_type }"
+        name << " #{type.nil? ? "0x%02X (0x%02X)" % [itag & 0x1f, itag] : type.encode_type }"
       end
     end
   end

data/lib/rasn1/types/choice.rb

@@ -95,7 +95,7 @@ module RASN1
         str << '  ' * level if level > 0
         str << "#{name} " if name
         str << "#{type}:"
-        if @chosen.nil?
+        if !defined? @chosen
           str << ' not chosen!'
         else
           str << "\n#{@value[@chosen].inspect(level+1)}"
@@ -105,10 +105,10 @@ module RASN1
       private
 
       def check_chosen
-        raise ChoiceError if @chosen.nil?
+        raise ChoiceError if !defined?(@chosen) || @chosen.nil?
       end
     end
   end
 end
 
-      
+

data/lib/rasn1/version.rb

@@ -1,3 +1,3 @@
 module RASN1
-  VERSION = '0.6.7'
+  VERSION = '0.6.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasn1
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-18 00:00:00.000000000 Z
+date: 2018-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard