Replace expiring certs with more modern versions

Ref: #1018

12 files changed, 15 insertions, 15 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 714f331..1a4f142 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -452,9 +452,9 @@ add_executable(keypairtest keypairtest.c)
 target_link_libraries(keypairtest ${LIBTLS_TEST_LIBS})
 target_include_directories(keypairtest BEFORE PUBLIC ../tls)
 add_test(keypairtest keypairtest
-        ${CMAKE_CURRENT_SOURCE_DIR}/ca.pem
-        ${CMAKE_CURRENT_SOURCE_DIR}/server.pem
-        ${CMAKE_CURRENT_SOURCE_DIR}/server.pem)
+        ${CMAKE_CURRENT_SOURCE_DIR}/ca-root-rsa.pem
+        ${CMAKE_CURRENT_SOURCE_DIR}/server1-rsa.pem
+        ${CMAKE_CURRENT_SOURCE_DIR}/server1-rsa.pem)
 
 # md_test
 add_executable(md_test md_test.c)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e0e5a32..e79958c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -693,12 +693,12 @@ ssltest_SOURCES = ssltest.c
 EXTRA_DIST += ssltest.sh ssltest.bat
 EXTRA_DIST += testssl testssl.bat
 EXTRA_DIST += ca-int-ecdsa.crl ca-int-ecdsa.pem ca-int-rsa.crl ca-int-rsa.pem
-EXTRA_DIST += ca-root-ecdsa.pem ca-root-rsa.pem ca.pem client.pem
+EXTRA_DIST += ca-root-ecdsa.pem ca-root-rsa.pem
 EXTRA_DIST += client1-ecdsa-chain.pem client1-ecdsa.pem client1-rsa-chain.pem
 EXTRA_DIST += client1-rsa.pem client2-ecdsa-chain.pem client2-ecdsa.pem
 EXTRA_DIST += client2-rsa-chain.pem client2-rsa.pem client3-ecdsa-chain.pem
 EXTRA_DIST += client3-ecdsa.pem client3-rsa-chain.pem client3-rsa.pem
-EXTRA_DIST += server.pem server1-ecdsa-chain.pem server1-ecdsa.pem
+EXTRA_DIST += server1-ecdsa-chain.pem server1-ecdsa.pem
 EXTRA_DIST += server1-rsa-chain.pem server1-rsa.pem server2-ecdsa-chain.pem
 EXTRA_DIST += server2-ecdsa.pem server2-rsa-chain.pem server2-rsa.pem
 EXTRA_DIST += server3-ecdsa-chain.pem server3-ecdsa.pem server3-rsa-chain.pem
diff --git a/tests/dtlstest.sh b/tests/dtlstest.sh
index ef18cfc..8f9b229 100755
--- a/tests/dtlstest.sh
+++ b/tests/dtlstest.sh
@@ -10,4 +10,4 @@ if [ -z $srcdir ]; then
         srcdir=.
 fi
 
-$dtlstest_bin $srcdir/server.pem $srcdir/server.pem $srcdir/ca.pem
+$dtlstest_bin $srcdir/server1-rsa.pem $srcdir/server1-rsa.pem $srcdir/ca-int-rsa.pem
diff --git a/tests/keypairtest.sh b/tests/keypairtest.sh
index 3c24869..8bb7d9f 100755
--- a/tests/keypairtest.sh
+++ b/tests/keypairtest.sh
@@ -9,4 +9,4 @@ if [ -z $srcdir ]; then
         srcdir=.
 fi
 
-$TEST $srcdir/ca.pem $srcdir/server.pem $srcdir/server.pem
+$TEST $srcdir/ca-root-rsa.pem $srcdir/server1-rsa.pem $srcdir/server1-rsa.pem
diff --git a/tests/quictest.bat b/tests/quictest.bat
index cfbf2cd..645fc2f 100644
--- a/tests/quictest.bat
+++ b/tests/quictest.bat
@@ -6,7 +6,7 @@ set quictest_bin=%1
 set quictest_bin=%quictest_bin:/=\%

 if not exist %quictest_bin% exit /b 1

 

-%quictest_bin% %srcdir%\server.pem %srcdir%\server.pem %srcdir%\ca.pem

+%quictest_bin% %srcdir%\server1-rsa.pem %srcdir%\server1-rsa-chain.pem %srcdir%\ca-root-rsa.pem

 if !errorlevel! neq 0 (

         exit /b 1

 )

diff --git a/tests/quictest.sh b/tests/quictest.sh
index cc1982f..0184179 100755
--- a/tests/quictest.sh
+++ b/tests/quictest.sh
@@ -10,4 +10,4 @@ if [ -z $srcdir ]; then
         srcdir=.
 fi
 
-$quictest_bin $srcdir/server.pem $srcdir/server.pem $srcdir/ca.pem
+$quictest_bin $srcdir/server1-rsa.pem $srcdir/server1-rsa-chain.pem $srcdir/ca-root-rsa.pem
diff --git a/tests/servertest.bat b/tests/servertest.bat
index 8c9bd97..c0bfaa4 100644
--- a/tests/servertest.bat
+++ b/tests/servertest.bat
@@ -6,7 +6,7 @@ set servertest_bin=%1
 set servertest_bin=%servertest_bin:/=\%

 if not exist %servertest_bin% exit /b 1

 

-%servertest_bin% %srcdir%\server.pem %srcdir%\server.pem %srcdir%\ca.pem

+%servertest_bin% %srcdir%\server1-rsa.pem %srcdir%\server1-rsa-chain.pem %srcdir%\ca-root.pem

 if !errorlevel! neq 0 (

         exit /b 1

 )

diff --git a/tests/servertest.sh b/tests/servertest.sh
index f1efeb0..d6497bd 100755
--- a/tests/servertest.sh
+++ b/tests/servertest.sh
@@ -10,4 +10,4 @@ if [ -z $srcdir ]; then
         srcdir=.
 fi
 
-$servertest_bin $srcdir/server.pem $srcdir/server.pem $srcdir/ca.pem
+$servertest_bin $srcdir/server1-rsa.pem $srcdir/server1-rsa-chain.pem $srcdir/ca-root-rsa.pem
diff --git a/tests/shutdowntest.bat b/tests/shutdowntest.bat
index 46db6e8..f087dbb 100644
--- a/tests/shutdowntest.bat
+++ b/tests/shutdowntest.bat
@@ -6,7 +6,7 @@ set shutdowntest_bin=%1
 set shutdowntest_bin=%shutdowntest_bin:/=\%

 if not exist %shutdowntest_bin% exit /b 1

 

-%shutdowntest_bin% %srcdir%\server.pem %srcdir%\server.pem %srcdir%\ca.pem

+%shutdowntest_bin% %srcdir%\server1-rsa.pem %srcdir%\server1-rsa-chain.pem %srcdir%\ca-root-rsa.pem

 if !errorlevel! neq 0 (

         exit /b 1

 )

diff --git a/tests/shutdowntest.sh b/tests/shutdowntest.sh
index 22e2b1d..d4aec1c 100755
--- a/tests/shutdowntest.sh
+++ b/tests/shutdowntest.sh
@@ -10,4 +10,4 @@ if [ -z $srcdir ]; then
         srcdir=.
 fi
 
-$shutdowntest_bin $srcdir/server.pem $srcdir/server.pem $srcdir/ca.pem
+$shutdowntest_bin $srcdir/server1-rsa.pem $srcdir/server1-rsa-chain.pem $srcdir/ca-root-rsa.pem
diff --git a/tests/tlstest.bat b/tests/tlstest.bat
index 25664cf..5f5f6a6 100644
--- a/tests/tlstest.bat
+++ b/tests/tlstest.bat
@@ -6,7 +6,7 @@ set tlstest_bin=%1
 set tlstest_bin=%tlstest_bin:/=\%

 if not exist %tlstest_bin% exit /b 1

 

-%tlstest_bin% %srcdir%\ca.pem %srcdir%\server.pem %srcdir%\server.pem

+%tlstest_bin% %srcdir%\ca-root-rsa.pem %srcdir%\server1-rsa-chain.pem %srcdir%\server1-rsa.pem

 if !errorlevel! neq 0 (

         exit /b 1

 )

diff --git a/tests/tlstest.sh b/tests/tlstest.sh
index 25f8647..4024007 100755
--- a/tests/tlstest.sh
+++ b/tests/tlstest.sh
@@ -10,4 +10,4 @@ if [ -z $srcdir ]; then
         srcdir=.
 fi
 
-$tlstest_bin $srcdir/ca.pem $srcdir/server.pem $srcdir/server.pem
+$tlstest_bin $srcdir/ca-root-rsa.pem $srcdir/server1-rsa-chain.pem $srcdir/server1-rsa.pem