rasn1 0.12.1 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 884fa6f74d0b3074ef074d061301092d55df580b663714c4a962a7b8503d777d
-  data.tar.gz: 77cc3c5d7bf926463464ca4d37237f0cddc358e0d7b9aa3e85c15982ab3f3fc1
+  metadata.gz: e7f6fe2fadbdb5b72ec51995e911ac9adc7efbf497708ca581c2870ed3622b31
+  data.tar.gz: 6b68a59752a7ee439a7401b51415070b51ef3241f65864d263c1da9bfcdb2290
 SHA512:
-  metadata.gz: fee544874a10b10618cd596b1c30edd4ad70185a783eeadbe23a86fa2439339d7d025784be5adc76904e05856ac8791817a768c0603ece0141e38d2975e588ad
-  data.tar.gz: 39428eb166401712d44eb60c4413bcd919d4fca380213acbe1dc29c32425c03a8852e1f0afa8934f5a04c604b376ac3c47424754b358cae96cc685029c467da7
+  metadata.gz: d67a67c02d381d92ca93552834cdfc5bce175dc31794020c1d39b3fcea6301a50393f1c964c94d04ef7e14b5593275e5f72873bc89097118ce1abe0c6e4c582a
+  data.tar.gz: 5f2a8486a6ec2709ab3ecae6b664a4a731394ee5ada28f8c5908734aaf20b3e485eb6f4f0d74dc25d238191875732e02299eda3ad5d765dd870b39bf880c3e3a

data/LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
 Copyright (c) 2017 Sylvain Daubert
+Copyright (c) 2024 LemonTree55
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,4 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/rasn1.svg)](https://badge.fury.io/rb/rasn1)
+[![Action status](https://github.com/lemontree55/rasn1/workflows/ci/badge.svg?branch=master)](https://github.com/lemontree55/rasn1/actions?query=workflow%3Aci)
 
 # Rasn1
 

data/lib/rasn1/model.rb

@@ -68,7 +68,7 @@ module RASN1
     Elem = Struct.new(:name, :proc_or_class, :content) do
       # @param [String,Symbol] name
       # @param [Proc,Class] proc_or_class
-      # @param [Hash,nil] content
+      # @param [Array,nil] content
       def initialize(name, proc_or_class, content)
         if content.is_a?(Array)
           duplicate_names = find_all_duplicate_names(content.map(&:name) + [name])
@@ -278,7 +278,7 @@ module RASN1
     #  @return [Elem]
     #  @see Types::SetOf#initialize
     %w[sequence set].each do |type|
-      define_type_accel_of(type, Types.const_get("#{type.capitalize}Of"))
+      define_type_accel_of(type, Types.const_get(:"#{type.capitalize}Of"))
     end
 
     # @!method boolean(name, options)
@@ -299,6 +299,12 @@ module RASN1
     #  @param [Hash] options
     #  @return [Elem]
     #  @see Types::BitString#initialize
+    # @!method bmp_string(name, options)
+    #  @!scope class
+    #  @param [Symbol,String] name name of object in model
+    #  @param [Hash] options
+    #  @return [Elem]
+    #  @see Types::BmpString#initialize
     # @!method octet_string(name, options)
     #  @!scope class
     #  @param [Symbol,String] name name of object in model
@@ -317,6 +323,12 @@ module RASN1
     #  @param [Hash] options
     #  @return [Elem]
     #  @see Types::Enumerated#initialize
+    # @!method universal_string(name, options)
+    #  @!scope class
+    #  @param [Symbol,String] name name of object in model
+    #  @param [Hash] options
+    #  @return [Elem]
+    #  @see Types::UniversalString#initialize
     # @!method utf8_string(name, options)
     #  @!scope class
     #  @param [Symbol,String] name name of object in model
@@ -449,6 +461,7 @@ module RASN1
         root.value
       else
         elt = by_name(name)
+        return nil if elt.nil?
 
         unless args.empty?
           args.each do |arg|
@@ -492,14 +505,15 @@ module RASN1
 
     # Give a (nested) element from its name
     # @param [String, Symbol] name
-    # @return [Model, Types::Base]
+    # @return [Model, Types::Base, nil]
     def by_name(name)
       elt = self[name]
       return elt unless elt.nil?
 
       @elements.each_key do |subelt_name|
-        if self[subelt_name].is_a?(Model)
-          elt = self[subelt_name][name]
+        subelt = self[subelt_name]
+        if subelt.is_a?(Model)
+          elt = subelt[name]
           return elt unless elt.nil?
         end
       end
@@ -529,7 +543,12 @@ module RASN1
       class_element = self.class.class_eval { @root }
       @root_name = class_element.name
       @elements = {}
-      @elements[@root_name] = get_type(class_element.proc_or_class, self.class.options || {})
+      @elements[@root_name] = case class_element
+                              when WrapElem
+                                generate_wrapper(class_element)
+                              else
+                                get_type(class_element.proc_or_class, self.class.options || {})
+                              end
       class_element
     end
 
@@ -565,17 +584,18 @@ module RASN1
 
     def initialize_elements(obj, args)
       args.each do |name, value|
-        next unless obj[name]
+        subobj = obj[name]
+        next unless subobj
 
         case value
         when Hash
-          raise ArgumentError, "element #{name}: may only pass a Hash for Model elements" unless obj[name].is_a?(Model)
+          raise ArgumentError, "element #{name}: may only pass a Hash for Model elements" unless subobj.is_a?(Model)
 
-          initialize_elements obj[name], value
+          initialize_elements(subobj, value)
         when Array
-          initialize_element_from_array(obj[name], value)
+          initialize_element_from_array(subobj, value)
         else
-          obj[name].value = value
+          subobj.value = value
         end
       end
     end
@@ -644,12 +664,13 @@ module RASN1
     end
 
     def wrapper_to_h(wrap)
-      case wrap.element
+      el = wrap.element
+      case el
       when Model
-        hsh = wrap.element.to_h
+        hsh = el.to_h
         hsh[hsh.keys.first]
       else
-        private_to_h(wrap.element)
+        private_to_h(el)
       end
     end
   end

data/lib/rasn1/tracer.rb

@@ -75,8 +75,8 @@ module RASN1
         # @private
         # Unpatch {#do_parse} to remove tracing ability
         def stop_tracing
-          alias_method :do_parse, :do_parse_without_tracing # rubocop:disable Lint/DuplicateMethods
-          alias_method :do_parse_explicit, :do_parse_explicit_without_tracing # rubocop:disable Lint/DuplicateMethods
+          alias_method :do_parse, :do_parse_without_tracing
+          alias_method :do_parse_explicit, :do_parse_explicit_without_tracing
         end
       end
 
@@ -108,7 +108,7 @@ module RASN1
         # @private
         # Unpatch {#parse!} to remove tracing ability
         def stop_tracing
-          alias_method :parse!, :parse_without_tracing # rubocop:disable Lint/DuplicateMethods
+          alias_method :parse!, :parse_without_tracing
         end
       end
 
@@ -133,7 +133,7 @@ module RASN1
         # @private
         # Unpatch {#der_to_value!} to remove tracing ability
         def stop_tracing
-          alias_method :der_to_value, :der_to_value_without_tracing # rubocop:disable Lint/DuplicateMethods
+          alias_method :der_to_value, :der_to_value_without_tracing
         end
       end
 
@@ -158,7 +158,7 @@ module RASN1
         # @private
         # Unpatch {#der_to_value!} to remove tracing ability
         def stop_tracing
-          alias_method :der_to_value, :der_to_value_without_tracing # rubocop:disable Lint/DuplicateMethods
+          alias_method :der_to_value, :der_to_value_without_tracing
         end
       end
 

data/lib/rasn1/types/any.rb

@@ -61,7 +61,7 @@ module RASN1
       private
 
       def common_inspect(level)
-        lvl = level >= 0 ? level : 0
+        lvl = [0, level].max
         str = '  ' * lvl
         str << "#{@name} " unless @name.nil?
         str << asn1_class.to_s.upcase << ' ' unless asn1_class == :universal
@@ -82,9 +82,10 @@ module RASN1
         total_length += id_size
 
         @no_value = false
-        @value = der[0, total_length]
+        real_value = der[0, total_length].to_s
+        @value = real_value
 
-        [total_length, @value]
+        [total_length, real_value]
       end
 
       def trace_any

data/lib/rasn1/types/base.rb

@@ -374,7 +374,7 @@ module RASN1
       end
 
       def common_inspect(level)
-        lvl = level >= 0 ? level : 0
+        lvl = [level, 0].max
         str = '  ' * lvl
         str << "#{@name} " unless @name.nil?
         str << asn1_class_to_s
@@ -427,7 +427,7 @@ module RASN1
         when nil
           @asn1_class = :universal
         when Symbol
-          raise ClassError unless CLASSES.key? asn1_class
+          raise ClassError unless CLASSES.key?(asn1_class)
 
           @asn1_class = asn1_class
         else
@@ -621,7 +621,7 @@ module RASN1
       def find_type(id)
         Types.constants.map { |c| Types.const_get(c) }
              .select { |klass| klass < Primitive || klass < Constructed }
-             .find { |klass| klass::ID == id }
+             .find { |klass| id == klass::ID }
       end
 
       def bin2hex(str)

data/lib/rasn1/types/choice.rb

@@ -75,24 +75,27 @@ module RASN1
       # @return [Integer] total number of parsed bytes
       # @raise [ASN1Error] error on parsing
       def parse!(der, ber: false)
-        parsed = false
         @value.each_with_index do |element, i|
           @chosen = i
           nb_bytes = element.parse!(der, ber: ber)
-          parsed = true
           return nb_bytes
         rescue ASN1Error
           @chosen = nil
           next
         end
-        raise ASN1Error, "CHOICE #{@name}: no type matching #{der.inspect}" unless parsed
+
+        @no_value = true
+        @value = void_value
+        raise ASN1Error, "CHOICE #{@name}: no type matching #{der.inspect}" unless optional?
+
+        0
       end
 
       # @param [::Integer] level
       # @return [String]
       def inspect(level=0)
         str = common_inspect(level)
-        str << if defined? @chosen
+        str << if defined?(@chosen) && value?
                  "\n#{@value[@chosen].inspect(level + 1)}"
                else
                  ' not chosen!'

data/lib/rasn1/types/constrained.rb

@@ -9,12 +9,8 @@ module RASN1
     module Constrained
       # Define class/module methods for {Constrained} module
       module ClassMethods
-        # Setter for constraint
-        # @param [Proc,nil] constraint
-        # @return [Proc,nil]
-        def constraint=(constraint)
-          @constraint = constraint
-        end
+        # @return [Proc] proc to check constraints
+        attr_accessor :constraint
 
         # Check if a constraint is really defined
         # @return [Boolean]
@@ -31,15 +27,7 @@ module RASN1
         end
       end
 
-      class << self
-        # @return [Proc] proc to check constraints
-        attr_reader :constraint
-
-        # Extend +base+ with {ClassMethods}
-        def included(base)
-          base.extend ClassMethods
-        end
-      end
+      extend ClassMethods
 
       # Redefined +#value=+ to check constraint before assigning +val+
       # @see Types::Base#value=

data/lib/rasn1/types/generalized_time.rb

@@ -71,19 +71,32 @@ module RASN1
       end
 
       def value_when_fraction_empty(date_hour)
-        if (date_hour[-1] != 'Z') && (date_hour !~ /[+-]\d+$/)
-          # If not UTC, have to add offset with UTC to force
-          # Strptime to generate a local time.
-          date_hour << Time.now.strftime('%z')
-        end
-
-        value_from(date_hour)
+        # Ruby 3.0: special handle for timezone
+        #   From 3.1: "Z" and "-0100" are supported
+        #   Below 3.1: should be "-01:00" or "+00:00"
+        tz = if date_hour[-1] == 'Z'
+               date_hour.slice!(-1, 1)
+               '+00:00' # Ruby 3.0: to remove after end-of support of ruby 3.0
+             elsif date_hour.match?(/[+-]\d+$/)
+               # Ruby 3.0
+               # date_hour.slice!(-5, 5)
+               zone = date_hour.slice!(-5, 5).to_s
+               "#{zone[0, 3]}:#{zone[3, 2]}"
+             end
+        year = date_hour.slice!(0, 4).to_i
+        month = date_hour.slice!(0, 2).to_i
+        day = date_hour.slice!(0, 2).to_i
+        hour = date_hour.slice!(0, 2).to_i
+        minute = date_hour.slice!(0, 2).to_i
+        second = date_hour.slice!(0, 2).to_i
+        @value = Time.new(year, month, day, hour, minute, second, tz)
       end
 
       def value_when_fraction_ends_with_z(date_hour, fraction)
         fraction = fraction[0...-1]
         date_hour << 'Z'
-        frac_base = value_from(date_hour)
+        frac_base = compute_frac_base(date_hour)
+        value_when_fraction_empty(date_hour)
         fix_value(fraction, frac_base)
       end
 
@@ -93,42 +106,32 @@ module RASN1
           # fraction contains fraction and timezone info. Split them
           fraction = match[1]
           date_hour << match[2]
-        else
-          # fraction only contains fraction.
-          # Have to add offset with UTC to force Strptime to
-          # generate a local time.
-          date_hour << Time.now.strftime('%z')
         end
 
-        frac_base = value_from(date_hour)
+        frac_base = compute_frac_base(date_hour)
+        value_when_fraction_empty(date_hour)
         fix_value(fraction, frac_base)
       end
 
-      def value_from(date_hour)
-        format, frac_base = strformat(date_hour)
-        @value = Strptime.new(format).exec(date_hour)
-        frac_base
-      end
-
       def fix_value(fraction, frac_base)
         frac = ".#{fraction}".to_r * frac_base
         @value = (@value + frac) unless fraction.nil?
       end
 
-      def strformat(date_hour)
+      def compute_frac_base(date_hour)
         case date_hour.size
-        when 11
-          ['%Y%m%d%H%z', HOUR_TO_SEC]
-        when 13, 17
-          ['%Y%m%d%H%M%z', MINUTE_TO_SEC]
+        when 10, 11
+          HOUR_TO_SEC
+        when 12, 13, 17
+          MINUTE_TO_SEC
         when 15
           if date_hour[-1] == 'Z'
-            ['%Y%m%d%H%M%S%z', SECOND_TO_SEC]
+            SECOND_TO_SEC
           else
-            ['%Y%m%d%H%z', HOUR_TO_SEC]
+            HOUR_TO_SEC
           end
-        when 19
-          ['%Y%m%d%H%M%S%z', SECOND_TO_SEC]
+        when 14, 19
+          SECOND_TO_SEC
         else
           prefix = @name.nil? ? type : "tag #{@name}"
           raise ASN1Error, "#{prefix}: unrecognized format: #{date_hour}"

data/lib/rasn1/types/integer.rb

@@ -45,10 +45,12 @@ module RASN1
       # Integer value
       # @return [Integer]
       def to_i
-        if @enum.empty?
-          value? ? @value : @default || 0
+        val = value? ? @value : @default
+        case val
+        when String, Symbol
+          @enum[val]
         else
-          @enum[value? ? @value : @default] || 0
+          val || 0
         end
       end
 
@@ -135,10 +137,12 @@ module RASN1
       end
 
       def der_to_value(der, ber: false)
-        @value = der_to_int_value(der, ber: ber)
-        return if @enum.empty?
-
-        @value = int_to_enum(@value)
+        int_value = der_to_int_value(der, ber: ber)
+        @value = if @enum.empty?
+                   int_value
+                 else
+                   int_to_enum(int_value)
+                 end
       end
 
       def explicit_type

data/lib/rasn1/types/object_id.rb

@@ -11,18 +11,21 @@ module RASN1
       private
 
       def value_to_der
-        ids = @value.to_s.split('.').map!(&:to_i)
+        ids = @value.to_s.split('.').map(&:to_i)
 
         raise ASN1Error, "OBJECT ID #{@name}: first subidentifier should be less than 3" if ids[0] > 2
         raise ASN1Error, "OBJECT ID #{@name}: second subidentifier should be less than 40" if (ids[0] < 2) && (ids[1] > 39)
 
         ids[0, 2] = ids[0] * 40 + ids[1]
-        ids.map! do |v|
-          next v if v < 128
-
-          unsigned_to_chained_octets(v)
+        octets = []
+        ids.each do |v|
+          if v < 128
+            octets << v
+          else
+            octets.concat(unsigned_to_chained_octets(v))
+        end
         end
-        ids.flatten.pack('C*')
+        octets.pack('C*')
       end
 
       def der_to_value(der, ber: false) # rubocop:disable Lint/UnusedMethodArgument

data/lib/rasn1/types/sequence_of.rb

@@ -144,11 +144,7 @@ module RASN1
         nb_bytes = 0
 
         while nb_bytes < der.length
-          type = if composed_of_type? && !@of_type.is_a?(Class)
-                   @of_type.dup
-                 else
-                   of_type_class.new
-                 end
+          type = of_type_class.new
           nb_bytes += type.parse!(der[nb_bytes, der.length])
           @value << type
         end

data/lib/rasn1/types/universal_string.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module RASN1
+  module Types
+    # ASN.1 UniversalString
+    # @since 0.13.0
+    # @author zeroSteiner
+    class UniversalString < OctetString
+      # UniversalString id value
+      ID = 28
+
+      # Get ASN.1 type
+      # @return [String]
+      def self.type
+        'UniversalString'
+      end
+
+      private
+
+      def value_to_der
+        @value.to_s.dup.encode('UTF-32BE').b
+      end
+
+      def der_to_value(der, ber: false)
+        super
+        @value = der.to_s.dup.force_encoding('UTF-32BE')
+      end
+    end
+  end
+end

data/lib/rasn1/types.rb

@@ -32,18 +32,20 @@ module RASN1
     #                 ID and size of identifier octets
     def self.decode_identifier_octets(der)
       first_octet = der.unpack1('C').to_i
-      asn1_class = Types::Base::CLASSES.key(first_octet & Types::Base::CLASS_MASK)
+      asn1_class = Types::Base::CLASSES.key(first_octet & Types::Base::CLASS_MASK) || :universal
       pc = (first_octet & Types::Constructed::ASN1_PC).positive? ? :constructed : :primitive
       id = first_octet & Types::Base::MULTI_OCTETS_ID
 
       size = if id == Types::Base::MULTI_OCTETS_ID
                id = 0
-               der.bytes.each_with_index do |octet, i|
-                 next if i.zero?
+               count = 1
+               der[1..-1].to_s.bytes.each do |octet|
+                 count += 1
 
                  id = (id << 7) | (octet & 0x7f)
-                 break i + 1 if (octet & 0x80).zero?
+                 break if (octet & 0x80).zero?
                end
+               count
              else
                1
              end
@@ -98,11 +100,11 @@ module RASN1
     #     (value >= 0) && (value < 2**32)
     #   end
     def self.define_type(name, from:, in_module: self, &block)
-      constraint = block.nil? ? nil : block.to_proc
+      constraint = block&.to_proc
 
-      new_klass = Class.new(from) do
-        include Constrained
-      end
+      new_klass = Class.new(from)
+      new_klass.include(Constrained)
+      new_klass.extend(Constrained::ClassMethods)
       new_klass.constraint = constraint
 
       in_module.const_set(name, new_klass)
@@ -128,6 +130,7 @@ require_relative 'types/null'
 require_relative 'types/object_id'
 require_relative 'types/enumerated'
 require_relative 'types/bmp_string'
+require_relative 'types/universal_string'
 require_relative 'types/utf8_string'
 require_relative 'types/numeric_string'
 require_relative 'types/printable_string'

data/lib/rasn1/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RASN1
-  VERSION = '0.12.1'
+  VERSION = '0.13.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasn1
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.1
 platform: ruby
 authors:
-- Sylvain Daubert
-autorequire: 
+- LemonTree55
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-23 00:00:00.000000000 Z
+date: 2024-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: strptime
@@ -28,7 +28,7 @@ description: |
   RASN1 is a pure ruby ASN.1 library. It may encode and decode DER and BER
   encodings.
 email:
-- sylvain.daubert@laposte.net
+- lenontree@proton.me
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -64,20 +64,21 @@ files:
 - lib/rasn1/types/sequence_of.rb
 - lib/rasn1/types/set.rb
 - lib/rasn1/types/set_of.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/version.rb
 - lib/rasn1/wrapper.rb
-homepage: https://github.com/sdaubert/rasn1
+homepage: https://github.com/lemontree55/rasn1
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/sdaubert/rasn1
-  source_code_uri: https://github.com/sdaubert/rasn1
-  bug_tracker_uri: https://github.com/sdaubert/rasn1/issues
+  homepage_uri: https://github.com/lemontree55/rasn1
+  source_code_uri: https://github.com/lemontree55/rasn1
+  bug_tracker_uri: https://github.com/lemontree55/rasn1/issues
   documentation_uri: https://www.rubydoc.info/gems/rasn1
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - RASN1 - A pure ruby ASN.1 library
@@ -91,15 +92,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
-signing_key: 
+rubygems_version: 3.3.15
+signing_key:
 specification_version: 4
 summary: Ruby ASN.1 library
 test_files: []