summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bluhm <bluhm@cvs.openbsd.org>2015-09-11 22:01:07 +0000
committerAlexander Bluhm <bluhm@cvs.openbsd.org>2015-09-11 22:01:07 +0000
commitd295e825b779b4aa9300e9288bcc5b54e5e6c2bc (patch)
treef593bbf0fae32168db06b7d54a773a898c189ee8
parent6fbc9713c63a22b31947eb2193406bc52d1a2199 (diff)
Adapt test to 50MB CAfile limit.
-rw-r--r--regress/usr.sbin/syslogd/Makefile4
-rw-r--r--regress/usr.sbin/syslogd/args-tls-cafile-toobig.pl2
2 files changed, 3 insertions, 3 deletions
diff --git a/regress/usr.sbin/syslogd/Makefile b/regress/usr.sbin/syslogd/Makefile
index 1866f51b0aa..a60a7ea7d76 100644
--- a/regress/usr.sbin/syslogd/Makefile
+++ b/regress/usr.sbin/syslogd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2015/07/09 21:12:44 bluhm Exp $
+# $OpenBSD: Makefile,v 1.11 2015/09/11 22:01:06 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
@@ -84,7 +84,7 @@ empty:
true >$@
toobig:
- dd if=/dev/zero of=$@ bs=1 count=1 seek=1G
+ dd if=/dev/zero of=$@ bs=1 count=1 seek=50M
${REGRESS_TARGETS:M*tls*}: server.crt
${REGRESS_TARGETS:M*empty*}: empty
diff --git a/regress/usr.sbin/syslogd/args-tls-cafile-toobig.pl b/regress/usr.sbin/syslogd/args-tls-cafile-toobig.pl
index 4955a54934a..c41fac54579 100644
--- a/regress/usr.sbin/syslogd/args-tls-cafile-toobig.pl
+++ b/regress/usr.sbin/syslogd/args-tls-cafile-toobig.pl
@@ -13,7 +13,7 @@ our %args = (
syslogd => {
loghost => '@tls://localhost:$connectport',
loggrep => {
- qr/CAfile larger than 1GB/ => 2,
+ qr/CAfile larger than 50MB/ => 2,
qr/Logging to FORWTLS \@tls:\/\/localhost:\d+/ => '>=4',
qr/syslogd: tls_connect_socket .*: /.
qr/ssl verify setup failure/ => 2,