rasn1 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50b3f9ddc3a11279f36c21d14768a908b0fe4f22ff75d650791a7a58ac47eaa7
-  data.tar.gz: d229ea04a626e34d8411e3787101ace2c55e3cef7178b617073ed6b65fefb867
+  metadata.gz: e7f6fe2fadbdb5b72ec51995e911ac9adc7efbf497708ca581c2870ed3622b31
+  data.tar.gz: 6b68a59752a7ee439a7401b51415070b51ef3241f65864d263c1da9bfcdb2290
 SHA512:
-  metadata.gz: 37ea433265c6229a89d896e47918c242b2edc48c24ffa585873e3706dfc3eaf73628b76c91bad3e15e1d969a5caf52237c92336aefdba2668f63f9468e7e2004
-  data.tar.gz: 0035453de20ea4873999ec18eb3065afa9f1fdddc2927f446ecd2b1851a3a0d1bef32b5bbc2d9029f804a57cd71fefbf95dae4cd4babae5f8491f1e9ea8057ad
+  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,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/rasn1.svg)](https://badge.fury.io/rb/rasn1)
-[![Action status](https://github.com/sdaubert/rasn1/workflows/ci/badge.svg?branch=master)](https://github.com/sdaubert/rasn1/actions?query=workflow%3Aci)
+[![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)
@@ -461,6 +461,7 @@ module RASN1
         root.value
       else
         elt = by_name(name)
+        return nil if elt.nil?
 
         unless args.empty?
           args.each do |arg|
@@ -504,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
@@ -541,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
 
@@ -577,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
@@ -656,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/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,26 +71,25 @@ module RASN1
       end
 
       def value_when_fraction_empty(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)
-               zone[0, 3] << ':' << zone[3, 2]
+               zone = date_hour.slice!(-5, 5).to_s
+               "#{zone[0, 3]}:#{zone[3, 2]}"
              end
         year = date_hour.slice!(0, 4).to_i
-        others = date_hour.scan(/../).map(&:to_i)
-        # Ruby 3.0
-        # From 3.1: "Z" and "-0100" are supported
-        # Below 3.1: should be "-01:00" or "+00:00"
-        unless tz.nil?
-          others += [0] * (5 - others.size)
-          others << tz
-        end
-        @value = Time.new(year, *others)
-        # From 3.1: replace all this code by: Time.new(year, *others, in: tz)
+        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)

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.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)

data/lib/rasn1/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasn1
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
-- Sylvain Daubert
+- LemonTree55
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-03 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:
@@ -70,13 +70,13 @@ files:
 - 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:
 rdoc_options: