dnsruby 1.70.0 → 1.71.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dc686d217ec8e77f7abacc6b43390f892920c36a99f88f30f10dd55945b262b
-  data.tar.gz: 4763e50a42d153c3921c40cdadd273259fa882007da3dbc43b2098d50d895be1
+  metadata.gz: 269c27f2434453482847eab90060c2de583ca876e9056b8acff0c9df23a64a84
+  data.tar.gz: 37c09c9a2c25f97cfd391ee8662de09b1698a44b189abe2cd75753579c87379a
 SHA512:
-  metadata.gz: 0550b91ea605ae46381df4eb119b7457cef365f0981b90185479b5e490fede56fd72323b9c98b4e4f886bf16925fc6b268c6d0f753196d5cb6f1daaea05499e1
-  data.tar.gz: 3a16635ca644a6d4654bdaa9d83c7c5e0bba69289ffa59e2ad69994099b03b2e15bc2eeaf521200104d860e5127a1066bb41e39f5492c8ee010438a9c81c9a93
+  metadata.gz: 6863374c8f220932c6aff08fce2a8afd1e38267f44f505121516580b69e4c5691a613d11b45e4227939586f6283743871834138bca06a8776a26f6b32c2141ad
+  data.tar.gz: e58edc0688147d6c8e6576bf6144469d52b09120da7a7d7d0c00fc962579e1c49e23962264caa448d1bb54c70559e25e4663a176d95fe5282a43dba631233035

data/.github/workflows/ci.yml

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

data/RELEASE_NOTES.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## v.1.71.0
+
+* Fix assigning public_key in ECDSA - thanks Jiří Kubíček!
+
 ## v.1.70.0
 
 * OpenSSL 3 support

data/Rakefile

@@ -27,6 +27,7 @@ def create_task(task_name, test_suite_filespec)
 end
 
 create_task(:test,         'test/ts_dnsruby.rb')
+create_task(:dnskey,         'test/tc_dnskey.rb')
 create_task(:test_offline, 'test/ts_offline.rb')
 create_task(:test_online,  'test/ts_online.rb')
 create_task(:soak,         'test/tc_soak.rb')

data/dnsruby.gemspec

@@ -38,7 +38,7 @@ DNSSEC NSEC3 support.'
   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 'nio4r', '>= 2.7.0'
   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')

data/lib/dnsruby/resource/DNSKEY.rb

@@ -392,15 +392,22 @@ module Dnsruby
       # uncompressed form of a curve point, "x | y".
       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
-        public_key_with_prefix = "\x04" + @key.to_s
-        pkey = OpenSSL::PKey::EC.new(group, public_key_with_prefix)
-
-        pkey
-
+        dnskey_bn = OpenSSL::BN.new("\x04" + @key, 2)
+        key_point = OpenSSL::PKey::EC::Point.new(group, dnskey_bn)
+        
+        asn1 = OpenSSL::ASN1::Sequence.new(
+          [
+            OpenSSL::ASN1::Sequence.new([
+              OpenSSL::ASN1::ObjectId.new("id-ecPublicKey"),
+              OpenSSL::ASN1::ObjectId.new(group.curve_name)
+            ]),
+            OpenSSL::ASN1::BitString.new(key_point.to_octet_string(:uncompressed))
+          ]
+        )
+        OpenSSL::PKey::EC.new(asn1.to_der)
       end
     end
   end
-end
+end

data/lib/dnsruby/resource/TSIG.rb

@@ -234,7 +234,7 @@ module Dnsruby
       def verify_common(response)#:nodoc: all
         tsig_rr = response.tsig
 
-	if (!tsig_rr)
+	      if (!tsig_rr)
           response.tsigerror = RCode.FORMERR
           response.tsigstate = :Failed
           return false

data/lib/dnsruby/version.rb

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

data/lib/dnsruby/zone_transfer.rb

@@ -138,7 +138,7 @@ module Dnsruby
                 send_message(socket, msg)
                 next
               end
-              raise ResolvError.new(rcode.string);
+              raise ResolvError.new(rcode.string)
             end
 
             if (response.question[0].qtype != @transfer_type)

data/test/tc_dns.rb

@@ -25,7 +25,7 @@ class TestDNS < Minitest::Test
   end
 
   def test_ipv4_address
-    Dnsruby::DNS.open { |dns| dns.getnames(Dnsruby::IPv4.create("221.186.184.68")) }
+    Dnsruby::DNS.open { |dns| dns.getnames(Dnsruby::IPv4.create("8.8.8.8")) }
   end
 
   # def test_resolv_rb_api

data/test/tc_ecdsa.rb

@@ -0,0 +1,27 @@
+require_relative 'spec_helper'
+
+Dnsruby::TheLog.level = Logger::DEBUG
+
+class VerifierTest < Minitest::Test
+
+  def test_ecdsa
+    inner_resolver = Dnsruby::Resolver.new
+    inner_resolver.do_validation = true
+    inner_resolver.dnssec = true
+    resolver = Dnsruby::Recursor.new(inner_resolver)
+    resolver.dnssec = true
+
+    #    Dnsruby::TheLog.level=Logger::DEBUG
+
+    name = 'carlgo11.com'
+    type = 'A'
+    klass = 'IN'
+
+    begin
+      answer = resolver.query(name, type, klass)
+      print answer
+    rescue Exception => e
+      fatal_error("query failed: #{e}")
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dnsruby
 version: !ruby/object:Gem::Version
-  version: 1.70.0
+  version: 1.71.0
 platform: ruby
 authors:
 - Alex Dalitz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-11 00:00:00.000000000 Z
+date: 2024-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.8
+        version: 2.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.8
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: minitest-display
   requirement: !ruby/object:Gem::Requirement
@@ -254,6 +254,7 @@ files:
 - test/tc_dns.rb
 - test/tc_dnskey.rb
 - test/tc_ds.rb
+- test/tc_ecdsa.rb
 - test/tc_encoding.rb
 - test/tc_escapedchars.rb
 - test/tc_gpos.rb
@@ -335,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Ruby DNS(SEC) implementation