Allow Ed25519/Ed448 provider tests on OpenSSL ≥ 3.0

Author: olszomal

tests/ed25519-keygen-prov.c

@@ -20,9 +20,7 @@
 #include "helpers_prov.h"
 #include "eddsa_common.h"
 
-#if !defined(OPENSSL_NO_EC) && \
-    (OPENSSL_VERSION_NUMBER >= 0x30000000L) && \
-    (OPENSSL_VERSION_NUMBER < 0x40000000L)
+#if !defined(OPENSSL_NO_EC) && (OPENSSL_VERSION_NUMBER >= 0x30000000L)
 
 static void error_queue(const char *name)
 {
@@ -160,10 +158,10 @@ int main(int argc, char *argv[])
 #include <stdio.h>
 
 int main() {
-	fprintf(stderr, "Skipped: requires OpenSSL 3.x built with EC support\n");
+	fprintf(stderr, "Skipped: requires OpenSSL >= 3.0 built with EC support\n");
 	return 77;
 }
 
-#endif /* !OPENSSL_NO_EC && OpenSSL 3.x */
+#endif /* !OPENSSL_NO_EC && OPENSSL_VERSION_NUMBER >= 0x30000000L  */
 
 /* vim: set noexpandtab: */

tests/ed448-keygen-prov.c

@@ -20,9 +20,7 @@
 #include "helpers_prov.h"
 #include "eddsa_common.h"
 
-#if !defined(OPENSSL_NO_EC) && \
-    (OPENSSL_VERSION_NUMBER >= 0x30000000L) && \
-    (OPENSSL_VERSION_NUMBER < 0x40000000L)
+#if !defined(OPENSSL_NO_EC) && (OPENSSL_VERSION_NUMBER >= 0x30000000L)
 
 static void error_queue(const char *name)
 {
@@ -160,10 +158,10 @@ int main(int argc, char *argv[])
 #include <stdio.h>
 
 int main() {
-	fprintf(stderr, "Skipped: requires OpenSSL 3.x built with EC support\n");
+	fprintf(stderr, "Skipped: requires OpenSSL >= 3.0 built with EC support\n");
 	return 77;
 }
 
-#endif /* !OPENSSL_NO_EC && OpenSSL 3.x */
+#endif /* !OPENSSL_NO_EC && OPENSSL_VERSION_NUMBER >= 0x30000000L  */
 
 /* vim: set noexpandtab: */