pq_crypto 0.6.2 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94d0fc254c0169b1e49ce177e0bf9830c9a1140dc425be9e917e8b2acfb870ed
-  data.tar.gz: 148381930753a4d6eb850522619ddf43b602cf9ae9966190c91f276c56f0d426
+  metadata.gz: a7887d01882b53d518ecac6559fe2444572c50d5cd7074ee6770d8ea7bcfa32b
+  data.tar.gz: 9b518ef75cacc9d192b40c831e79e31c6883fddd2ce4cf56d2e08f5054da48a3
 SHA512:
-  metadata.gz: bb8d4c4683429e99d0147ece542dabdb2276ec3933482d03e3dae81a8bd55b3ed2e617c89221dcdec4dbc34c134027dc406ab7d5e814af2ceef91aa1fb1a0240
-  data.tar.gz: 1e911b991634858610ceea12d5cb3a7efbb3a2f480f7ccb531e9afd1e4d01befe673ebec0f1935500dafed37b595d9c9a11a5b9a12adf1ff0720a0a76bf95c96
+  metadata.gz: 90f571ac5fd32557f539303cfc9d7f148aac81532325cd31baf69d879528f91107184ae2c8b785737808bce762f635436506ef265e623dc14f9d51cc61e826b8
+  data.tar.gz: 1783ad30164c271257ee6813ba83c24bc50c99cec0ef274217d4a5d65cffef73447f0b4e66c77952ca3260f2abdfad5740d208729517b34d2a60a84304793e71

data/.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   vendor-verify:
     name: vendor-verify
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
@@ -30,8 +30,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
-        ruby: ["3.1", "3.4", "4.0"]
+        os: [ubuntu-24.04, macos-latest]
+        ruby: ["2.7.2", "3.1", "3.4", "4.0"]
 
     steps:
       - name: Checkout
@@ -48,15 +48,139 @@ jobs:
         with:
           go-version: "1.26.0"
 
+      - name: Select system OpenSSL 3 for Ruby 2.7 on Linux
+        if: matrix.os == 'ubuntu-24.04' && matrix.ruby == '2.7.2'
+        shell: bash
+        run: |
+          set -euxo pipefail
+
+          sudo apt-get update
+          sudo apt-get install -y libssl-dev pkg-config
+
+          multiarch="$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+          system_pc_path="/usr/lib/${multiarch}/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig"
+
+          version="$(
+            PKG_CONFIG_PATH="${system_pc_path}" \
+            PKG_CONFIG_LIBDIR="${system_pc_path}" \
+            pkg-config --modversion openssl
+          )"
+
+          case "${version}" in
+            3.*) ;;
+            *)
+              echo "Expected system OpenSSL 3.x, got ${version}"
+              exit 1
+              ;;
+          esac
+
+          {
+            echo "OPENSSL_ROOT_DIR=/usr"
+            echo "OPENSSL_DIR="
+            echo "PKG_CONFIG_PATH=${system_pc_path}"
+            echo "PKG_CONFIG_LIBDIR=${system_pc_path}"
+          } >> "${GITHUB_ENV}"
+
+          echo "System OpenSSL selected: ${version}"
+          PKG_CONFIG_PATH="${system_pc_path}" PKG_CONFIG_LIBDIR="${system_pc_path}" \
+            pkg-config --variable=includedir openssl
+          PKG_CONFIG_PATH="${system_pc_path}" PKG_CONFIG_LIBDIR="${system_pc_path}" \
+            pkg-config --variable=libdir openssl
+
       - name: Verify vendored sources
         run: bundle exec rake vendor:verify
 
       - name: Compile extension
-        run: bundle exec rake compile
+        run: bundle exec rake clean compile
+
+      - name: Verify linked OpenSSL 3 on Linux Ruby 2.7
+        if: matrix.os == 'ubuntu-24.04' && matrix.ruby == '2.7.2'
+        shell: bash
+        run: |
+          set -euxo pipefail
+
+          extension="lib/pqcrypto/pqcrypto_secure.so"
+          test -f "${extension}"
+          ldd "${extension}" | tee linked-libraries.txt
+          # The extension uses libcrypto only (SHA3/SHAKE/EVP/RAND); it links no
+          # TLS symbols, so libssl is intentionally not a dependency.
+          grep -E 'libcrypto\.so\.3([[:space:]]|$)' linked-libraries.txt
+          if grep -E 'libssl\.so' linked-libraries.txt; then
+            echo "Unexpected libssl linkage; the extension should need libcrypto only" >&2
+            exit 1
+          fi
+
+      - name: Verify linked OpenSSL 3 on macOS Ruby 2.7
+        if: matrix.os == 'macos-latest' && matrix.ruby == '2.7.2'
+        shell: bash
+        run: |
+          set -euxo pipefail
+
+          extension="lib/pqcrypto/pqcrypto_secure.bundle"
+          test -f "${extension}"
+          otool -L "${extension}" | tee linked-libraries.txt
+          # libcrypto only; the extension links no TLS symbols, so libssl is
+          # intentionally not a dependency.
+          grep -E 'libcrypto\.3\.dylib' linked-libraries.txt
+          if grep -E 'libssl\.3\.dylib' linked-libraries.txt; then
+            echo "Unexpected libssl linkage; the extension should need libcrypto only" >&2
+            exit 1
+          fi
 
       - name: Run tests
         run: bundle exec rake test
 
+      - name: Build and install source gem on Linux Ruby 2.7
+        if: matrix.os == 'ubuntu-24.04' && matrix.ruby == '2.7.2'
+        shell: bash
+        run: |
+          set -euxo pipefail
+
+          gem build pq_crypto.gemspec
+
+          gem_file="$(
+            ruby -Ilib -rpq_crypto/version \
+              -e 'print "pq_crypto-#{PQCrypto::VERSION}.gem"'
+          )"
+
+          gem install "./${gem_file}" --no-document
+
+          ruby -e '
+            require "pq_crypto"
+
+            kem = PQCrypto::KEM.generate(:ml_kem_768)
+            encapsulation = kem.public_key.encapsulate
+            shared_secret = kem.secret_key.decapsulate(encapsulation.ciphertext)
+            raise "ML-KEM mismatch" unless shared_secret == encapsulation.shared_secret
+
+            signature_key = PQCrypto::Signature.generate(:ml_dsa_65)
+            message = "ruby-2.7.2-built-gem".b
+            signature = signature_key.secret_key.sign(message)
+            raise "ML-DSA verify failed" unless signature_key.public_key.verify(message, signature)
+          '
+
+          installed_extension="$(
+            ruby -e '
+              spec = Gem::Specification.find_by_name("pq_crypto")
+              path = Dir[File.join(spec.full_gem_path, "lib", "pqcrypto", "pqcrypto_secure.so")].first
+              abort "installed extension not found" unless path
+              print path
+            '
+          )"
+
+          ldd "${installed_extension}" | tee installed-linked-libraries.txt
+          grep -E 'libcrypto\.so\.3([[:space:]]|$)' installed-linked-libraries.txt
+          if grep -E 'libssl\.so' installed-linked-libraries.txt; then
+            echo "Unexpected libssl linkage; the extension should need libcrypto only" >&2
+            exit 1
+          fi
+
+      - name: Show mkmf logs on failure
+        if: failure()
+        shell: bash
+        run: |
+          find tmp -name mkmf.log -print -exec cat {} \; || true
+
   interop-openssl-3-5-required:
     needs: vendor-verify
     name: interop-openssl-3.5-required
@@ -81,12 +205,12 @@ jobs:
           sudo ldconfig
           /opt/openssl-3.5/bin/openssl version
           /opt/openssl-3.5/bin/openssl version | grep -E '^OpenSSL 3\.(5|[6-9]|[1-9][0-9])\.'
-          echo /opt/openssl-3.5/bin >> "$GITHUB_PATH"
+          echo /opt/openssl-3.5/bin >> "${GITHUB_PATH}"
           {
             echo "OPENSSL_ROOT_DIR=/opt/openssl-3.5"
             echo "PKG_CONFIG_PATH=/opt/openssl-3.5/lib64/pkgconfig"
             echo "LD_LIBRARY_PATH=/opt/openssl-3.5/lib64"
-          } >> "$GITHUB_ENV"
+          } >> "${GITHUB_ENV}"
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
@@ -103,7 +227,7 @@ jobs:
         run: bundle exec rake vendor:verify
 
       - name: Compile extension
-        run: bundle exec rake compile
+        run: bundle exec rake clean compile
 
       - name: Run tests
         run: |
@@ -117,10 +241,17 @@ jobs:
             exit 1
           fi
 
+      - name: Show mkmf logs on failure
+        if: failure()
+        shell: bash
+        run: |
+          find tmp -name mkmf.log -print -exec cat {} \; || true
+
   linux-native-backend:
     needs: test
     name: linux-native-backend
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
+
     env:
       PQCRYPTO_NATIVE_ASM: "1"
 
@@ -148,18 +279,19 @@ jobs:
             require "pq_crypto"
 
             kem = PQCrypto::KEM.generate(:ml_kem_768)
-            enc = kem.public_key.encapsulate
-            raise "ML-KEM mismatch" unless kem.secret_key.decapsulate(enc.ciphertext) == enc.shared_secret
+            encapsulation = kem.public_key.encapsulate
+            shared_secret = kem.secret_key.decapsulate(encapsulation.ciphertext)
+            raise "ML-KEM mismatch" unless shared_secret == encapsulation.shared_secret
 
-            sig = PQCrypto::Signature.generate(:ml_dsa_65)
-            msg = "linux-native-backend".b
-            signature = sig.secret_key.sign(msg)
-            raise "ML-DSA verify failed" unless sig.public_key.verify(msg, signature)
+            signature_key = PQCrypto::Signature.generate(:ml_dsa_65)
+            message = "linux-native-backend".b
+            signature = signature_key.secret_key.sign(message)
+            raise "ML-DSA verify failed" unless signature_key.public_key.verify(message, signature)
           '
 
       - name: Verify AVX2 native symbols
         run: |
           set -euxo pipefail
-          so="lib/pqcrypto/pqcrypto_secure.so"
-          test -f "$so"
-          nm "$so" | grep -E "pqcr_(mlkem|mldsa).*avx2|keccak.*avx2"
+          extension="lib/pqcrypto/pqcrypto_secure.so"
+          test -f "${extension}"
+          nm "${extension}" | grep -E "pqcr_(mlkem|mldsa).*avx2|keccak.*avx2"

data/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## [0.6.4] - 2026-07-18
+
+### Compatibility
+
+- Lowered the minimum supported Ruby version from `>= 3.1` to `>= 2.7.1`.
+- Kept the Ruby 3.4+ scheduler-aware `RB_NOGVL_OFFLOAD_SAFE` path unchanged.
+- Ruby 2.7.1-3.3 use the existing no-GVL compatibility path without claiming Fiber Scheduler offload guarantees.
+- Made the test-only `async` dependency conditional so development dependencies resolve on Ruby 2.7.1.
+
+### CI
+
+- Added an Ubuntu Ruby 2.7 compatibility job on Ruby 2.7.2, including the full test suite and a built-gem install smoke test. Ruby 2.7.1 remains the declared floor; the hosted Linux job uses 2.7.2 because exact 2.7.1 is not available through the runner toolchain.
+
+### Build
+
+- Fixed OpenSSL 3 discovery on Intel and Apple Silicon macOS by resolving the Homebrew `openssl@3` prefix dynamically.
+- Ignore stale OpenSSL 1.1 `pkg-config` metadata instead of injecting incompatible headers into native builds.
+- Validate the selected OpenSSL prefix and link against the OpenSSL 3 API during configuration, preventing mixed headers/library builds.
+- Link the validated OpenSSL libraries by absolute path, preventing Ruby 2.7 Linux toolchains from selecting their bundled OpenSSL 1.1 while preserving mkmf's libruby-safe default path precedence.
+- Prefer Linux multiarch OpenSSL library directories over generic `lib` directories when resolving an explicit installation prefix.
+- Avoid Clang macro-expansion warnings on Ruby 2.7 by using the function-form `rb_intern2` API without changing symbol semantics.
+- Remove only Ruby 2.7's obsolete macOS `-multiply_defined,suppress` linker option, preserving all other inherited linker flags including `-undefined,dynamic_lookup`.
+
+### Documentation
+
+- Documented the Ruby 2.7.1+ support policy and the concurrency guarantees for compatibility runtimes.
+
+## [0.6.3] - 2026-06-24
+
+### Changed
+- update native mlkem `v1.1.0` → `v1.2.0` (new PowerPC backend, Windows/RISC-V portability, 16-bit `int` UB fix; public API unchanged)
+
 ## [0.6.2] - 2026-05-24
 
 ### Changed

data/GET_STARTED.md

@@ -445,7 +445,7 @@ On Ruby 3.4 and later, signing and verification keep Ruby's scheduler-aware
 that implements `blocking_operation_wait`, blocking native work can be moved
 off the event loop.
 
-Ruby 3.1-3.3 are supported as a compatibility path: native operations still
+Ruby 2.7.1-3.3 are supported as a compatibility path: native operations still
 release the GVL, but `RB_NOGVL_OFFLOAD_SAFE` is not available there, so the gem
 does not claim Fiber Scheduler offload guarantees on those runtimes.
 

data/README.md

@@ -63,9 +63,9 @@ original algorithms:
 
 ## Requirements
 
-- Ruby 3.1 or later
+- Ruby 2.7.1 or later
   - Ruby 3.4+ keeps the optimized Fiber Scheduler offload path via `RB_NOGVL_OFFLOAD_SAFE`
-  - Ruby 3.1-3.3 use the compatibility no-GVL path without scheduler offload guarantees
+  - Ruby 2.7.1-3.3 use the compatibility no-GVL path without scheduler offload guarantees
 - a C toolchain with C11 support
 - OpenSSL 3.0 or later with SHA3-256 and SHAKE256 available
 - vendored minimal PQ Code Package native snapshot in `ext/pqcrypto/vendor`

data/ext/pqcrypto/extconf.rb

@@ -3,6 +3,8 @@
 
 require "mkmf"
 require "rbconfig"
+require "rubygems/version"
+require "shellwords"
 require_relative "../../lib/pq_crypto/version"
 
 def generate_version_header!
@@ -27,7 +29,14 @@ generate_version_header!
 
 $CFLAGS << " -std=c11 -Wall -Wextra -O3"
 $CFLAGS << " -fstack-protector-strong -D_FORTIFY_SOURCE=2"
-$LDFLAGS << " -Wl,-no_warn_duplicate_libraries" if RbConfig::CONFIG["host_os"] =~ /darwin/
+if RbConfig::CONFIG["host_os"] =~ /darwin/
+  $DLDFLAGS = $DLDFLAGS.to_s
+    .gsub(/(?:\A|\s)-Wl,-multiply_defined,suppress(?=\s|\z)/, " ")
+    .gsub(/(?:\A|\s)-multiply_defined\s+suppress(?=\s|\z)/, " ")
+    .strip
+
+  $LDFLAGS << " -Wl,-no_warn_duplicate_libraries"
+end
 
 VENDOR_ONLY_CFLAGS = "-Wno-unused-parameter -Wno-unused-function -Wno-strict-prototypes -Wno-pedantic -Wno-c23-extensions -Wno-undef"
 
@@ -94,30 +103,245 @@ if ENV["PQCRYPTO_NATIVE_TUNE"] == "1"
   VENDOR_ASM_ARCH_FLAGS << " -march=native -mtune=native"
 end
 
+def openssl_library_dirs(prefix)
+  dirs = Dir.glob(File.join(prefix, "lib", "*-linux-gnu"))
+  dirs.concat([File.join(prefix, "lib64"), File.join(prefix, "lib")])
+  dirs.select { |dir| File.directory?(dir) }.uniq
+end
+
+def openssl_library_file(dir, name)
+  candidates = [
+    File.join(dir, "lib#{name}.so.3"),
+    *Dir.glob(File.join(dir, "lib#{name}.so.3.*")).sort,
+    File.join(dir, "lib#{name}.so"),
+    File.join(dir, "lib#{name}.3.dylib"),
+    *Dir.glob(File.join(dir, "lib#{name}.3.*.dylib")).sort,
+    File.join(dir, "lib#{name}.dylib"),
+    File.join(dir, "lib#{name}.a"),
+    File.join(dir, "lib#{name}.dll.a"),
+    File.join(dir, "#{name}.lib")
+  ]
+
+  path = candidates.find { |candidate| File.file?(candidate) }
+  path && File.realpath(path)
+rescue Errno::ENOENT
+  nil
+end
+
+def openssl_library_present?(dir, name)
+  !openssl_library_file(dir, name).nil?
+end
+
+def openssl_prefix_usable?(prefix)
+  return false if prefix.nil?
+
+  prefix = prefix.strip
+  return false if prefix.empty?
+  return false unless File.exist?(File.join(prefix, "include", "openssl", "opensslv.h"))
+
+  openssl_library_dirs(prefix).any? do |dir|
+    openssl_library_present?(dir, "crypto")
+  end
+end
+
+def explicit_openssl_prefix
+  %w[OPENSSL_ROOT_DIR OPENSSL_DIR].each do |var|
+    value = ENV[var]
+    next if value.nil? || value.strip.empty?
+
+    prefix = File.expand_path(value.strip)
+    abort <<~MSG unless openssl_prefix_usable?(prefix)
+      #{var}=#{value.inspect} does not point to a complete OpenSSL installation.
+
+      Expected OpenSSL headers under:
+        #{File.join(prefix, "include", "openssl")}
+
+      And libcrypto under lib, lib64, or a Linux multiarch lib directory.
+    MSG
+
+    return prefix
+  end
+
+  nil
+end
+
+def resolve_openssl_prefix
+  explicit = explicit_openssl_prefix
+  return explicit if explicit
+
+  candidates = []
+  if find_executable("brew")
+    %w[openssl@3 openssl].each do |formula|
+      prefix = `brew --prefix #{formula} 2>/dev/null`.strip
+      candidates << prefix unless prefix.empty?
+    end
+  end
+  candidates.concat(["/opt/homebrew/opt/openssl@3", "/usr/local/opt/openssl@3"])
+  candidates.uniq.find { |prefix| openssl_prefix_usable?(prefix) }
+end
+
+def pkg_config_value(variable)
+  value = `pkg-config --variable=#{variable} openssl 2>/dev/null`.strip
+  return nil unless $?.success?
+  return nil if value.empty?
+
+  File.expand_path(value)
+end
+
+def openssl_pkg_config
+  return nil unless find_executable("pkg-config")
+
+  version = `pkg-config --modversion openssl 2>/dev/null`.strip
+  return nil unless $?.success?
+  return nil if version.empty?
+  return { version: version } unless openssl_version_at_least_3?(version)
+
+  incdir = pkg_config_value("includedir")
+  libdir = pkg_config_value("libdir")
+  return { version: version } unless incdir && libdir
+  return { version: version } unless File.exist?(File.join(incdir, "openssl", "opensslv.h"))
+  crypto_lib = openssl_library_file(libdir, "crypto")
+  return { version: version } unless crypto_lib
+
+  { version: version, incdir: incdir, libdir: libdir, crypto_lib: crypto_lib }
+end
+
+def openssl_version_at_least_3?(version)
+  Gem::Version.new(version) >= Gem::Version.new("3.0.0")
+rescue ArgumentError
+  false
+end
+
+def normalize_existing_path(path)
+  File.realpath(path)
+rescue Errno::ENOENT
+  File.expand_path(path)
+end
+
+def include_paths_from_flags(flags)
+  tokens = Shellwords.split(flags.to_s)
+  paths = []
+  index = 0
+
+  while index < tokens.length
+    token = tokens[index]
+
+    case token
+    when "-I", "-isystem"
+      paths << tokens[index + 1] if tokens[index + 1]
+      index += 2
+      next
+    when /\A-I(.+)\z/
+      paths << Regexp.last_match(1)
+    when /\A-isystem(.+)\z/
+      paths << Regexp.last_match(1)
+    end
+
+    index += 1
+  end
+
+  paths
+rescue ArgumentError
+  []
+end
+
+def strip_include_path(flags, path)
+  escaped = Regexp.escape(path)
+
+  flags.to_s
+    .gsub(/(?:\A|\s)-I\s*#{escaped}(?=\s|\z)/, " ")
+    .gsub(/(?:\A|\s)-isystem\s*#{escaped}(?=\s|\z)/, " ")
+    .strip
+end
+
+def remove_competing_openssl_headers!(selected_incdir)
+  selected = normalize_existing_path(selected_incdir)
+  flag_values = [$INCFLAGS, $CPPFLAGS, $CFLAGS]
+
+  competing = flag_values
+    .flat_map { |flags| include_paths_from_flags(flags) }.uniq.select do |path|
+      next false unless File.file?(File.join(path, "openssl", "opensslv.h"))
+
+      normalize_existing_path(path) != selected
+    end
+
+  competing.each do |path|
+    $INCFLAGS = strip_include_path($INCFLAGS, path)
+    $CPPFLAGS = strip_include_path($CPPFLAGS, path)
+    $CFLAGS = strip_include_path($CFLAGS, path)
+    puts "Ignoring competing OpenSSL headers: #{path}"
+  end
+end
+
+def configure_openssl_paths(incdir, libdir, crypto_lib:)
+  if defined?($configure_args) && $configure_args
+    $configure_args["--with-openssl-dir"] = File.dirname(incdir)
+    $configure_args["--with-openssl-include"] = incdir
+    $configure_args["--with-openssl-lib"] = libdir
+  end
+
+  remove_competing_openssl_headers!(incdir)
+
+  $INCFLAGS = "-I#{incdir} #{$INCFLAGS}".strip
+  $CPPFLAGS = "-I#{incdir} #{$CPPFLAGS}".strip
+  $LIBPATH.unshift(libdir) unless $LIBPATH.include?(libdir)
+
+  selected_libs = [crypto_lib].map { |path| Shellwords.escape(path) }.join(" ")
+  $LOCAL_LIBS = "#{selected_libs} #{$LOCAL_LIBS}".strip
+
+  unless host_os =~ /mswin|mingw|cygwin/i || libdir.start_with?("/usr/lib")
+    $LDFLAGS = "-Wl,-rpath,#{Shellwords.escape(libdir)} #{$LDFLAGS}".strip
+  end
+end
+
+def configure_openssl_prefix(prefix, source:)
+  incdir = File.join(prefix, "include")
+  libdir = openssl_library_dirs(prefix).find do |dir|
+    openssl_library_present?(dir, "crypto")
+  end
+  crypto_lib = openssl_library_file(libdir, "crypto")
+
+  configure_openssl_paths(incdir, libdir, crypto_lib: crypto_lib)
+  puts "OpenSSL #{source}: #{prefix}"
+  puts "OpenSSL include dir: #{incdir}"
+  puts "OpenSSL library dir: #{libdir}"
+  puts "OpenSSL libcrypto: #{crypto_lib}"
+end
+
 def configure_compiler_environment
-  if RUBY_PLATFORM.include?("darwin")
-    dir_config("homebrew", "/opt/homebrew")
-    $CPPFLAGS << " -I/opt/homebrew/include"
-    $LDFLAGS << " -L/opt/homebrew/lib"
+  prefix = resolve_openssl_prefix
+  if prefix
+    configure_openssl_prefix(prefix, source: "prefix")
     return
   end
 
-  openssl_root = ENV["OPENSSL_ROOT_DIR"] || ENV["OPENSSL_DIR"]
-  if openssl_root && !openssl_root.strip.empty? && File.directory?(openssl_root)
-    $CPPFLAGS << " -I#{openssl_root}/include"
-    %w[lib64 lib].each do |suffix|
-      libdir = File.join(openssl_root, suffix)
-      next unless File.directory?(libdir)
+  pkg = openssl_pkg_config
+  if pkg && pkg[:incdir] && pkg[:libdir]
+    configure_openssl_paths(pkg[:incdir], pkg[:libdir], crypto_lib: pkg[:crypto_lib])
+    puts "OpenSSL pkg-config: #{pkg[:version]}"
+    puts "OpenSSL include dir: #{pkg[:incdir]}"
+    puts "OpenSSL library dir: #{pkg[:libdir]}"
+    puts "OpenSSL libcrypto: #{pkg[:crypto_lib]}"
+    return
+  end
 
-      $LDFLAGS << " -L#{libdir} -Wl,-rpath,#{libdir}"
-      break
+  if pkg && pkg[:version]
+    if openssl_version_at_least_3?(pkg[:version])
+      puts "Ignoring incomplete pkg-config OpenSSL #{pkg[:version]}; headers or libraries were not found"
+    else
+      puts "Ignoring pkg-config OpenSSL #{pkg[:version]}; OpenSSL 3.0 or later is required"
     end
-  elsif find_executable("pkg-config")
-    cflags = `pkg-config --cflags openssl 2>/dev/null`.strip
-    libs = `pkg-config --libs-only-L openssl 2>/dev/null`.strip
-    $CPPFLAGS << " #{cflags}" unless cflags.empty?
-    $LDFLAGS << " #{libs}" unless libs.empty?
+  else
+    puts "OpenSSL pkg-config: unavailable"
   end
+
+  conventional = ["/usr/local", "/usr"].find { |candidate| openssl_prefix_usable?(candidate) }
+  if conventional
+    configure_openssl_prefix(conventional, source: "system prefix")
+    return
+  end
+
+  puts "OpenSSL prefix: (none resolved; using compiler defaults)"
 end
 
 def native_vendor_sources_for(vendor_dir)
@@ -196,8 +420,6 @@ end
 def configure_openssl!
   configure_compiler_environment
 
-  abort "OpenSSL libcrypto is required" unless have_library("crypto")
-  abort "OpenSSL libssl is required" unless have_library("ssl")
   abort "openssl/evp.h is required" unless have_header("openssl/evp.h")
   abort "openssl/rand.h is required" unless have_header("openssl/rand.h")
   abort "openssl/crypto.h is required" unless have_header("openssl/crypto.h")
@@ -205,13 +427,31 @@ def configure_openssl!
   abort "openssl/pkcs12.h is required" unless have_header("openssl/pkcs12.h")
 
   version_check = <<~SRC
+    #include <openssl/crypto.h>
     #include <openssl/opensslv.h>
     #if OPENSSL_VERSION_NUMBER < 0x30000000L
     #error "OpenSSL 3.0 or later is required"
     #endif
-    int main(void) { return 0; }
+    int main(void) {
+        return (int)OPENSSL_version_major();
+    }
   SRC
-  abort "OpenSSL 3.0 or later is required" unless try_compile(version_check)
+  abort <<~MSG unless try_link(version_check)
+    OpenSSL 3.0 or later is required, but the compiler and linker did not find
+    a consistent OpenSSL 3 headers + libcrypto pair. See mkmf.log for the exact
+    include paths, library paths, and linker error.
+
+    macOS with Homebrew:
+      brew install openssl@3
+      OPENSSL_ROOT_DIR="$(brew --prefix openssl@3)" bundle exec rake clean compile
+
+    Debian/Ubuntu:
+      sudo apt-get install libssl-dev pkg-config
+      pkg-config --modversion openssl   # must report 3.x
+
+    If an old Ruby toolchain injects OpenSSL 1.1 through CPPFLAGS or
+    PKG_CONFIG_PATH, inspect mkmf.log and point the build at OpenSSL 3.
+  MSG
 
   sha3_check = <<~SRC
     #include <openssl/evp.h>
@@ -220,7 +460,7 @@ def configure_openssl!
         return md == NULL ? 1 : 0;
     }
   SRC
-  abort "OpenSSL SHA3-256 is required (X-Wing combiner)" unless try_compile(sha3_check)
+  abort "OpenSSL SHA3-256 is required (X-Wing combiner)" unless try_link(sha3_check)
 
   shake_check = <<~SRC
     #include <openssl/evp.h>
@@ -229,7 +469,7 @@ def configure_openssl!
         return md == NULL ? 1 : 0;
     }
   SRC
-  abort "OpenSSL SHAKE256 is required (X-Wing key expansion / ML-DSA streaming mu)" unless try_compile(shake_check)
+  abort "OpenSSL SHAKE256 is required (X-Wing key expansion / ML-DSA streaming mu)" unless try_link(shake_check)
 
   $CFLAGS << " -DHAVE_OPENSSL_EVP_H -DHAVE_OPENSSL_RAND_H"
 end

data/ext/pqcrypto/pqcrypto_version.h

@@ -2,6 +2,6 @@
 #ifndef PQCRYPTO_VERSION_H
 #define PQCRYPTO_VERSION_H
 
-#define PQCRYPTO_VERSION "0.6.2"
+#define PQCRYPTO_VERSION "0.6.4"
 
 #endif

data/ext/pqcrypto/vendor/.vendored

@@ -2,11 +2,11 @@
 backend=PQ Code Package native only
 pqclean=removed
 mlkem_native_repo=https://github.com/pq-code-package/mlkem-native.git
-mlkem_native_ref=v1.1.0
-mlkem_native_commit=d2cae2be522a67bfae26100fdb520576f1b2ef90
-mlkem_native_tree_sha256=c225de87a69e6d6360cddc4b5839b03e65fa9d5a1112a5f19700c905b7e74512
+mlkem_native_ref=v1.2.0
+mlkem_native_commit=0ba906cb14b1c241476134d7403a811b382ca498
+mlkem_native_tree_sha256=cc78ed199b8c65abe68635b23a13b294d5a8deb20c8bc7b4d76590c00976bb2d
 mldsa_native_repo=https://github.com/pq-code-package/mldsa-native.git
 mldsa_native_ref=v1.0.0-beta2
 mldsa_native_commit=9b0ee84f4cf399043eca59eca4e5f8531ca1d61b
 mldsa_native_tree_sha256=2887f59926c18a877e8c5a5e30727e84497c357032093d00d7135aedf53f011e
-manifest_sha256=cfcf998232945760d5fd66cc3ec0af54925e13844e1758f559eeb1c7ecf16ffc
+manifest_sha256=011e9d7d1160c7d612869695d950e17f9e330dac6bf782883639593f96fee951