6 files changed, 23 insertions, 22 deletions

diff --git a/src/regress/lib/libssl/dtls/Makefile b/src/regress/lib/libssl/dtls/Makefile
index 438cd5c7ff..b58dae61b6 100644
--- a/src/regress/lib/libssl/dtls/Makefile
+++ b/src/regress/lib/libssl/dtls/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.3 2022/01/07 09:07:00 tb Exp $
+#       $OpenBSD: Makefile,v 1.4 2024/03/20 10:38:05 jsing Exp $
 
 PROG=           dtlstest
 LDADD=          ${SSL_INT} -lcrypto
@@ -11,10 +11,11 @@ CFLAGS+=	-I${.CURDIR}/../../../../lib/libssl
 REGRESS_TARGETS= \
         regress-dtlstest
 
+# XXX(jsing): use CA root and chain
 regress-dtlstest: ${PROG}
         ./dtlstest \
-            ${.CURDIR}/../../libssl/certs/server.pem \
-            ${.CURDIR}/../../libssl/certs/server.pem \
-            ${.CURDIR}/../../libssl/certs/ca.pem
+            ${.CURDIR}/../../libssl/certs/server1-rsa.pem \
+            ${.CURDIR}/../../libssl/certs/server1-rsa.pem \
+            ${.CURDIR}/../../libssl/certs/ca-int-rsa.pem
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/quic/Makefile b/src/regress/lib/libssl/quic/Makefile
index a348b2df47..55fef6b257 100644
--- a/src/regress/lib/libssl/quic/Makefile
+++ b/src/regress/lib/libssl/quic/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.2 2022/10/02 16:40:56 jsing Exp $
+#       $OpenBSD: Makefile,v 1.3 2024/03/20 10:38:05 jsing Exp $
 
 PROG=   quictest
 LDADD=  -lssl -lcrypto
@@ -12,8 +12,8 @@ REGRESS_TARGETS= \
 
 regress-quictest: ${PROG}
         ./quictest \
-            ${.CURDIR}/../../libssl/certs/server.pem \
-            ${.CURDIR}/../../libssl/certs/server.pem \
-            ${.CURDIR}/../../libssl/certs/ca.pem
+            ${.CURDIR}/../../libssl/certs/server1-rsa.pem \
+            ${.CURDIR}/../../libssl/certs/server1-rsa-chain.pem \
+            ${.CURDIR}/../../libssl/certs/ca-root-rsa.pem
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/server/Makefile b/src/regress/lib/libssl/server/Makefile
index 0621a5f243..be86dbb1ad 100644
--- a/src/regress/lib/libssl/server/Makefile
+++ b/src/regress/lib/libssl/server/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.2 2020/05/11 18:18:21 jsing Exp $
+#       $OpenBSD: Makefile,v 1.3 2024/03/20 10:38:05 jsing Exp $
 
 PROG=   servertest
 LDADD=  ${SSL_INT} -lcrypto
@@ -11,8 +11,8 @@ REGRESS_TARGETS= \
 
 regress-servertest: ${PROG}
         ./servertest \
-            ${.CURDIR}/../../libssl/certs/server.pem \
-            ${.CURDIR}/../../libssl/certs/server.pem \
-            ${.CURDIR}/../../libssl/certs/ca.pem
+            ${.CURDIR}/../../libssl/certs/server1-rsa.pem \
+            ${.CURDIR}/../../libssl/certs/server1-rsa-chain.pem \
+            ${.CURDIR}/../../libssl/certs/ca-root-rsa.pem
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/shutdown/Makefile b/src/regress/lib/libssl/shutdown/Makefile
index 51305012d6..d6a9a30544 100644
--- a/src/regress/lib/libssl/shutdown/Makefile
+++ b/src/regress/lib/libssl/shutdown/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.1 2024/01/19 08:29:08 jsing Exp $
+#       $OpenBSD: Makefile,v 1.2 2024/03/20 10:38:05 jsing Exp $
 
 PROG=   shutdowntest
 LDADD=  -lssl -lcrypto
@@ -11,8 +11,8 @@ REGRESS_TARGETS= \
 
 regress-shutdowntest: ${PROG}
         ./shutdowntest \
-            ${.CURDIR}/../../libssl/certs/server.pem \
-            ${.CURDIR}/../../libssl/certs/server.pem \
-            ${.CURDIR}/../../libssl/certs/ca.pem
+            ${.CURDIR}/../../libssl/certs/server1-rsa.pem \
+            ${.CURDIR}/../../libssl/certs/server1-rsa-chain.pem \
+            ${.CURDIR}/../../libssl/certs/ca-root-rsa.pem
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/tls/Makefile b/src/regress/lib/libssl/tls/Makefile
index a22cdcdeb2..315ac692c3 100644
--- a/src/regress/lib/libssl/tls/Makefile
+++ b/src/regress/lib/libssl/tls/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.1 2021/10/23 14:34:10 jsing Exp $
+#       $OpenBSD: Makefile,v 1.2 2024/03/20 10:38:05 jsing Exp $
 
 PROG=   tlstest
 LDADD=  -lssl -lcrypto
@@ -11,8 +11,8 @@ REGRESS_TARGETS= \
 
 regress-tlstest: ${PROG}
         ./tlstest \
-            ${.CURDIR}/../../libssl/certs/server.pem \
-            ${.CURDIR}/../../libssl/certs/server.pem \
-            ${.CURDIR}/../../libssl/certs/ca.pem
+            ${.CURDIR}/../../libssl/certs/server1-rsa.pem \
+            ${.CURDIR}/../../libssl/certs/server1-rsa-chain.pem \
+            ${.CURDIR}/../../libssl/certs/ca-root-rsa.pem
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/unit/ssl_get_shared_ciphers.c b/src/regress/lib/libssl/unit/ssl_get_shared_ciphers.c
index 33efc15f10..ff966900aa 100644
--- a/src/regress/lib/libssl/unit/ssl_get_shared_ciphers.c
+++ b/src/regress/lib/libssl/unit/ssl_get_shared_ciphers.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ssl_get_shared_ciphers.c,v 1.11 2022/02/05 18:19:39 tb Exp $ */
+/*      $OpenBSD: ssl_get_shared_ciphers.c,v 1.12 2024/03/20 10:38:05 jsing Exp $ */
 /*
  * Copyright (c) 2021 Theo Buehler <tb@openbsd.org>
  *
@@ -462,7 +462,7 @@ main(int argc, char **argv)
         size_t i;
         int failed = 0;
 
-        if (asprintf(&server_cert, "%s/server.pem", CERTSDIR) == -1) {
+        if (asprintf(&server_cert, "%s/server1-rsa.pem", CERTSDIR) == -1) {
                 fprintf(stderr, "asprintf server_cert failed\n");
                 failed = 1;
                 goto err;