dnsruby 1.70.0 → 1.74.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dc686d217ec8e77f7abacc6b43390f892920c36a99f88f30f10dd55945b262b
-  data.tar.gz: 4763e50a42d153c3921c40cdadd273259fa882007da3dbc43b2098d50d895be1
+  metadata.gz: 31fc09cb1cf4b1c2174c67a16e96601eb25c6509e6525c3cef9159da5fd656c2
+  data.tar.gz: e96495f35da0ff50636052f3f27623b4fc620572c0c4109f6c47a5a81eb77801
 SHA512:
-  metadata.gz: 0550b91ea605ae46381df4eb119b7457cef365f0981b90185479b5e490fede56fd72323b9c98b4e4f886bf16925fc6b268c6d0f753196d5cb6f1daaea05499e1
-  data.tar.gz: 3a16635ca644a6d4654bdaa9d83c7c5e0bba69289ffa59e2ad69994099b03b2e15bc2eeaf521200104d860e5127a1066bb41e39f5492c8ee010438a9c81c9a93
+  metadata.gz: 84c58dc7dbf8d3c33d11ee7ea10d076d806cf1700c327b5e84fbebac08484fba8179734dbe9631c85daec38518b29ca3d8e3a29629d71a69a955f615bdf60346
+  data.tar.gz: 06b7c82e2b1e979f1c18aaa9567596f6724a7fb5eae8da688921958506ab9cc9ed1657f168699ec6a0112c3c25afcba419d333b7f3b4f618537fa6e6f1ee91c7

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: alexdalitz

data/.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "bundler" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

data/.github/workflows/ci.yml

@@ -6,8 +6,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.7', '3.0', '3.1', '3.2' ] # , 'ruby-head' ]
+        ruby: [ '3.2.10', '3.3.11', '3.4.10', '4.0.5' ] # , 'ruby-head' ]
+        rubyopt: ['']
+        include:
+          - ruby: '3.4'
+            rubyopt: "--enable-frozen-string-literal --debug-frozen-string-literal"
+
     name: Ruby ${{ matrix.ruby }} tests
     steps:
       - uses: actions/checkout@v2
@@ -15,9 +21,6 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - name: Bundle install
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Run tests
-        run: bundle exec rake test
+          bundler-cache: true
+      - name: Run tests ${{ matrix.rubyopt }}
+        run: bundle exec rake test RUBYOPT="${{ matrix.rubyopt }}"

data/RELEASE_NOTES.md

@@ -1,5 +1,55 @@
 # Release Notes
 
+## v1.74.0
+
+* Resolve all configured nameservers in parallel
+* Only raise ArgumentError from Resolver if _all_ configured nameservers are invalid - otherwise, just log the bad one(s) and continue
+* print out extra OPT data
+*  Fix wakeup socket deletion on stopping of select thread
+* Make sure to add nameservers if using config_info in Resolver
+* Fix for RRSET pruning and potential cache poisoning - thanks Alexander Tan
+* Fix WKS record protocol field encoding and decoding size according to RFC 1035 Section 3.4.2 where PROTOCOL is an 8 bit (#220)
+* Updating workflows to include Ruby 4, and get rdoc working for it
+
+## v1.73.1
+
+* fix(caa): add support for issuevmc (#214) - thanks Mark McDonnell!
+
+## v1.73.0
+
+* Ruby 3.4 updates - thanks @zarqman!
+* Enable setting up a custom UDP size when DNSSEC validation is disabled
+* EDNS OPT RR for udp_size > 512 - thanks @mrideout!
+* Test code improvements - thanks @mrideout!
+* base64 gem version fixes
+* Fix for file descriptor leak on truncated UDP messages
+
+## v1.72.4
+
+* allow parsing case insensitive property tags for CAA records - thanks ruby-dev!
+* Add logger as a dependency for Ruby 3.5.0+ support - thanks Alexandre ZANNI!
+
+## v1.72.3
+
+* Fix cached answer response time - thanks Andre Meij!
+* Add base64 as a dependency for Ruby 3.4.0+ support - thanks Alexandre ZANNI!
+
+## v1.72.2
+
+* Invalid CAA handling fixes - thanks Noah Smethwick and Ryan Doherty!
+
+## v.1.72.1
+
+* Add issuemail CAA record support - thanks Ryan Doherty!
+
+## v.1.72.0
+
+* Fix compatibility with the `--enable-string-literal` Ruby option - thanks Jean byroot Boussier!
+
+## v.1.71.0
+
+* Fix assigning public_key in ECDSA - thanks Jiří Kubíček!
+
 ## v.1.70.0
 
 * OpenSSL 3 support

data/cache_delay.rb

@@ -0,0 +1,20 @@
+require "dnsruby"
+Dnsruby::TheLog.level = Logger::DEBUG
+
+def testme
+  domain1 = "example.com"
+  domain2 = "example.net"
+  
+  start_time = Time.now
+  resolver = Dnsruby::Resolver.new
+  resolver.query(domain1)
+  puts "First query time: #{Time.now - start_time} seconds"
+  
+  start_time = Time.now
+  resolver = Dnsruby::Resolver.new
+  resolver.query(domain2)
+  puts "Second query time: #{Time.now - start_time} seconds"
+end
+
+testme
+testme

data/demo/rubydig.rb

@@ -60,6 +60,8 @@ if ARGV[0] =~ /^@/
   else
     puts "Setting nameserver : #{nameserver}"
     resolver.nameserver = (nameserver.sub(/^@/, ''))
+    resolver.dnssec = true
+    resolver.do_validation = true
     puts "nameservers = #{resolver.config.nameserver}"
     zone_transfer.server = (nameserver.sub(/^@/, ''))
   end

data/dnsruby.gemspec

@@ -15,7 +15,10 @@ SPEC = Gem::Specification.new do |s|
 stub resolver. It aims to comply with all DNS RFCs, including
 DNSSEC NSEC3 support.'
   s.license = "Apache License, Version 2.0"
-  
+
+  # Add explicit Ruby version requirement
+  s.required_ruby_version = '>= 2.8.0'
+
   s.files = `git ls-files -z`.split("\x0")
 
   s.post_install_message = \
@@ -36,16 +39,15 @@ DNSSEC NSEC3 support.'
   }
 
   s.add_development_dependency 'rake', '>= 13.0.6'
-  s.add_development_dependency 'minitest', '~> 5.18.0'
+  s.add_development_dependency 'minitest', '~> 5.25'
   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.8.23'
-  end
+  s.add_development_dependency 'rdoc', '>= 6.5', '< 8.0'
+  s.add_development_dependency 'yard', '>= 0.9'
+  s.add_development_dependency 'coveralls', '~> 0.8.23'
 
+  s.add_runtime_dependency 'base64', '>= 0.2'
+  s.add_runtime_dependency 'logger', '~> 1.6'
   s.add_runtime_dependency 'simpleidn', '~> 0.2.1'
 end

data/fd.ruby

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require 'dnsruby'
+require 'thread'
+
+#Dnsruby.log.level = Logger::DEBUG
+
+# speed up the repro
+NFILES = 30
+nfiles, _ = Process.getrlimit(Process::RLIMIT_NOFILE)
+Process.setrlimit(Process::RLIMIT_NOFILE, NFILES) if nfiles > NFILES
+
+NAMESERVERS = ["192.31.80.30"]
+
+Thread.new {
+  res = Dnsruby::Resolver.new(nameserver: NAMESERVERS, do_caching: false, query_timeout: 5)
+  loop do
+    begin
+      res.query("blahblahblah.com.edgekey.net", "CNAME")
+    rescue Dnsruby::ResolvError
+    end
+    sleep 0.2
+  end
+}
+
+loop do
+#  system("ls -l /proc/#{Process.pid}/fd/")
+  system("lsof -p #{Process.pid} | wc -l")
+  File.open("/") { |_| }
+  sleep 1
+end

data/lib/dnsruby/bit_mapping.rb

@@ -15,7 +15,7 @@ module Dnsruby
 
     # Converts from a binary string to a number, e.g. "\x01\x00" => 256
     def binary_string_to_number(string)
-      string = string.clone.force_encoding(Encoding::ASCII_8BIT)
+      string = string.b
       string.bytes.inject(0) do |number, byte|
         number * 256 + byte.ord
       end
@@ -25,7 +25,7 @@ module Dnsruby
     # Converts a number to a binary encoded string, e.g. 256 => "\x01\x00"
     def number_to_binary_string(number, min_length = 0)
       assert_non_negative(number)
-      binary_string = ''.force_encoding(Encoding::ASCII_8BIT)
+      binary_string = ''.b
 
       while number > 0
         byte_value = number & 0xFF

data/lib/dnsruby/cache.rb

@@ -68,14 +68,12 @@ module Dnsruby
     #  This method "fixes up" the response, so that the header and ttls are OK
     #  The resolver will still need to copy the flags and ID across from the query
     def find(qname, qtype, qclass = Classes.IN)
-#      print "CACHE find : #{qname}, #{qtype}\n"
       qn = Name.create(qname)
       qn.absolute = true
       key = CacheKey.new(qn, qtype, qclass).to_s
       @mutex.synchronize {
         data = @cache[key]
         if (!data)
-#          print "CACHE lookup failed\n"
           return nil
         end
         if (data.expiration <= Time.now.to_i)

data/lib/dnsruby/code_mappers.rb

@@ -70,7 +70,8 @@ module Dnsruby
     #  (RFC3597)
     #  See typesbyval and typesbyname, these beasts have the same functionality
     def Classes.classesbyname(name) #:nodoc: all
-      name.upcase!;
+      name = name.upcase
+
       if to_code(name)
         return to_code(name)
       end
@@ -202,7 +203,7 @@ module Dnsruby
     #  mnemonic. If the TYPE mapping is not specified the generic mnemonic
     #  TYPE### is returned.
     def Types.typesbyname(name)  #:nodoc: all
-      name.upcase!
+      name = name.upcase
 
       if to_code(name)
         return to_code(name)

data/lib/dnsruby/config.rb

@@ -294,6 +294,8 @@ module Dnsruby
                   end
                 }
                 if (!found)
+                  # Log the error, in case Resolver is resolving a set of nameservers, and swallows the exception
+                  TheLog.error{"Recursor can't locate #{server}"}
                   raise ArgumentError.new("Recursor can't locate #{server}")
                 end
               end
@@ -318,11 +320,6 @@ module Dnsruby
         f.each {|line|
           line.sub!(/[#;].*/, '')
           keyword, *args = line.split(/\s+/)
-            if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.8")
-              args.each { |arg|
-                arg.untaint
-              }
-            end
           next unless keyword
           case keyword
           when 'port'

data/lib/dnsruby/hosts.rb

@@ -57,19 +57,12 @@ module Dnsruby
                 line.sub!(/#.*/, '')
                 addr, hostname, *aliases = line.split(/\s+/)
                 next unless addr
-                if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.8")
-                  addr.untaint
-                  hostname.untaint
-                end
                 @addr2name[addr] = [] unless @addr2name.include? addr
                 @addr2name[addr] << hostname
                 @addr2name[addr] += aliases
                 @name2addr[hostname] = [] unless @name2addr.include? hostname
                 @name2addr[hostname] << addr
                 aliases.each {|n|
-                  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.8")
-                    n.untaint
-                  end
                   @name2addr[n] = [] unless @name2addr.include? n
                   @name2addr[n] << addr
                 }

data/lib/dnsruby/ipv6.rb

@@ -57,14 +57,14 @@ module Dnsruby
       when IPv6
         return arg
       when String
-        address = ''
+        address = +''
         if Regex_8Hex =~ arg
           arg.scan(/[0-9A-Fa-f]+/) {|hex| address << [hex.hex].pack('n')}
         elsif Regex_CompressedHex =~ arg
           prefix = $1
           suffix = $2
-          a1 = ''
-          a2 = ''
+          a1 = +''
+          a2 = +''
           prefix.scan(/[0-9A-Fa-f]+/) {|hex| a1 << [hex.hex].pack('n')}
           suffix.scan(/[0-9A-Fa-f]+/) {|hex| a2 << [hex.hex].pack('n')}
           omitlen = 16 - a1.length - a2.length
@@ -80,8 +80,8 @@ module Dnsruby
         elsif Regex_CompressedHex4Dec =~ arg
           prefix, suffix, a, b, c, d = $1, $2, $3.to_i, $4.to_i, $5.to_i, $6.to_i
           if (0..255) === a && (0..255) === b && (0..255) === c && (0..255) === d
-            a1 = ''
-            a2 = ''
+            a1 = +''
+            a2 = +''
             prefix.scan(/[0-9A-Fa-f]+/) {|hex| a1 << [hex.hex].pack('n')}
             suffix.scan(/[0-9A-Fa-f]+/) {|hex| a2 << [hex.hex].pack('n')}
             omitlen = 12 - a1.length - a2.length

data/lib/dnsruby/message/encoder.rb

@@ -1,7 +1,7 @@
 module Dnsruby
 class MessageEncoder #:nodoc: all
   def initialize
-    @data = ''
+    @data = +''
     @names = {}
     yield self if block_given?
   end

data/lib/dnsruby/message/message.rb

@@ -408,7 +408,7 @@ module Dnsruby
     end
 
     def to_s
-      s = ''  # the output string to return
+      s = +''  # the output string to return
 
       if @answerfrom && (! @answerfrom.empty?)
         s << ";; Answer received from #{@answerfrom} (#{@answersize} bytes)\n;;\n"
@@ -457,7 +457,7 @@ module Dnsruby
 
 
     def old_to_s
-      retval = ''
+      retval = +''
 
       if (@answerfrom != nil && @answerfrom != '')
         retval = retval + ";; Answer received from #{@answerfrom} (#{@answersize} bytes)\n;;\n"

data/lib/dnsruby/packet_sender.rb

@@ -204,6 +204,7 @@ module Dnsruby
       @tcp_pipelining_max_queries = :infinite
       @use_counts = {}
 
+      ignore_config_resolv_errors = false;
       if arg.nil?
       elsif arg.kind_of? String
         @server = arg
@@ -212,10 +213,14 @@ module Dnsruby
       elsif arg.kind_of? Hash
         arg.keys.each do |attr|
           begin
-            if ((attr.to_s == "src_address" || attr.to_s == "src_address6") &&
-                (arg[attr] == nil || arg[attr] == ""))
+            if (attr.to_s == "ignore_config_resolv_errors")
+              ignore_config_resolv_errors = arg[attr]
             else
-              send(attr.to_s + "=", arg[attr])
+              if ((attr.to_s == "src_address" || attr.to_s == "src_address6") &&
+                  (arg[attr] == nil || arg[attr] == ""))
+              else
+                send(attr.to_s + "=", arg[attr])
+              end
             end
           rescue Exception => e
             Dnsruby.log.error { "PacketSender : Argument #{attr}, #{arg[attr]} not valid : #{e}\n" }
@@ -223,7 +228,17 @@ module Dnsruby
         end
       end
       # Check server is IP
-      @server=Config.resolve_server(@server)
+      # We should allow the call of PacketSender.new to flag just to log an error if this fails
+      # and then return null
+        if ignore_config_resolv_errors
+          begin
+            @server=Config.resolve_server(@server)
+          rescue ArgumentError
+            return
+          end
+        else
+            @server=Config.resolve_server(@server)
+        end
 
       check_ipv6
       #       ResolverRegister::register_single_resolver(self)

data/lib/dnsruby/recursor.rb

@@ -500,7 +500,7 @@ module Dnsruby
         return nil
       end
 
-      known_zone.sub!(/\.*$/, ".")
+      known_zone = known_zone.sub(/\.*$/, ".")
 
       ns = [] # Array of AddressCaches (was array of array of addresses)
       @@mutex.synchronize{
@@ -678,7 +678,8 @@ module Dnsruby
                 if (of.length <= known_zone.length)
                   TheLog.debug(";; _dorecursion() Deadbeat name server did not provide new information.")
                   next
-                elsif (of =~ /#{known_zone}/)
+                # elsif (of =~ /#{known_zone}/)
+                elsif (of == known_zone || known_zone.length == 1 || of.end_with?(".#{known_zone}"))
                   TheLog.debug(";; _dorecursion() FOUND closer authority for [#{of}] at [#{server}].")
                   auth[server] ||= AddressCache.new #[] @TODO@ If there is no additional record for this, then we want to use the authority!
                   if (rr.type == Types.NS)
@@ -688,7 +689,7 @@ module Dnsruby
                       end
                   end
                 else
-                  TheLog.debug(";; _dorecursion() Confused name server [" + @answerfrom + "] thinks [#{of}] is closer than [#{known_zone}]?")
+                  TheLog.debug(";; _dorecursion() Confused name server [" + @answerfrom.to_s + "] thinks " + of.to_s + " is closer than " + known_zone.to_s + "?")
                   return nil
                 end
               else
@@ -750,9 +751,9 @@ module Dnsruby
       #  Now prune the response of any unrelated rrsets (RFC5452 section6)
       #  "One very simple way to achieve this is to only accept data if it is
       #  part of the domain for which the query was intended."
-      if (!packet.header.aa)
-        return
-      end
+      # if (!packet.header.aa)
+      #   return
+      # end
       if (!packet.question()[0])
         return
       end

data/lib/dnsruby/resolver.rb

@@ -299,15 +299,17 @@ module Dnsruby
     #  is sent (TSIG signatures will be applied if configured on the Resolver).
     #  Retries are handled as the Resolver is configured to do.
     #  Incoming responses to the query are not cached or validated (although TCP
-    #  fallback will be performed if the TC bit is set and the (Single)Resolver has
-    #  ignore_truncation set to false).
-    #  Note that the Message is left untouched - this means that no OPT records are
-    #  added, even if the UDP transport for the server is specified at more than 512
-    #  bytes. If it is desired to use EDNS for this packet, then you should call
-    #  the Dnsruby::PacketSender#prepare_for_dnssec(msg), or
-    #  Dnsruby::PacketSender#add_opt_rr(msg)
-    #  The return value from this method is the [response, error] tuple. Either of
-    #  these values may be nil - it is up to the client to check.
+    #  fallback will be performed if the TC bit is set and the (Single)Resolver
+    #  has ignore_truncation set to false).
+    #  Note that the Message may be modified before sending: if the configured
+    #  udp_size is >512 bytes, DNSSEC is not set, and no OPT record is already
+    #  present, then an OPT record will be added automatically to support EDNS
+    #  per RFC 6891.
+    #  If it is desired to customize the OPT record or use EDNS in other cases,
+    #  then you should call the Dnsruby::PacketSender#prepare_for_dnssec(msg),
+    #  or Dnsruby::PacketSender#add_opt_rr(msg).
+    #  The return value from this method is the [response, error] tuple. Either
+    #  of these values may be nil - it is up to the client to check.
     #
     #  example :
     #
@@ -399,7 +401,7 @@ module Dnsruby
       if @single_resolvers.length == 0
         Thread.start {
           sleep(@query_timeout == 0 ? 1 : @query_timeout)
-          client_queue.push([client_query_id, nil, ResolvTimeout.new('Query timed out - no nameservers configured')])
+          client_queue.push([client_query_id, nil, ResolvTimeout.new('Query timed out - no valid nameservers configured')])
         }
       end
       client_query_id
@@ -434,7 +436,7 @@ module Dnsruby
     #  * :tcp_pipelining
     #  * :tcp_pipelining_max_queries - can be a number or :infinite symbol
     def initialize(*args)
-      #  @TODO@ Should we allow :namesver to be an RRSet of NS records? Would then need to randomly order them?
+      #  @TODO@ Should we allow :nameserver to be an RRSet of NS records? Would then need to randomly order them?
       @resolver_ruby = nil
       @src_address = nil
       @src_address6 = nil
@@ -451,6 +453,7 @@ module Dnsruby
             begin
               if key == :config_info
                 @config.set_config_info(args[0][:config_info])
+                add_config_nameservers
               elsif key == :nameserver
                 set_config_nameserver(args[0][:nameserver])
               elsif key == :nameservers
@@ -479,10 +482,11 @@ module Dnsruby
         @config.get_ready
       end
       @configured = true
-      @single_res_mutex.synchronize {
         #  Add the Config nameservers
-        @config.nameserver.each do |ns|
-          res = PacketSender.new({
+      threads = []
+      @config.nameserver.each do |ns|
+        threads << Thread.new do
+          PacketSender.new({
               server:             ns,
               port:               @port,
               dnssec:             @dnssec,
@@ -497,10 +501,22 @@ module Dnsruby
               src_address6:       @src_address6,
               src_port:           @src_port,
               recurse:            @recurse,
-              udp_size:           @udp_size})
-          @single_resolvers.push(res) if res
+              udp_size:           @udp_size,
+              ignore_config_resolv_errors: true})
         end
-      }
+      end
+
+      new_resolvers = threads.map(&:value).compact
+      new_resolvers = new_resolvers.select do |resolver|
+        !resolver.nil? && !resolver.server.nil?
+      end
+      # if new_resolvers.empty?
+      #   raise ArgumentError.new("No valid nameservers found in config")
+      # end
+      @single_res_mutex.synchronize { @single_resolvers.concat(new_resolvers) }
+      if @single_resolvers.nil? || @single_resolvers.empty?
+        raise ArgumentError.new("No valid nameservers found")
+      end
     end
 
     def set_config_nameserver(n)
@@ -888,6 +904,13 @@ module Dnsruby
         return
       end
 
+      # According to RFC 6891, a UDP payload size >512 bytes requires an
+      # EDNS OPT RR in the message.
+      if @parent.udp_size > 512 && !msg.get_opt
+        TheLog.debug("Automatically adding EDNS OPT RR for udp_size=#{ @parent.udp_size }")
+        msg.add_additional(Dnsruby::RR::OPT.new(@parent.udp_size))
+      end
+
       begin
         msg.encode
       rescue EncodeError => err

data/lib/dnsruby/resource/CAA.rb

@@ -21,7 +21,7 @@ module Dnsruby
       ClassValue = nil #:nodoc: all
       TypeValue= Types::CAA #:nodoc: all
 
-      # The property tag for the record (issue|issuewild|iodef)
+      # The property tag for the record (issue|issuewild|issuemail|issuevmc|iodef|contactemail|contactphone)
       attr_accessor :property_tag
       # The value for the property_tag
       attr_accessor :property_value
@@ -43,7 +43,10 @@ module Dnsruby
       end
 
       def from_string(input) #:nodoc: all
-        matches = (/(\d+) (issuewild|issue|iodef|contactemail|contactphone) "(.+)"$/).match(input)
+        matches = (/(\d+) (issuewild|issuemail|issuevmc|issue|iodef|contactemail|contactphone) "(.+)"$/i).match(input)
+        if matches.nil?
+          raise DecodeError.new("Cannot parse record: #{input[0...1000]}")
+        end
         @flag = matches[1]
         @property_tag = matches[2]
         @property_value = matches[3]

data/lib/dnsruby/resource/DNSKEY.rb

@@ -383,7 +383,7 @@ module Dnsruby
           ]
         )
 
-        pkey = OpenSSL::PKey::DSA.new(asn1.to_der)
+        OpenSSL::PKey::DSA.new(asn1.to_der)
       end
 
       # RFC6605, section 4
@@ -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/GPOS.rb

@@ -104,7 +104,7 @@ module Dnsruby
       end
 
       def self.build_rdata(longitude, latitude, altitude)
-        binary_string = ''.force_encoding('ASCII-8BIT')
+        binary_string = ''.b
 
         binary_string << longitude.length.chr
         binary_string << longitude

data/lib/dnsruby/resource/IN.rb

@@ -87,13 +87,13 @@ module Dnsruby
 
         def encode_rdata(msg, canonical=false) #:nodoc: all
           msg.put_bytes(@address.address)
-          msg.put_pack("n", @protocol)
+          msg.put_pack("C", @protocol)
           msg.put_bytes(@bitmap)
         end
 
         def self.decode_rdata(msg) #:nodoc: all
           address = IPv4.new(msg.get_bytes(4))
-          protocol, = msg.get_unpack("n")
+          protocol, = msg.get_unpack("C")
           bitmap = msg.get_bytes
           return self.new(address, protocol, bitmap)
         end