From 6c10bc06c873f9e4763dd721bb8e89fbf5614b68 Mon Sep 17 00:00:00 2001 From: bluhm Date: Fri, 9 Oct 2015 17:51:08 +0000 Subject: [PATCH] Keep relayd test certificate names in sync with syslogd. --- regress/usr.sbin/relayd/Makefile | 4 ++-- regress/usr.sbin/relayd/args-https.pl | 2 +- regress/usr.sbin/relayd/args-ssl.pl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/regress/usr.sbin/relayd/Makefile b/regress/usr.sbin/relayd/Makefile index 7c958cd8a9c..ad01e71b553 100644 --- a/regress/usr.sbin/relayd/Makefile +++ b/regress/usr.sbin/relayd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2015/05/22 19:09:18 bluhm Exp $ +# $OpenBSD: Makefile,v 1.12 2015/10/09 17:51:08 bluhm Exp $ # The following ports must be installed for the regression tests: # p5-IO-Socket-INET6 object interface for AF_INET and AF_INET6 domain sockets @@ -68,7 +68,7 @@ run-regress-$a: $a .for ip in ${REMOTE_ADDR} 127.0.0.1 ${ip}.crt: ca.crt - openssl req -batch -new -subj /L=OpenBSD/O=relayd-regress/OU=relay/CN=${ip}/ -nodes -newkey rsa -keyout ${ip}.key -x509 -out $@ + openssl req -batch -new -subj /L=OpenBSD/O=relayd-regress/OU=relayd/CN=${ip}/ -nodes -newkey rsa -keyout ${ip}.key -x509 -out $@ .if empty (REMOTE_SSH) ${SUDO} cp 127.0.0.1.crt /etc/ssl/ ${SUDO} cp 127.0.0.1.key /etc/ssl/private/ diff --git a/regress/usr.sbin/relayd/args-https.pl b/regress/usr.sbin/relayd/args-https.pl index 325eaead08b..6779cc864e4 100644 --- a/regress/usr.sbin/relayd/args-https.pl +++ b/regress/usr.sbin/relayd/args-https.pl @@ -7,7 +7,7 @@ our %args = ( client => { func => \&http_client, ssl => 1, - loggrep => 'Issuer.*/OU=relay/', + loggrep => 'Issuer.*/OU=relayd/', }, relayd => { protocol => [ "http", diff --git a/regress/usr.sbin/relayd/args-ssl.pl b/regress/usr.sbin/relayd/args-ssl.pl index e75c68ebd3b..a277f24b9aa 100644 --- a/regress/usr.sbin/relayd/args-ssl.pl +++ b/regress/usr.sbin/relayd/args-ssl.pl @@ -6,7 +6,7 @@ use warnings; our %args = ( client => { ssl => 1, - loggrep => 'Issuer.*/OU=relay/', + loggrep => 'Issuer.*/OU=relayd/', }, relayd => { forwardssl => 1, -- 2.20.1