rasn1 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c08cdf722e9b7662ef2bd5158658fecde6e1834af4d9e2c9651ee13136916383
-  data.tar.gz: 55f0019a6325ff72ce6c1f791d46d488e53416168db23c4a9ffecbc93cf32c03
+  metadata.gz: d8aaca93facba30994eb952b5df2eb4a2cfdbbebc39d84ca60f3f9f0449e84fc
+  data.tar.gz: 2006cdbcd04330fe31bc5d440d062b4f32ee07c3b7dff21d666dfab2e7a0e461
 SHA512:
-  metadata.gz: de89acb4c79a7ea05c5801400b9b8973b6ab0481ab1107cb8122254541dc9f5ffeb806c28d8f2aca7266c8be5a02003d1ddaa4f9b7bb451619956546a96bffe6
-  data.tar.gz: c7ebbd8871eda39c362fd9950dc5ce85b5152dbff3230c97367dde58c1aa2fcacd521c70d15544ed28387a9cf28e6ee33d36a41755dec16bc896308a46c50470
+  metadata.gz: 5e3e8e31202c26775712a897a14fb3524720ff8727219fd107a0eb9458eff2179af55ee098a1f98fdc49054b3aeffa64101b762108242e52d90f4b3e8f5002e1
+  data.tar.gz: 0fc64ce3e167051e614bb4c0de0cb437ff031ae913f8b737a2256d3bfb977c903508951d2c8cf4b757b6e69ee1903e8ac729a97d3195e3f05c2b3fc1bc3399a0

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 2.2
   - 2.3
   - 2.4
   - 2.5

data/README.md

@@ -55,8 +55,8 @@ More comple classes may be designed by nesting simple classes. For example:
 class ComplexRecord < RASN1::Model
   sequence :cplx_record,
            content: [boolean(:bool),
-	                 octet_string(:data, explicit: 0),
-		             model(:a_record, Record)]
+                     octet_string(:data, explicit: 0),
+                     model(:a_record, Record)]
 end
 ```
 

data/lib/rasn1/types/base.rb

@@ -2,7 +2,7 @@ module RASN1
   module Types
 
     # @abstract This is base class for all ASN.1 types.
-    #   
+    #
     #   Subclasses SHOULD define:
     #   * a TAG constant defining ASN.1 tag number,
     #   * a private method {#value_to_der} converting its {#value} to DER,
@@ -74,6 +74,12 @@ module RASN1
         @type = self.to_s.gsub(/.*::/, '').gsub(/([a-z0-9])([A-Z])/, '\1 \2').upcase
       end
 
+      # Get ASN.1 type used to encode this one
+      # @return [String]
+      def self.encode_type
+        type
+      end
+
       # Parse a DER or BER string
       # @param [String] der_or_ber string to parse
       # @param [Hash] options
@@ -222,6 +228,7 @@ module RASN1
         if explicit?
           # Delegate to #explicit type to generate sub-tag
           type = explicit_type
+          type.value = @value
           type.parse!(data)
           @value = type.value
         else
@@ -374,7 +381,7 @@ module RASN1
           elsif !@default.nil?
             @value = @default
           else
-            raise_tag_error(encode_tag, tag)
+            raise_tag_error(tag)
           end
           false
         else
@@ -418,11 +425,21 @@ module RASN1
         self.class.new
       end
 
-      def raise_tag_error(expected_tag, tag)
-        msg = "Expected #{tag2name(expected_tag)} but get #{tag2name(tag)}"
+      def raise_tag_error(tag)
+        msg = "Expected #{self2name} but get #{tag2name(tag)}"
         raise ASN1Error, msg
       end
 
+      def self2name
+        name = CLASSES.key(tag & 0xc0).to_s.upcase
+        name << " #{tag & Constructed::ASN1_PC > 0 ? 'CONSTRUCTED' : 'PRIMITIVE'}"
+        if implicit? || explicit?
+          name << ' 0x%02X' % (tag & 0x1f)
+        else
+          name << ' ' << self.class.type
+        end
+      end
+
       def tag2name(tag)
         return 'no tag' if tag.nil? or tag.empty?
 
@@ -432,7 +449,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.type }"
+        name << " #{type.nil? ? "0x%02X" % (itag & 0x1f) : type.encode_type }"
       end
     end
   end

data/lib/rasn1/types/enumerated.rb

@@ -21,6 +21,12 @@ module RASN1
       # @return [Hash]
       attr_reader :enum
 
+      # An ENUMERATED is encoded as an INTEGER.
+      # @return ['INTEGER']
+      def self.encode_type
+        Integer.encode_type
+      end
+
       # @overload initialize(options={})
       #   @option options [Hash] :enum enumeration hash. Keys are names, and values
       #     are integers. This key is mandatory.

data/lib/rasn1/types/sequence_of.rb

@@ -36,7 +36,7 @@ module RASN1
     #  seqof << { bool: false, int: 65535 }
     #  # Generate DER string
     #  der = seqof.to_der    # => String
-    #  # parse 
+    #  # parse
     #  seqof.parse! der
     #
     # After parsing, a SEQUENCE OF may be accessed as an Array:
@@ -50,6 +50,12 @@ module RASN1
       # @return [Class, Base]
       attr_reader :of_type
 
+      # A SEQUENCE OF is encoded as a SEQUENCE.
+      # @return ['SEQUENCE']
+      def self.encoded_type
+        Sequence.encoded_type
+      end
+
       # @param [Symbol, String] name name for this tag in grammar
       # @param [Class, Base] of_type base type for sequence of
       # @see Base#initialize

data/lib/rasn1/types/set_of.rb

@@ -5,6 +5,12 @@ module RASN1
     # @author Sylvain Daubert
     class SetOf < SequenceOf
       TAG = Set::TAG
+
+      # A SET OF is encoded as a SET.
+      # @return ['SET']
+      def self.encoded_type
+        Set.encoded_type
+      end
     end
   end
 end

data/lib/rasn1/version.rb

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

metadata

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