X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/348051adc5ea922f4e82d971d44f03e87557b6ec..f77cff22db0bbb4d71a16becb5512e19d86ed63a:/test/runtest diff --git a/test/runtest b/test/runtest index 458c9a659..5216eaded 100755 --- a/test/runtest +++ b/test/runtest @@ -498,6 +498,7 @@ RESET_AFTER_EXTRA_LINE_READ: # treat the standard algorithms the same. # So far, have seen: # TLSv1:AES256-SHA:256 + # TLSv1.1:AES256-SHA:256 # TLSv1.2:AES256-GCM-SHA384:256 # TLSv1.2:DHE-RSA-AES256-SHA:256 # TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128 @@ -507,7 +508,7 @@ RESET_AFTER_EXTRA_LINE_READ: # Mail headers (...), log-lines X=..., client-ssl output ... # (and \b doesn't match between ' ' and '(' ) - s/( (?: (?:\b|\s) [\(=] ) | \s )TLSv1\.2:/$1TLSv1:/xg; + s/( (?: (?:\b|\s) [\(=] ) | \s )TLSv1\.[12]:/$1TLSv1:/xg; s/\bAES256-GCM-SHA384\b/AES256-SHA/g; s/\bDHE-RSA-AES256-SHA\b/AES256-SHA/g; @@ -544,7 +545,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/TLS error on connection from \[127.0.0.1\] \(recv\): A TLS packet with unexpected length was received./TLS error on connection from [127.0.0.1] (recv): The TLS connection was non-properly terminated./g; # signature algorithm names - s/RSA-SHA1/RSA_SHA/; + s/RSA-SHA1/RSA-SHA/; # ======== Caller's login, uid, gid, home, gecos ========