summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTatsuo Ishii2024-11-24 11:10:28 +0000
committerTatsuo Ishii2024-11-24 11:10:28 +0000
commit3ad6c0c378006dffe2b052d4c68b5b6ec0819c96 (patch)
tree9aeb43ae77702664a16c5afdeb72c43e465d3c97
parentdd5a79aef8081bea74f9be7c4beb54ef34637ec9 (diff)
Revert "Test: fix recent 024.cert_auth regression test failure."
This reverts commit dd5a79aef8081bea74f9be7c4beb54ef34637ec9. The attempt to fix 024.cert_auth regression test failure on RockyLinux9 was not successful.
-rwxr-xr-xsrc/test/regression/tests/024.cert_auth/cert.sh4
-rwxr-xr-xsrc/test/regression/tests/024.cert_auth/test.sh9
2 files changed, 3 insertions, 10 deletions
diff --git a/src/test/regression/tests/024.cert_auth/cert.sh b/src/test/regression/tests/024.cert_auth/cert.sh
index dbc3cdcab..f50466bce 100755
--- a/src/test/regression/tests/024.cert_auth/cert.sh
+++ b/src/test/regression/tests/024.cert_auth/cert.sh
@@ -71,6 +71,6 @@ openssl ca -batch -in frontend.req -config crl_openssl.conf -days 375 -notext -m
# Generate clean CRL (No revocation so far)
openssl ca -gencrl -config crl_openssl.conf -out server.crl -cert root.crt -keyfile root.key
# Revoke Frontend Cert
-#openssl ca -revoke frontend.crt -config crl_openssl.conf -keyfile root.key -cert root.crt -out root.crl
+openssl ca -revoke frontend.crt -config crl_openssl.conf -keyfile root.key -cert root.crt -out root.crl
# Generate CRL after revocation
-#openssl ca -gencrl -config crl_openssl.conf -out server_revoked.crl -cert root.crt -keyfile root.key
+openssl ca -gencrl -config crl_openssl.conf -out server_revoked.crl -cert root.crt -keyfile root.key
diff --git a/src/test/regression/tests/024.cert_auth/test.sh b/src/test/regression/tests/024.cert_auth/test.sh
index 452301973..8f5082a0a 100755
--- a/src/test/regression/tests/024.cert_auth/test.sh
+++ b/src/test/regression/tests/024.cert_auth/test.sh
@@ -35,7 +35,7 @@ cp -p ../$SSL_KEY etc/
chmod og-rwx etc/$SSL_KEY
cp -p ../$SSL_CRT etc/
cp -p ../$SSL_CRL etc/
-#cp -p ../$SSL_CRL2 etc/
+cp -p ../$SSL_CRL2 etc/
cp -p ../$ROOT_CRT etc/
echo "ssl = on" >> etc/pgpool.conf
@@ -77,7 +77,6 @@ echo "Checking cert auth between Pgpool-II and frontend was ok."
# Starting CRL verification
-
# Adding valid CRL file in pgpool.conf file.
echo "ssl_crl_file = '$SSL_CRL'" >> etc/pgpool.conf
@@ -117,12 +116,6 @@ echo "Checking cert auth between Pgpool-II and frontend with clean CRL was ok."
# Adding CRL file with revoked certification entry in pgpool.conf file.
echo "Updating pgpool.conf with revoked CRL file"
-# Revoke Frontend Cert
-(cd ..;openssl ca -revoke frontend.crt -config crl_openssl.conf -keyfile root.key -cert root.crt -out root.crl)
-# Generate CRL after revocation
-(cd ..; openssl ca -gencrl -config crl_openssl.conf -out server_revoked.crl -cert root.crt -keyfile root.key)
-cp -p ../$SSL_CRL2 etc/
-
sed -i 's/server.crl/server_revoked.crl/' etc/pgpool.conf
# Check pgpool configuration is updated successfully