Use EVP_Digest{Sign,Verify} when available

botovq · botovq · commit 475b2bf766d6 · 2022-11-23T07:57:47.000+01:00
LibreSSL 3.4 added EVP_DigestSign() and EVP_DigestVerify(). Use them
when available to prepare for the addition of Ed25519 support in
LibreSSL 3.7.
diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
@@ -951,7 +951,7 @@ ossl_pkey_sign(int argc, VALUE *argv, VALUE self)
             rb_jump_tag(state);
         }
     }
-#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
+#if OSSL_OPENSSL_PREREQ(1, 1, 1) || OSSL_LIBRESSL_PREREQ(3, 4, 0)
     if (EVP_DigestSign(ctx, NULL, &siglen, (unsigned char *)RSTRING_PTR(data),
                        RSTRING_LEN(data)) < 1) {
         EVP_MD_CTX_free(ctx);
@@ -1056,7 +1056,7 @@ ossl_pkey_verify(int argc, VALUE *argv, VALUE self)
             rb_jump_tag(state);
         }
     }
-#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
+#if OSSL_OPENSSL_PREREQ(1, 1, 1) || OSSL_LIBRESSL_PREREQ(3, 4, 0)
     ret = EVP_DigestVerify(ctx, (unsigned char *)RSTRING_PTR(sig),
                            RSTRING_LEN(sig), (unsigned char *)RSTRING_PTR(data),
                            RSTRING_LEN(data));

Original file line number	Diff line number	Diff line change
`@@ -951,7 +951,7 @@ ossl_pkey_sign(int argc, VALUE *argv, VALUE self)`
`951`	`951`	`rb_jump_tag(state);`
`952`	`952`	`}`
`953`	`953`	`}`
`954`		`-#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)`
	`954`	`+#if OSSL_OPENSSL_PREREQ(1, 1, 1) \|\| OSSL_LIBRESSL_PREREQ(3, 4, 0)`
`955`	`955`	`if (EVP_DigestSign(ctx, NULL, &siglen, (unsigned char *)RSTRING_PTR(data),`
`956`	`956`	`RSTRING_LEN(data)) < 1) {`
`957`	`957`	`EVP_MD_CTX_free(ctx);`
`@@ -1056,7 +1056,7 @@ ossl_pkey_verify(int argc, VALUE *argv, VALUE self)`
`1056`	`1056`	`rb_jump_tag(state);`
`1057`	`1057`	`}`
`1058`	`1058`	`}`
`1059`		`-#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)`
	`1059`	`+#if OSSL_OPENSSL_PREREQ(1, 1, 1) \|\| OSSL_LIBRESSL_PREREQ(3, 4, 0)`
`1060`	`1060`	`ret = EVP_DigestVerify(ctx, (unsigned char *)RSTRING_PTR(sig),`
`1061`	`1061`	`RSTRING_LEN(sig), (unsigned char *)RSTRING_PTR(data),`
`1062`	`1062`	`RSTRING_LEN(data));`