pkey, ssl: use EVP_PKEY_eq() instead of EVP_PKEY_cmp()

EVP_PKEY_cmp() has been renamed to EVP_PKEY_eq() in OpenSSL 3.0.0.
ruby · May 25, 2021 · a811750 · a811750
1 parent e90a2a5
commit a811750
Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
@@ -176,6 +176,7 @@ def find_openssl_library
 have_func("EVP_MD_CTX_get0_md")
 have_func("EVP_PKEY_todata")
 have_func("EVP_PKEY_dup")
+have_func("EVP_PKEY_eq")
 
 Logging::message "=== Checking done. ===\n"
 

diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h
@@ -223,4 +223,8 @@ IMPL_PKEY_GETTER(EC_KEY, ec)
 #  define EVP_MD_CTX_get0_md(ctx) EVP_MD_CTX_md(ctx)
 #endif
 
+#ifndef HAVE_EVP_PKEY_EQ
+#  define EVP_PKEY_eq(a, b) EVP_PKEY_cmp(a, b)
+#endif
+
 #endif /* _OSSL_OPENSSL_MISSING_H_ */
diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
@@ -936,14 +936,14 @@ ossl_pkey_compare(VALUE self, VALUE other)
     if (EVP_PKEY_id(selfPKey) != EVP_PKEY_id(otherPKey))
         ossl_raise(rb_eTypeError, "cannot match different PKey types");
 
-    ret = EVP_PKEY_cmp(selfPKey, otherPKey);
+    ret = EVP_PKEY_eq(selfPKey, otherPKey);
 
     if (ret == 0)
         return Qfalse;
     else if (ret == 1)
         return Qtrue;
     else
-        ossl_raise(ePKeyError, "EVP_PKEY_cmp");
+        ossl_raise(ePKeyError, "EVP_PKEY_eq");
 }
 
 /*

diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
@@ -1175,7 +1175,7 @@ ossl_sslctx_add_certificate(int argc, VALUE *argv, VALUE self)
     EVP_PKEY_free(pub_pkey);
     if (!pub_pkey)
 	rb_raise(rb_eArgError, "certificate does not contain public key");
-    if (EVP_PKEY_cmp(pub_pkey, pkey) != 1)
+    if (EVP_PKEY_eq(pub_pkey, pkey) != 1)
 	rb_raise(rb_eArgError, "public key mismatch");
 
     if (argc >= 3)