rasn2 0.16.0 → 1.0.1

data/lib/{rasn1 → rasn2}/types/sequence_of.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module RASN1
+module RASN2
   module Types
     # ASN.1 SEQUENCE OF
     #
@@ -11,28 +11,28 @@ module RASN1
     #  Integers ::= SEQUENCE OF INTEGER
     # do:
     #  # Create a SEQUENCE OF INTEGER
-    #  seqof = RASN1::Types::SequenceOf.new(RASN1::Types::Integer)
+    #  seqof = RASN2::Types::SequenceOf.new(RASN2::Types::Integer)
     #  # Set integer values
-    #  seqof.value = [1, 2, 3, 4].map { |i| RASN1::Types::Integer.new(value: i) }
-    #  seqof << 5   # infer a RASN1::Types::Integer with given value
+    #  seqof.value = [1, 2, 3, 4].map { |i| RASN2::Types::Integer.new(value: i) }
+    #  seqof << 5   # infer a RASN2::Types::Integer with given value
     #
     # == Use with {Constructed} types
     # SEQUENCE OF may be used to create sequence of composed types. For example:
-    #  composed_type = RASN1::Types::Sequence.new
-    #  commposed_type.value = [RASN1::Types::Integer,
-    #                          RASN1::Types::OctetString]
-    #  seqof = RASN1::Types::SequenceOf.new(composed_type)
+    #  composed_type = RASN2::Types::Sequence.new
+    #  commposed_type.value = [RASN2::Types::Integer,
+    #                          RASN2::Types::OctetString]
+    #  seqof = RASN2::Types::SequenceOf.new(composed_type)
     #  seqof << [0, 'data0']
     #  seqof << [1, 'data1']
     #
     # == Use with {Model}
     # SEQUENCE OF may also be used with a Model type:
-    #  class MyModel < RASN1::Model
+    #  class MyModel < RASN2::Model
     #    sequence :seq,
     #             content: [boolean(:bool), integer(:int)]
     #  end
     #
-    #  seqof = RASN1::Types::SequenceOf.new(:record, MyModel)
+    #  seqof = RASN2::Types::SequenceOf.new(:record, MyModel)
     #  # set values
     #  seqof << { bool: true, int: 12 }
     #  seqof << { bool: false, int: 65535 }
@@ -107,22 +107,17 @@ module RASN1
 
       # @param [::Integer] level
       # @return [String]
-      def inspect(level=0)
-        str = common_inspect(level)
-        str << "\n"
-        level = level.abs + 1
-        @value.each do |item|
-          case item
-          when Base, Model
-            next if item.optional? && item.value.nil?
-
-            str << item.inspect(level)
-            str << "\n" unless str.end_with?("\n")
-          else
-            str << ('  ' * level) << "#{item.inspect}\n"
-          end
+      def inspect(level=0, color: false)
+        new_level = level.abs + 1
+        begin_colorizer(color)
+        name = @name ? "#{colorize_name(@name)} " : ''
+        lines = []
+        lines << "#{"  " * level}#{name}SEQUENCE OF:"
+        lines += @value.map do |item|
+          item.inspect(new_level, color: color)
         end
-        str
+        end_colorizer
+        lines.join("\n")
       end
 
       # Make sequence of value from +der+ string

data/lib/{rasn1 → rasn2}/types/set.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module RASN1
+module RASN2
   module Types
     # ASN.1 set
     #
@@ -13,11 +13,11 @@ module RASN1
     #    house [1] IMPLICIT INTEGER DEFAULT 0
     #  }
     # do:
-    #  set = RASN1::Types::Set.new
+    #  set = RASN2::Types::Set.new
     #  set.value = [
-    #               RASN1::Types::Integer
-    #               RASN1::Types::Integer(explicit: 0, optional: true),
-    #               RASN1::Types::Integer(implicit: 1, default: 0)
+    #               RASN2::Types::Integer
+    #               RASN2::Types::Integer(explicit: 0, optional: true),
+    #               RASN2::Types::Integer(implicit: 1, default: 0)
     #              ]
     # @author Sylvain Daubert
     class Set < Sequence

data/lib/{rasn1 → rasn2}/types/set_of.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module RASN1
+module RASN2
   module Types
     # ASN.1 SET OF
     # @author Sylvain Daubert

data/lib/{rasn1 → rasn2}/types/tag.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module RASN1
+module RASN2
   module Types
     # ASN.1 Tag constructed type.
     #
@@ -24,7 +24,7 @@ module RASN1
     #   generic = Tag.new(tag: :private, value: [Integer.new, OctetString.new])
     #   # or equivalently
     #   generic = Tag.new(any_private: true, value: [Integer.new])
-    class Tag < Constructed
+    class Tag < Base
       # Placeholder ID — not used directly; tag is always dynamic.
       ID = 0
 
@@ -72,22 +72,6 @@ module RASN1
         end
       end
 
-      # Parse constructed content from DER
-      # @param [String] der
-      # @param [Boolean] ber
-      # @return [void]
-      def der_to_value(der, ber: false) # rubocop:disable Lint/UnusedMethodArgument
-        if @value.is_a?(Array) && !@value.empty?
-          nb_bytes = 0
-          @value.each do |element|
-            nb_bytes += element.parse!(der[nb_bytes..])
-          end
-        else
-          @value = der
-          der.length
-        end
-      end
-
       private
 
       def extract_tag_binding(options)
@@ -114,6 +98,12 @@ module RASN1
       end
 
       def check_id(der)
+        asn1_class, pc, tag_id, size = Types.decode_identifier_octets(der)
+        @asn1_class = asn1_class
+        @constructed = pc
+        @tag = tag_id
+        @tag_size = size
+
         return check_any_private_id(der) if @any_private && @accepted_tags.empty?
         return check_multi_tag_id(der) if @accepted_tags.length > 1
 
@@ -123,10 +113,7 @@ module RASN1
       def check_any_private_id(der)
         return no_match(der) if der.nil? || der.empty?
 
-        first_octet = der.unpack1('C').to_i
-        asn1_class_bits = first_octet & CLASS_MASK
-        if asn1_class_bits == CLASSES[:private]
-          _, _, tag_id, = Types.decode_identifier_octets(der)
+        if asn1_class == :private
           @id_value = tag_id
           @matched_tag = tag_id
           true
@@ -164,15 +151,13 @@ module RASN1
 
       def value_to_der
         case @value
-        when Array then @value.map(&:to_der).join
-        else @value.to_s
+        when Array
+          @value.map(&:to_der).join
+        else
+          @value.to_s
         end
       end
 
-      def trace_data
-        ''
-      end
-
       def explicit_type
         opts = { name: name, value: @value }
         if @accepted_tags.length == 1

data/lib/{rasn1 → rasn2}/types/universal_string.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module RASN1
+module RASN2
   module Types
     # ASN.1 UniversalString
     # @since 0.13.0

data/lib/{rasn1 → rasn2}/types/utc_time.rb

@@ -2,7 +2,7 @@
 
 require 'date'
 
-module RASN1
+module RASN2
   module Types
     # ASN.1 UTCTime
     #

data/lib/{rasn1 → rasn2}/types/utf8_string.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module RASN1
+module RASN2
   module Types
     # ASN.1 UTF8 String
     # @author Sylvain Daubert

data/lib/{rasn1 → rasn2}/types/visible_string.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module RASN1
+module RASN2
   module Types
     # Create VisibleString as a Constrained subclass of IA5String
     Types.define_type(:VisibleString, from: IA5String) do |value|

data/lib/{rasn1 → rasn2}/types.rb

@@ -2,7 +2,7 @@
 
 require_relative 'types/constrained'
 
-module RASN1
+module RASN2
   # This modules is a namesapce for all ASN.1 type classes.
   # @author Sylvain Daubert
   module Types
@@ -15,6 +15,7 @@ module RASN1
       return @primitives unless @primitives.empty?
 
       @primitives = self.constants.map { |c| Types.const_get(c) }
+                        .grep(Class)
                         .select { |klass| klass < Primitive }
     end
 
@@ -24,6 +25,7 @@ module RASN1
       return @constructed unless @constructed.empty?
 
       @constructed = self.constants.map { |c| Types.const_get(c) }
+                         .grep(Class)
                          .select { |klass| klass < Constructed }
     end
 
@@ -67,10 +69,10 @@ module RASN1
       asn1class, pc, id, = self.decode_identifier_octets(der)
       # cache_id: check versus class and 5 LSB bits
       cache_id = der.unpack1('C') & 0xdf
-      klass = cache_id < Types::Base::MULTI_OCTETS_ID ? @id2types[id] : Types::Base
+      klass = cache_id < Types::Base::MULTI_OCTETS_ID ? @id2types[id] : Types::Tag
       is_constructed = (pc == :constructed)
       options = { class: asn1class, constructed: is_constructed }
-      options[:tag_value] = id if klass == Types::Base
+      options[:tag_value] = id if klass == Types::Tag
       klass.new(options)
     end
 
@@ -89,7 +91,7 @@ module RASN1
     # This new type may have a constraint defines on it.
     # @param [Symbol,String] name new type name. Must start with a capital letter.
     # @param [Types::Base] from class from which inherits
-    # @param [Module] in_module module in which creates new type (default to {RASN1::Types})
+    # @param [Module] in_module module in which creates new type (default to {RASN2::Types})
     # @return [Class] newly created class
     # @yieldparam [Object] value value to set to type, or infered at parsing
     # @yieldreturn [Boolean]
@@ -98,7 +100,7 @@ module RASN1
     # @example
     #   # Define a new UInt32 type
     #   # UInt32 ::= INTEGER (0 .. 4294967295)
-    #   RASN1::Types.define_type('UInt32', from: RASN1::Types::Integer) do |value|
+    #   RASN2::Types.define_type('UInt32', from: RASN2::Types::Integer) do |value|
     #     (value >= 0) && (value < 2**32)
     #   end
     def self.define_type(name, from:, in_module: self, &block)

data/lib/{rasn1 → rasn2}/value_notation.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module RASN1
+module RASN2
   # Support for ASN.1 value notation (text representation of ASN.1 data instances).
   #
   # ASN.1 value notation allows defining values for ASN.1 types in a human-readable
@@ -16,8 +16,8 @@ module RASN1
   # to generate such text from {Model} instances.
   #
   # @example Parse a value notation string
-  #   models = RASN1::SchemaParser.parse_file('schema.asn')
-  #   record = RASN1::ValueNotation.parse(
+  #   models = RASN2::SchemaParser.parse_file('schema.asn')
+  #   record = RASN2::ValueNotation.parse(
   #     File.read('instance.asn'),
   #     models: models
   #   )
@@ -25,13 +25,13 @@ module RASN1
   #
   # @example Generate value notation from a model
   #   record = PersonnelRecord.new(name: 'John Doe', title: 'Engineer', age: 30, employed: true)
-  #   text = RASN1::ValueNotation.emit(record, name: 'myPerson', type_name: 'PersonnelRecord')
+  #   text = RASN2::ValueNotation.emit(record, name: 'myPerson', type_name: 'PersonnelRecord')
   #
   # @author rickmark
   # @since 0.17.0
   module ValueNotation
     # Error raised when parsing or emitting value notation fails
-    class Error < RASN1::Error; end
+    class Error < RASN2::Error; end
 
     class << self
       # Parse an ASN.1 value notation string and populate a model instance.

data/lib/rasn2/version.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module RASN2
+  # RASN2 version number
+  VERSION = '1.0.1'
+end

data/lib/{rasn1 → rasn2}/wrapper.rb

@@ -2,11 +2,11 @@
 
 require 'delegate'
 
-module RASN1
+module RASN2
   # This class is used to wrap a {Types::Base} or {Model} instance to force its options.
   #
   # == Usage
-  # This class may be used to wrap another RASN1 object by 4 ways:
+  # This class may be used to wrap another RASN2 object by 4 ways:
   # * wrap an object to modify its options,
   # * implicitly wrap an object (i.e. change its tag),
   # * explicitly wrap an object (i.e wrap the object in another explicit ASN.1 tag),
@@ -14,15 +14,15 @@ module RASN1
   #
   # @example Wrapping object
   #   # object to wrap
-  #   int = RASN1::Types::Integer.new(implicit: 1)    # its tag is 0x81
+  #   int = RASN2::Types::Integer.new(implicit: 1)    # its tag is 0x81
   #   # simple wrapper, change an option
-  #   wrapper = RASN1::Wrapper.new(int, default: 1)
+  #   wrapper = RASN2::Wrapper.new(int, default: 1)
   #   # implicit wrapper
-  #   wrapper = RASN1::Wrapper.new(int, implicit: 3)  # wrapped int tag is now 0x83
+  #   wrapper = RASN2::Wrapper.new(int, implicit: 3)  # wrapped int tag is now 0x83
   #   # explicit wrapper
-  #   wrapper = RASN1::Wrapper.new(int, explicit: 4)  # int tag is always 0x81, but it is wrapped in a 0x84 tag
+  #   wrapper = RASN2::Wrapper.new(int, explicit: 4)  # int tag is always 0x81, but it is wrapped in a 0x84 tag
   # @example Wrapping a choice to make it recursive
-  #  class RecursiveChoice < RASN1::Model
+  #  class RecursiveChoice < RASN2::Model
   #    choice :choice,
   #           content: [
   #             integer(:value, implicit: 1),
@@ -78,7 +78,7 @@ module RASN1
         @element_options_to_merge = opts
         @options = {}
       end
-      raise RASN1::Error, 'Cannot be implicit and explicit' if explicit? && implicit?
+      raise RASN2::Error, 'Cannot be implicit and explicit' if explicit? && implicit?
 
       super(element)
     end
@@ -201,13 +201,6 @@ module RASN1
       !constructed?
     end
 
-    # @param [::Integer] level
-    # @return [String]
-    def inspect(level=0)
-      return super() unless explicit?
-
-      @explicit_wrapper.inspect(level) << ' ' << super()
-    end
 
     private
 

data/lib/{rasn1.rb → rasn2.rb}

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
-require_relative 'rasn1/version'
-require_relative 'rasn1/errors'
-require_relative 'rasn1/helpers/colorize'
-require_relative 'rasn1/types'
-require_relative 'rasn1/model'
-require_relative 'rasn1/wrapper'
-require_relative 'rasn1/tracer'
-require_relative 'rasn1/schema_parser'
-require_relative 'rasn1/value_notation'
+require_relative 'rasn2/version'
+require_relative 'rasn2/errors'
+require_relative 'rasn2/helpers/colorize'
+require_relative 'rasn2/types'
+require_relative 'rasn2/model'
+require_relative 'rasn2/wrapper'
+require_relative 'rasn2/tracer'
+require_relative 'rasn2/schema_parser'
+require_relative 'rasn2/value_notation'
 
 # Constrained types
-require_relative 'rasn1/types/visible_string'
+require_relative 'rasn2/types/visible_string'
 
 # Rasn1 is a pure ruby library to parse, decode and encode ASN.1 data.
 # @author Sylvain Daubert
-module RASN1
+module RASN2
   # @private
   CONTAINER_CLASSES = [Types::Sequence, Types::Set].freeze
 
@@ -35,11 +35,11 @@ module RASN1
       type = Types.id2type(der)
       size = type.parse!(der, ber: ber)
 
-      if CONTAINER_CLASSES.include?(type.class)
-        RASN1.tracer.tracing_level += 1 unless RASN1.tracer.nil?
+      if CONTAINER_CLASSES.include?(type.class) || type.constructed?
+        RASN2.tracer.tracing_level += 1 unless RASN2.tracer.nil?
         content = self.parse(type.value)
         type.value = content.is_a?(Array) ? content : [content]
-        RASN1.tracer.tracing_level -= 1 unless RASN1.tracer.nil?
+        RASN2.tracer.tracing_level -= 1 unless RASN2.tracer.nil?
       end
 
       result << type

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rasn2
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 1.0.1
 platform: ruby
 authors:
 - LemonTree55
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.5
 description: |
-  RASN1 is a pure ruby ASN.1 library. It may encode and decode DER and BER
+  Rasn2 is a pure ruby ASN.1 library. It may encode and decode DER and BER
   encodings.
 email:
 - lenontree@proton.me
@@ -52,43 +52,43 @@ extra_rdoc_files:
 files:
 - LICENSE
 - README.md
-- lib/rasn1.rb
-- lib/rasn1/errors.rb
-- lib/rasn1/helpers/colorize.rb
-- lib/rasn1/model.rb
-- lib/rasn1/schema_parser.rb
-- lib/rasn1/tracer.rb
-- lib/rasn1/types.rb
-- lib/rasn1/types/any.rb
-- lib/rasn1/types/base.rb
-- lib/rasn1/types/bit_string.rb
-- lib/rasn1/types/bmp_string.rb
-- lib/rasn1/types/boolean.rb
-- lib/rasn1/types/choice.rb
-- lib/rasn1/types/constrained.rb
-- lib/rasn1/types/constructed.rb
-- lib/rasn1/types/enumerated.rb
-- lib/rasn1/types/generalized_time.rb
-- lib/rasn1/types/ia5_string.rb
-- lib/rasn1/types/integer.rb
-- lib/rasn1/types/null.rb
-- lib/rasn1/types/numeric_string.rb
-- lib/rasn1/types/object_id.rb
-- lib/rasn1/types/octet_string.rb
-- lib/rasn1/types/primitive.rb
-- lib/rasn1/types/printable_string.rb
-- lib/rasn1/types/sequence.rb
-- lib/rasn1/types/sequence_of.rb
-- lib/rasn1/types/set.rb
-- lib/rasn1/types/set_of.rb
-- lib/rasn1/types/tag.rb
-- lib/rasn1/types/universal_string.rb
-- lib/rasn1/types/utc_time.rb
-- lib/rasn1/types/utf8_string.rb
-- lib/rasn1/types/visible_string.rb
-- lib/rasn1/value_notation.rb
-- lib/rasn1/version.rb
-- lib/rasn1/wrapper.rb
+- lib/rasn2.rb
+- lib/rasn2/errors.rb
+- lib/rasn2/helpers/colorize.rb
+- lib/rasn2/model.rb
+- lib/rasn2/schema_parser.rb
+- lib/rasn2/tracer.rb
+- lib/rasn2/types.rb
+- lib/rasn2/types/any.rb
+- lib/rasn2/types/base.rb
+- lib/rasn2/types/bit_string.rb
+- lib/rasn2/types/bmp_string.rb
+- lib/rasn2/types/boolean.rb
+- lib/rasn2/types/choice.rb
+- lib/rasn2/types/constrained.rb
+- lib/rasn2/types/constructed.rb
+- lib/rasn2/types/enumerated.rb
+- lib/rasn2/types/generalized_time.rb
+- lib/rasn2/types/ia5_string.rb
+- lib/rasn2/types/integer.rb
+- lib/rasn2/types/null.rb
+- lib/rasn2/types/numeric_string.rb
+- lib/rasn2/types/object_id.rb
+- lib/rasn2/types/octet_string.rb
+- lib/rasn2/types/primitive.rb
+- lib/rasn2/types/printable_string.rb
+- lib/rasn2/types/sequence.rb
+- lib/rasn2/types/sequence_of.rb
+- lib/rasn2/types/set.rb
+- lib/rasn2/types/set_of.rb
+- lib/rasn2/types/tag.rb
+- lib/rasn2/types/universal_string.rb
+- lib/rasn2/types/utc_time.rb
+- lib/rasn2/types/utf8_string.rb
+- lib/rasn2/types/visible_string.rb
+- lib/rasn2/value_notation.rb
+- lib/rasn2/version.rb
+- lib/rasn2/wrapper.rb
 homepage: https://github.com/lemontree55/rasn1
 licenses:
 - MIT
@@ -99,7 +99,7 @@ metadata:
   documentation_uri: https://www.rubydoc.info/gems/rasn1
 rdoc_options:
 - "--title"
-- RASN1 - A pure ruby ASN.1 library
+- Rasn2 - A pure ruby ASN.1 library
 - "--main"
 - README.md
 - "--inline-source"

data/lib/rasn1/helpers/colorize.rb

@@ -1,76 +0,0 @@
-module RASN1
-  module Helpers
-    module Colorize
-      def parens_hex(input, padding=2)
-        input = input.is_a?(Integer) ? ("0x%0#{padding}x")% input : "0x#{input}"
-        "#{colorize('(').webgray}#{colorize(input).blue}#{colorize(')').webgray}"
-      end
-
-      def int_with_hex(input, raw_value=nil)
-        if raw_value
-          "#{colorize(input).blue} #{parens_hex(raw_value)}"
-        else
-          "#{colorize(input).blue} #{parens_hex(input)}"
-        end
-
-      end
-
-      def brace_surround(input)
-        "#{colorize('[').webgray} #{input} #{colorize(']').webgray}"
-      end
-
-      def colorize_class(name, tag_id=nil)
-        if tag_id
-          "#{colorize(name).bold.yellow} #{parens_hex(tag_id)}"
-          else
-        colorize(name).bold.yellow
-        end
-      end
-
-      def colorize_id(id, tag_class=nil)
-        id = id.strip if id.is_a? String
-        tag_class = tag_class.strip if tag_class.is_a? String
-        if tag_class && tag_class != ''
-          brace_surround("#{colorize_class(tag_class)} #{colorize(id).bold.green}")
-        else
-          brace_surround(colorize(id).bold.green)
-        end
-
-      end
-
-      def length_specifier(data_length, encoded_length = nil)
-        encoded_length = data_length if encoded_length.nil?
-        "#{colorize('len:').gray} #{colorize(data_length).blue} #{parens_hex(encoded_length)}"
-      end
-
-      def colorize_name(name)
-        colorize(name).bold.white
-      end
-
-      def colorize_attribute(attribute)
-        colorize(attribute).bold.magenta
-      end
-
-      def colorize_default(value)
-        colorize(value).green.bold
-      end
-
-      def colorize_nil(name = 'NONE')
-        colorize(name).red.bold
-      end
-
-      def colorize_enum(name, raw_value)
-        raw_value = raw_value.unpack1('H*') if raw_value.is_a?(String)
-        "#{colorize_class(name)} #{parens_hex(raw_value)}"
-      end
-
-      def colorize_bool(value, raw_value)
-        if value
-          "#{colorize('TRUE').bold.green} #{parens_hex(raw_value)}"
-        else
-          "#{colorize('FALSE').bold.red} #{parens_hex(raw_value)}"
-        end
-      end
-    end
-  end
-end

data/lib/rasn1/version.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module RASN1
-  # RASN1 version number
-  VERSION = '0.16.0'
-end