diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2019-02-03 22:12:48 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2019-02-11 00:16:46 +0000 |
| commit | f1be21cf0b8b97a64dfe17f2ca05bb4b9efe8d32 (patch) | |
| tree | 23737dcc9b4edacc24de82882c9e562100f53e52 /test/runtest | |
| parent | 826cb8c29cb1947cfc8f0e1b4e96c97e10a0e18a (diff) | |
TLS: add variables for the IETF standard name for the connection ciphersuite
(cherry picked from commit ffc3d145e3819e1a3762caa1bbe8b07e723fbaf2)
Diffstat (limited to 'test/runtest')
| -rwxr-xr-x | test/runtest | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/test/runtest b/test/runtest index e94180414..729f88a66 100755 --- a/test/runtest +++ b/test/runtest @@ -544,6 +544,15 @@ RESET_AFTER_EXTRA_LINE_READ: s/(could not connect to .*: Connection) reset by peer$/$1 refused/; # ======== TLS certificate algorithms ======== + # + # In Received: headers, convert RFC 8314 style ciphersuite to + # the older (comment) style, keeping only the Auth element + # (discarding kex, cipher, mac). For TLS 1.3 there is no kex + # element (and no _WITH); insert a spurious "RSA". + + s/^\s+by .+ with .+ \K tls TLS_.*?([^_]+)_WITH.+$/(TLS1.x:ke-\1-AES256-SHAnnn:xxx)/; + s/^\s+by .+ with .+ \K tls TLS_.+$/(TLS1.x:ke-RSA-AES256-SHAnnn:xxx)/; + # Test machines might have various different TLS library versions supporting # different protocols; can't rely upon TLS 1.2's AES256-GCM-SHA384, so we # treat the standard algorithms the same. @@ -1630,7 +1639,9 @@ $munges = s! DN="[^,"]*\K,!/!; ', 'rejectlog' => 's/ X=TLS\S+ / X=TLS_proto_and_cipher /', - 'mail' => 's/ \(TLS[^)]*\)/ (TLS_proto_and_cipher)/', + 'mail' => 's/^\s+by .+ with .+ \K tls TLS_.+$/(TLS_proto_and_cipher)/; + s/ \(TLS[^)]*\)/ (TLS_proto_and_cipher)/; + ', }, 'debug_pid' => |