By now relayd expects tls in its config file and writes tls into

its log file.  Change regression tests form ssl to tls.

diff --git a/regress/usr.sbin/relayd/Relayd.pm b/regress/usr.sbin/relayd/Relayd.pm
index 143e703..d678e02 100644 (file)
--- a/regress/usr.sbin/relayd/Relayd.pm
+++ b/regress/usr.sbin/relayd/Relayd.pm
@@ -1,4 +1,4 @@
-#      $OpenBSD: Relayd.pm,v 1.12 2014/08/18 22:58:19 bluhm Exp $
+#      $OpenBSD: Relayd.pm,v 1.13 2014/12/14 20:30:51 bluhm Exp $
 
 # Copyright (c) 2010-2014 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -47,7 +47,7 @@ sub new {
            or croak "$class connect port not given";
 
        my $test = basename($self->{testfile} || "");
-       # ssl does not allow a too long session id, so truncate it
+       # tls does not allow a too long session id, so truncate it
        substr($test, 25, length($test) - 25, "") if length($test) > 25;
        open(my $fh, '>', $self->{conffile})
            or die ref($self), " conf file $self->{conffile} create failed: $!";
@@ -82,11 +82,11 @@ sub new {
        print $fh  "relay relay-$test {";
        print $fh  "\n\tprotocol proto-$test"
            unless grep { /^protocol / } @relay;
-       my $ssl = $self->{listenssl} ? " ssl" : "";
+       my $tls = $self->{listenssl} ? " tls" : "";
        print $fh  "\n\tlisten on $self->{listenaddr} ".
-           "port $self->{listenport}$ssl" unless grep { /^listen / } @relay;
-       my $withssl = $self->{forwardssl} ? " with ssl" : "";
-       print $fh  "\n\tforward$withssl to $self->{connectaddr} ".
+           "port $self->{listenport}$tls" unless grep { /^listen / } @relay;
+       my $withtls = $self->{forwardssl} ? " with tls" : "";
+       print $fh  "\n\tforward$withtls to $self->{connectaddr} ".
            "port $self->{connectport}" unless grep { /^forward / } @relay;
        # substitute variables in config file
        foreach (@relay) {

diff --git a/regress/usr.sbin/relayd/args-https-filter-persistent.pl b/regress/usr.sbin/relayd/args-https-filter-persistent.pl
index 8e3b5b5..5272c6a 100644 (file)
--- a/regress/usr.sbin/relayd/args-https-filter-persistent.pl
+++ b/regress/usr.sbin/relayd/args-https-filter-persistent.pl
@@ -16,7 +16,7 @@ our %args = (
            'block request path "/2"',
        ],
        loggrep => [
-           qr/ssl, ssl client/ => 1,
+           qr/tls, tls client/ => 1,
            qr/Forbidden/ => 1,
        ],
        forwardssl => 1,