Use the new certificates/chains in regress.

The new certificates are more representative of the real world. The old
certificates use weak algorithms and expire in the very near future. Most
of our regress has already been switched over, this changes the remainder.

Thanks to Bernhard M. Wiedemann for reminding us of the upcoming expiry.

ok tb@

3 files changed, 10 insertions, 10 deletions

diff --git a/src/regress/lib/libtls/keypair/Makefile b/src/regress/lib/libtls/keypair/Makefile
index d06109a26b..c3ea15d3bd 100644
--- a/src/regress/lib/libtls/keypair/Makefile
+++ b/src/regress/lib/libtls/keypair/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.1 2018/02/08 10:06:52 jsing Exp $
+#       $OpenBSD: Makefile,v 1.2 2024/03/20 10:38:05 jsing Exp $
 
 PROG=   keypairtest
 LDADD=  -lcrypto -lssl ${TLS_INT}
@@ -13,8 +13,8 @@ REGRESS_TARGETS= \
 
 regress-keypairtest: ${PROG}
         ./keypairtest \
-            ${.CURDIR}/../../libssl/certs/ca.pem \
-            ${.CURDIR}/../../libssl/certs/server.pem \
-            ${.CURDIR}/../../libssl/certs/server.pem
+            ${.CURDIR}/../../libssl/certs/ca-root-rsa.pem \
+            ${.CURDIR}/../../libssl/certs/server1-rsa.pem \
+            ${.CURDIR}/../../libssl/certs/server1-rsa.pem
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libtls/keypair/keypairtest.c b/src/regress/lib/libtls/keypair/keypairtest.c
index 31bf7d6a5d..600e578f32 100644
--- a/src/regress/lib/libtls/keypair/keypairtest.c
+++ b/src/regress/lib/libtls/keypair/keypairtest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keypairtest.c,v 1.6 2022/02/08 18:05:57 tb Exp $ */
+/* $OpenBSD: keypairtest.c,v 1.7 2024/03/20 10:38:05 jsing Exp $ */
 /*
  * Copyright (c) 2018 Joel Sing <jsing@openbsd.org>
  *
@@ -29,7 +29,7 @@
 #include <tls_internal.h>
 
 #define PUBKEY_HASH \
-    "SHA256:858d0f94beb0a08eb4f13871ba57bf0a2e081287d0efbaeb3bbac59dd8f1a8e5"
+    "SHA256:f03c535d374614e7356c0a4e6fd37fe94297b60ed86212adcba40e8e0b07bc9f"
 
 char *cert_file, *key_file, *ocsp_staple_file;
 
diff --git a/src/regress/lib/libtls/tls/Makefile b/src/regress/lib/libtls/tls/Makefile
index 0fbd78481b..ecdc0393e7 100644
--- a/src/regress/lib/libtls/tls/Makefile
+++ b/src/regress/lib/libtls/tls/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2017/05/06 21:56:43 jsing Exp $
+# $OpenBSD: Makefile,v 1.3 2024/03/20 10:38:05 jsing Exp $
 
 PROG=   tlstest
 LDADD=  -lcrypto -lssl -ltls
@@ -12,8 +12,8 @@ REGRESS_TARGETS= \
 
 regress-tlstest: ${PROG}
         ./tlstest \
-            ${.CURDIR}/../../libssl/certs/ca.pem \
-            ${.CURDIR}/../../libssl/certs/server.pem \
-            ${.CURDIR}/../../libssl/certs/server.pem
+            ${.CURDIR}/../../libssl/certs/ca-root-rsa.pem \
+            ${.CURDIR}/../../libssl/certs/server1-rsa-chain.pem \
+            ${.CURDIR}/../../libssl/certs/server1-rsa.pem
 
 .include <bsd.regress.mk>