dnsruby 1.61.7 → 1.70.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d267eba6aca51b53799b98294feea8a6394293e86d27b0054daf81f5da532f8e
-  data.tar.gz: 5ed7a4a3c9c91407c79e7a2470546430ab13df880a22a8ed0d002d4bafb3cc3b
+  metadata.gz: 4dc686d217ec8e77f7abacc6b43390f892920c36a99f88f30f10dd55945b262b
+  data.tar.gz: 4763e50a42d153c3921c40cdadd273259fa882007da3dbc43b2098d50d895be1
 SHA512:
-  metadata.gz: 910c119b759313510f8fb2397ce48b9ac652a6d9c9e176d5eae93148a77664d7fe4b0b40a1c1c447beefcfe652807f6b1a7493314dd8dd71032e7ec2a56e7e99
-  data.tar.gz: 539eec74d5805ac121cb9b23d881ddb4bc98c755f90d88b07eedf864fef376ccceca076bf0d3c3bb8bdc858ff629133862253bad48a00ca205c6ad819b8cc97f
+  metadata.gz: 0550b91ea605ae46381df4eb119b7457cef365f0981b90185479b5e490fede56fd72323b9c98b4e4f886bf16925fc6b268c6d0f753196d5cb6f1daaea05499e1
+  data.tar.gz: 3a16635ca644a6d4654bdaa9d83c7c5e0bba69289ffa59e2ad69994099b03b2e15bc2eeaf521200104d860e5127a1066bb41e39f5492c8ee010438a9c81c9a93

data/.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.5', '2.6', '2.7', '3.0' ]
+        ruby: [ '2.6', '2.7', '3.0', '3.1', '3.2' ] # , 'ruby-head' ]
     name: Ruby ${{ matrix.ruby }} tests
     steps:
       - uses: actions/checkout@v2

data/RELEASE_NOTES.md

@@ -1,5 +1,20 @@
 # Release Notes
 
+## v.1.70.0
+
+* OpenSSL 3 support
+* Resource record hashes no longer include the rdata
+* Removed requite to title-cased Digest - thanks jhawthron
+
+## v.1.61.9
+
+* Remove unused net-ftp dependency
+
+## v.1.61.8
+
+* Fix compatability with Ruby 3.1 - thanks @byroot Jean Boussier
+* Get the digdlv demo to enable dnssec
+
 ## v1.61.7
 
 * Fix namespace issue from v1.61.6

data/Rakefile

@@ -33,4 +33,3 @@ create_task(:soak,         'test/tc_soak.rb')
 create_task(:message,      'test/tc_message.rb')
 create_task(:cache,         'test/tc_cache.rb')
 create_task(:pipe,          'test/tc_tcp_pipelining.rb')
-create_task(:resolv,       'test/tc_resolv.rb')

data/demo/digdlv.rb

@@ -53,6 +53,7 @@ unless (1..3).include?(ARGV.length)
 end
 
 resolver = Dnsruby::Recursor.new
+resolver.dnssec = true
 zone_transfer = Dnsruby::ZoneTransfer.new
 
 dlv_key = Dnsruby::RR.create("dlv.isc.org. IN DNSKEY 257 3 5 BEAAAAPHMu/5onzrEE7z1egmhg/WPO0+juoZrW3euWEn4MxDCE1+lLy2 brhQv5rN32RKtMzX6Mj70jdzeND4XknW58dnJNPCxn8+jAGl2FZLK8t+ 1uq4W+nnA3qO2+DL+k6BD4mewMLbIYFwe0PG73Te9fZ2kJb56dhgMde5 ymX4BI/oQ+cAK50/xvJv00Frf8kw6ucMTwFlgPe+jnGxPPEmHAte/URk Y62ZfkLoBAADLHQ9IrS2tryAe7mbBZVcOwIeU/Rw/mRx/vwwMCTgNboM QKtUdvNXDrYJDSHZws3xiRXF1Rf+al9UmZfSav/4NWLKjHzpT59k/VSt TDN0YUuWrBNh")

data/dnsruby.gemspec

@@ -35,17 +35,17 @@ DNSSEC NSEC3 support.'
     'source_code_uri'   => 'https://github.com/alexdalitz/dnsruby',
   }
 
-  s.add_development_dependency 'rake', '>= 12.3.3'
-  s.add_development_dependency 'minitest', '~> 5.4'
-  s.add_development_dependency 'rubydns', '~> 2.0.1'
-  s.add_development_dependency 'nio4r', '~> 2.0'
-  s.add_development_dependency 'minitest-display', '>= 0.3.0'
-  s.add_development_dependency('yard', '~> 0.9')
+  s.add_development_dependency 'rake', '>= 13.0.6'
+  s.add_development_dependency 'minitest', '~> 5.18.0'
+  s.add_development_dependency 'rubydns', '>= 2.0.2'
+  s.add_development_dependency 'nio4r', '>= 2.5.8'
+  s.add_development_dependency 'minitest-display', '>= 0.3.1'
+  s.add_development_dependency('yard', '>= 0.9')
+  # s.add_development_dependency('io-event', '>=1.1.7')
 
   if RUBY_VERSION >= "1.9.3"
-    s.add_development_dependency 'coveralls', '~> 0.7'
+    s.add_development_dependency 'coveralls', '~> 0.8.23'
   end
 
-  s.add_runtime_dependency 'simpleidn', '~> 0.1'
+  s.add_runtime_dependency 'simpleidn', '~> 0.2.1'
 end
-

data/lib/dnsruby/config.rb

@@ -300,7 +300,7 @@ module Dnsruby
             end
           rescue Exception => e
             Dnsruby.log.error{"Can't make sense of nameserver : #{server}, exception : #{e}"}
-                         raise ArgumentError.new("Can't make sense of nameserver : #{server}, exception : #{e}")
+            raise ArgumentError.new("Can't make sense of nameserver : #{server}, exception : #{e}")
             return nil
           end
         end

data/lib/dnsruby/dnssec.rb

@@ -14,7 +14,6 @@
 # limitations under the License.
 # ++
 require 'digest/sha2'
-require 'net/ftp'
 require 'dnsruby/key_cache'
 require 'dnsruby/single_verifier'
 module Dnsruby

data/lib/dnsruby/resource/DNSKEY.rb

@@ -294,11 +294,11 @@ module Dnsruby
         begin
           key_text.gsub!(/\n/, "")
           key_text.gsub!(/ /, "")
-          #         @key=Base64.decode64(key_text)
-          @key=key_text.unpack("m*")[0]
+          @key=Base64.decode64(key_text)
           public_key
           get_new_key_tag
-        rescue Exception
+        rescue Exception => e
+          Dnsruby.log.error(e)
           raise ArgumentError.new("Key #{key_text} invalid")
         end
       end
@@ -341,13 +341,12 @@ module Dnsruby
         modulus = RR::get_num(@key[pos, @key.length])
         @key_length = (@key.length - pos) * 8
 
-        pkey = OpenSSL::PKey::RSA.new
-        begin
-          pkey.set_key(modulus, exponent, nil) # use set_key, present in later versions of openssl gem
-        rescue NoMethodError
-          pkey.e = exponent # set_key not available in earlier versions, use this approach instead
-          pkey.n = modulus
-        end
+        data_sequence = OpenSSL::ASN1::Sequence([
+                                                  OpenSSL::ASN1::Integer(modulus),
+                                                  OpenSSL::ASN1::Integer(exponent)
+                                                ])
+        asn1 = OpenSSL::ASN1::Sequence(data_sequence)
+        pkey = OpenSSL::PKey::RSA.new(asn1.to_der)
         return pkey
       end
 
@@ -366,18 +365,25 @@ module Dnsruby
         pos += pgy_len
         @key_length = (pgy_len * 8)
 
-        pkey = OpenSSL::PKey::DSA.new
-        begin
-          pkey.set_pgq(p,g,q)
-          pkey.set_key(y, nil) # use set_pgq and set_key, present in later versions of openssl gem
-        rescue NoMethodError
-          pkey.p = p # set_key not available in earlier versions, use this approach instead
-          pkey.q = q
-          pkey.g = g
-          pkey.pub_key = y
-        end
-
-        pkey
+        asn1 = OpenSSL::ASN1::Sequence.new(
+          [
+            OpenSSL::ASN1::Sequence.new(
+              [
+                OpenSSL::ASN1::ObjectId.new('DSA'),
+                OpenSSL::ASN1::Sequence.new(
+                  [
+                    OpenSSL::ASN1::Integer.new(p),
+                    OpenSSL::ASN1::Integer.new(q),
+                    OpenSSL::ASN1::Integer.new(g)
+                  ]
+                )
+              ]
+            ),
+            OpenSSL::ASN1::BitString.new(OpenSSL::ASN1::Integer.new(y).to_der)
+          ]
+        )
+
+        pkey = OpenSSL::PKey::DSA.new(asn1.to_der)
       end
 
       # RFC6605, section 4
@@ -387,13 +393,13 @@ module Dnsruby
       def ec_key(curve = 'prime256v1')
         group = OpenSSL::PKey::EC::Group.new(curve)
         pkey = OpenSSL::PKey::EC.new(group)
-
         # DNSSEC pub does not have first octet that determines whether it's uncompressed
         # or compressed form, but it's required by OpenSSL to parse EC point correctly
-        point_from_pub = "\x04" + @key.to_s # octet string, \x04 prefix determines uncompressed
-        pkey.public_key = OpenSSL::PKey::EC::Point.new(group, point_from_pub)
+        public_key_with_prefix = "\x04" + @key.to_s
+        pkey = OpenSSL::PKey::EC.new(group, public_key_with_prefix)
 
         pkey
+
       end
     end
   end

data/lib/dnsruby/resource/DS.rb

@@ -14,11 +14,8 @@
 # limitations under the License.
 # ++
 require 'base64'
-begin
-require 'Digest/sha2'
-rescue LoadError
-  require 'digest/sha2'
-end
+require 'digest/sha2'
+
 module Dnsruby
   class RR
     # RFC4034, section 4

data/lib/dnsruby/resource/RR.rb

@@ -350,7 +350,7 @@ class RR
   end
 
   def hash # :nodoc:
-    vars = (self.instance_variables - [:@ttl]).sort
+    vars = (self.instance_variables - [:@ttl, :@rdata]).sort
     vars.inject(0) do |hash_value, var_name|
       hash_value ^ self.instance_variable_get(var_name).hash
     end

data/lib/dnsruby/version.rb

@@ -1,3 +1,3 @@
 module Dnsruby
-  VERSION = '1.61.7'
+  VERSION = '1.70.0'
 end

data/test/spec_helper.rb

@@ -10,12 +10,12 @@ if ENV['RUN_EXTRA_TASK'] == 'TRUE'
 
   require 'simplecov'
 
-  # SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
-      # [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter])
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-  SimpleCov.start do
-    add_filter 'test/'
-  end
+  # # SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
+  #     # [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter])
+  # SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  # SimpleCov.start do
+  #   add_filter 'test/'
+  # end
 end
 
 require 'minitest'

data/test/ts_offline.rb

@@ -62,14 +62,14 @@ TESTS.each { |test| require_relative "tc_#{test}.rb" }
 
 def have_open_ssl?
   have_open_ssl = true
-#  begin
-#    require "openssl"
-#    OpenSSL::HMAC.digest(OpenSSL::Digest::MD5.new, "key", "data")
-#    key = OpenSSL::PKey::RSA.new
-#    key.e = 111
-#  rescue
-#    have_open_ssl = false
-#  end
+  begin
+    require "openssl"
+    OpenSSL::HMAC.digest(OpenSSL::Digest::MD5.new, "key", "data")
+    key = OpenSSL::PKey::RSA.new
+    key.e = 111
+  rescue
+    have_open_ssl = false
+  end
   have_open_ssl
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dnsruby
 version: !ruby/object:Gem::Version
-  version: 1.61.7
+  version: 1.70.0
 platform: ruby
 authors:
 - Alex Dalitz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2023-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,82 +16,82 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: 5.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: 5.18.0
 - !ruby/object:Gem::Dependency
   name: rubydns
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: nio4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.5.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.5.8
 - !ruby/object:Gem::Dependency
   name: minitest-display
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.8.23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.8.23
 - !ruby/object:Gem::Dependency
   name: simpleidn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.1
 description: |-
   Dnsruby is a pure Ruby DNS client library which implements a
   stub resolver. It aims to comply with all DNS RFCs, including
@@ -335,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Ruby DNS(SEC) implementation