Prechádzať zdrojové kódy

Mark the test root CA as a CA explicitly instead of picking a cert version by openssl version (#2681)

gen-certs.sh and test/CMakeLists.txt chose between -x509v1 and -x509 by the
openssl version. When the default openssl changed (macOS runner image
20261112), the root was generated as v3 without basicConstraints, openssl
rejected it as 'invalid CA certificate', and every client certificate test
failed. Add basicConstraints CA:TRUE to test.rootCA.conf, drop the version
branching, and verify the client certs against the root in gen-certs.sh.
yhirose 3 dní pred
rodič
commit
eb364f1167
3 zmenil súbory, kde vykonal 13 pridanie a 14 odobranie
  1. 2 7
      test/CMakeLists.txt
  2. 5 7
      test/gen-certs.sh
  3. 6 0
      test/test.rootCA.conf

+ 2 - 7
test/CMakeLists.txt

@@ -37,11 +37,6 @@ file(
 )
 
 if(HTTPLIB_IS_USING_OPENSSL)
-    if (OPENSSL_VERSION VERSION_LESS "3.2.0")
-      set(OPENSSL_X509_FLAG "-x509")
-    else()
-      set(OPENSSL_X509_FLAG "-x509v1")
-    endif()
     find_program(OPENSSL_COMMAND
         NAMES openssl
         PATHS ${OPENSSL_INCLUDE_DIR}/../bin
@@ -61,7 +56,7 @@ if(HTTPLIB_IS_USING_OPENSSL)
         COMMAND_ERROR_IS_FATAL ANY
     )
     execute_process(
-        COMMAND ${OPENSSL_COMMAND} req ${OPENSSL_X509_FLAG} -new -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key key.pem -sha256 -days 3650 -nodes -out cert2.pem -extensions SAN
+        COMMAND ${OPENSSL_COMMAND} req -x509 -new -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key key.pem -sha256 -days 3650 -nodes -out cert2.pem -extensions SAN
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         COMMAND_ERROR_IS_FATAL ANY
     )
@@ -72,7 +67,7 @@ if(HTTPLIB_IS_USING_OPENSSL)
         COMMAND_ERROR_IS_FATAL ANY
     )
     execute_process(
-        COMMAND ${OPENSSL_COMMAND} req ${OPENSSL_X509_FLAG} -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.rootCA.conf -key rootCA.key.pem -days 1024
+        COMMAND ${OPENSSL_COMMAND} req -x509 -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.rootCA.conf -key rootCA.key.pem -days 1024
         OUTPUT_FILE rootCA.cert.pem
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         COMMAND_ERROR_IS_FATAL ANY

+ 5 - 7
test/gen-certs.sh

@@ -1,15 +1,9 @@
 #!/usr/bin/env bash
-if [[ $(openssl version) =~ 3\.[2-9]\.[0-9]+ ]]; then
-	OPENSSL_X509_FLAG='-x509v1'
-else
-	OPENSSL_X509_FLAG='-x509'
-fi
-
 openssl genrsa 2048 > key.pem
 openssl req -new -batch -config test.conf -key key.pem | openssl x509 -days 3650 -req -signkey key.pem > cert.pem
 openssl req -x509 -config test.conf -key key.pem -sha256 -days 3650 -nodes -out cert2.pem -extensions SAN
 openssl genrsa 2048 > rootCA.key.pem
-openssl req $OPENSSL_X509_FLAG -new -batch -config test.rootCA.conf -key rootCA.key.pem -days 1024 > rootCA.cert.pem
+openssl req -x509 -new -batch -config test.rootCA.conf -key rootCA.key.pem -days 1024 > rootCA.cert.pem
 openssl genrsa 2048 > client.key.pem
 openssl req -new -batch -config test.conf -key client.key.pem | openssl x509 -days 370 -req -CA rootCA.cert.pem -CAkey rootCA.key.pem -CAcreateserial > client.cert.pem
 openssl genrsa -passout pass:test123! 2048 > key_encrypted.pem
@@ -47,3 +41,7 @@ openssl req -x509 -key key.pem -sha256 -days 3650 -nodes -subj "/CN=localhost" -
 #                 "*.leftmost.example.test" matches a single label; the
 #                 wildcard in "www.*.example.test" must not be honoured.
 openssl req -x509 -key key.pem -sha256 -days 3650 -nodes -subj "/CN=wildcard-san" -addext "subjectAltName=DNS:*.leftmost.example.test,DNS:www.*.example.test" -out cert_wildcard_san.pem
+
+# The client certs must chain to a root that openssl accepts as a CA; a root
+# without basicConstraints CA:TRUE makes every client-cert test fail.
+openssl verify -CAfile rootCA.cert.pem client.cert.pem client_encrypted.cert.pem

+ 6 - 0
test/test.rootCA.conf

@@ -2,6 +2,7 @@
 default_bits           = 2048
 distinguished_name     = req_distinguished_name
 attributes             = req_attributes
+x509_extensions        = v3_ca
 prompt                 = no
 output_password        = mypass
 
@@ -16,3 +17,8 @@ emailAddress           = test@email.address
 
 [req_attributes]
 challengePassword              = 1234
+
+# Mark the root as a CA explicitly. Relying on the openssl version to emit a
+# v1 certificate (or CA:TRUE by default) breaks when the default changes.
+[v3_ca]
+basicConstraints       = critical,CA:TRUE