From f7e7443aaa9bdebefbdbfbd57cdda3a0d7febfdd Mon Sep 17 00:00:00 2001
From: Kazuki Yamaguchi <k@rhe.jp>
Date: Fri, 7 Nov 2025 00:45:10 +0900
Subject: Adjust OpenSSL specs for digest algorithm lookup

https://github.com/ruby/openssl/pull/958 changed the common logic for
digest algorithm lookup:

 - If the argument is neither an OpenSSL::Digest instance nor a String,
   it is now implicitly converted to String with #to_str. This is
   consistent with algorithm name lookup logic in ruby/openssl for pkeys
   and ciphers.

 - If the name is not recognized, OpenSSL::Digest::DigestError is raised
   instead of RuntimeError.

Update the specs accordingly:

 - Remove specs that expect #to_str not to be called.

 - Relax regexps matching TypeError messages.

 - Expect OpenSSL::Digest::DigestError instead of RuntimeError for
   ruby/openssl 4.0.0 and later.
---
 spec/ruby/library/openssl/digest/initialize_spec.rb | 16 ++++++----------
 spec/ruby/library/openssl/kdf/pbkdf2_hmac_spec.rb   | 20 +++++++-------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/spec/ruby/library/openssl/digest/initialize_spec.rb b/spec/ruby/library/openssl/digest/initialize_spec.rb
index 1cd0409c4d..b5911716ca 100644
--- a/spec/ruby/library/openssl/digest/initialize_spec.rb
+++ b/spec/ruby/library/openssl/digest/initialize_spec.rb
@@ -23,18 +23,14 @@ describe "OpenSSL::Digest#initialize" do
       OpenSSL::Digest.new("sha512").name.should ==  "SHA512"
     end
 
-    it "throws an error when called with an unknown digest" do
-      -> { OpenSSL::Digest.new("wd40") }.should raise_error(RuntimeError, /Unsupported digest algorithm \(wd40\)/)
+    version_is OpenSSL::VERSION, "4.0.0" do
+      it "throws an error when called with an unknown digest" do
+        -> { OpenSSL::Digest.new("wd40") }.should raise_error(OpenSSL::Digest::DigestError, /wd40/)
+      end
     end
 
     it "cannot be called with a symbol" do
-      -> { OpenSSL::Digest.new(:SHA1) }.should raise_error(TypeError, /wrong argument type Symbol/)
-    end
-
-    it "does not call #to_str on the argument" do
-      name = mock("digest name")
-      name.should_not_receive(:to_str)
-      -> { OpenSSL::Digest.new(name) }.should raise_error(TypeError, /wrong argument type/)
+      -> { OpenSSL::Digest.new(:SHA1) }.should raise_error(TypeError)
     end
   end
 
@@ -62,7 +58,7 @@ describe "OpenSSL::Digest#initialize" do
   end
 
   it "cannot be called with a digest class" do
-    -> { OpenSSL::Digest.new(OpenSSL::Digest::SHA1) }.should raise_error(TypeError, /wrong argument type Class/)
+    -> { OpenSSL::Digest.new(OpenSSL::Digest::SHA1) }.should raise_error(TypeError)
   end
 
   context "when called without an initial String argument" do
diff --git a/spec/ruby/library/openssl/kdf/pbkdf2_hmac_spec.rb b/spec/ruby/library/openssl/kdf/pbkdf2_hmac_spec.rb
index 40f8597275..1112972060 100644
--- a/spec/ruby/library/openssl/kdf/pbkdf2_hmac_spec.rb
+++ b/spec/ruby/library/openssl/kdf/pbkdf2_hmac_spec.rb
@@ -107,21 +107,15 @@ describe "OpenSSL::KDF.pbkdf2_hmac" do
   it "raises a TypeError when hash is neither a String nor an OpenSSL::Digest" do
     -> {
       OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, hash: Object.new)
-    }.should raise_error(TypeError, "wrong argument type Object (expected OpenSSL/Digest)")
+    }.should raise_error(TypeError)
   end
 
-  it "raises a TypeError when hash is neither a String nor an OpenSSL::Digest, it does not try to call #to_str" do
-    hash = mock("hash")
-    hash.should_not_receive(:to_str)
-    -> {
-      OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, hash: hash)
-    }.should raise_error(TypeError, "wrong argument type MockObject (expected OpenSSL/Digest)")
-  end
-
-  it "raises a RuntimeError for unknown digest algorithms" do
-    -> {
-      OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, hash: "wd40")
-    }.should raise_error(RuntimeError, /Unsupported digest algorithm \(wd40\)/)
+  version_is OpenSSL::VERSION, "4.0.0" do
+    it "raises a OpenSSL::Digest::DigestError for unknown digest algorithms" do
+      -> {
+        OpenSSL::KDF.pbkdf2_hmac("secret", **@defaults, hash: "wd40")
+      }.should raise_error(OpenSSL::Digest::DigestError, /wd40/)
+    end
   end
 
   it "treats salt as a required keyword" do
-- 
cgit v1.2.3