commit d6387cdcd0f1e55d63b20256434698b81fc02cf8
author Kazuho Oku <kazuhooku@gmail.com> Sat Mar 20 17:43:23 2021 +0900
committer Kazuho Oku <kazuhooku@gmail.com> Sat Mar 20 17:43:23 2021 +0900
tree 15f9c7b8f5918b38c010e62941fd2a87023632e8
parent 4e11ff38405c4a8a6a002503cc7f13fa5ac76e1c

use available flag, omit SHAXXX check as we already depend on them unconditionally

lib/openssl.c

diff --git a/lib/openssl.c b/lib/openssl.c
index 8defdd2..e95a4ed 100644
--- a/lib/openssl.c
+++ b/lib/openssl.c
@@ -94,11 +94,11 @@
                                                                                   {UINT16_MAX, NULL}};
 static const struct st_ptls_openssl_signature_scheme_t secp256r1_signature_schemes[] = {
     {PTLS_SIGNATURE_ECDSA_SECP256R1_SHA256, EVP_sha256}, {UINT16_MAX, NULL}};
-#if defined(NID_secp384r1) && !OPENSSL_NO_SHA384
+#if PTLS_OPENSSL_HAVE_SECP384R1
 static const struct st_ptls_openssl_signature_scheme_t secp384r1_signature_schemes[] = {
     {PTLS_SIGNATURE_ECDSA_SECP384R1_SHA384, EVP_sha384}, {UINT16_MAX, NULL}};
 #endif
-#if defined(NID_secp521r1) && !OPENSSL_NO_SHA512
+#if PTLS_OPENSSL_HAVE_SECP521R1
 static const struct st_ptls_openssl_signature_scheme_t secp521r1_signature_schemes[] = {
     {PTLS_SIGNATURE_ECDSA_SECP521R1_SHA512, EVP_sha512}, {UINT16_MAX, NULL}};
 #endif
@@ -117,12 +117,12 @@
         case NID_X9_62_prime256v1:
             schemes = secp256r1_signature_schemes;
             break;
-#if defined(NID_secp384r1) && !OPENSSL_NO_SHA384
+#if PTLS_OPENSSL_HAVE_SECP384R1
         case NID_secp384r1:
             schemes = secp384r1_signature_schemes;
             break;
 #endif
-#if defined(NID_secp521r1) && !OPENSSL_NO_SHA512
+#if PTLS_OPENSSL_HAVE_SECP521R1
         case NID_secp521r1:
             schemes = secp521r1_signature_schemes;
             break;

t/openssl.c

diff --git a/t/openssl.c b/t/openssl.c
index 8f6bfc9..a6f0a06 100644
--- a/t/openssl.c
+++ b/t/openssl.c
@@ -172,10 +172,10 @@
 static void test_ecdsa_sign(void)
 {
     do_test_ecdsa_sign(NID_X9_62_prime256v1, secp256r1_signature_schemes);
-#if defined(NID_secp384r1) && !OPENSSL_NO_SHA384
+#if PTLS_OPENSSL_HAVE_SECP384R1
     do_test_ecdsa_sign(NID_secp384r1, secp384r1_signature_schemes);
 #endif
-#if defined(NID_secp521r1) && !OPENSSL_NO_SHA512
+#if PTLS_OPENSSL_HAVE_SECP521R1
     do_test_ecdsa_sign(NID_secp521r1, secp521r1_signature_schemes);
 #endif
 }