diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2017-11-09 21:35:08 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2017-11-09 21:35:08 +0000 |
| commit | ce25e2982bde749c219357bd5983d2735277919f (patch) | |
| tree | d13efe62f3256c6a6d302fe383c11fc05244d6ff /test/runtest | |
| parent | b60b2eea0867313b7d950c1e13bf7067095eb605 (diff) | |
Testsuite: another go at munging cipher-suite strings
Diffstat (limited to 'test/runtest')
| -rwxr-xr-x | test/runtest | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/runtest b/test/runtest index e4195b64a..5640a5f58 100755 --- a/test/runtest +++ b/test/runtest @@ -549,12 +549,12 @@ RESET_AFTER_EXTRA_LINE_READ: # Retain the authentication algorith field as we want to test that. s/( (?: (?:\b|\s) [\(=] ) | \s )TLSv1\.[12]:/$1TLSv1:/xg; - s/((EC)?DHE-)?(RSA|ECDSA)-AES(128|256)-(GCM-SHA(256|384)|SHA)(?-:)/ke-$3-AES256-SHAxxx/g; - s/((EC)?DHE-)?(RSA|ECDSA)-AES(128|256)-(GCM-SHA(256|384)|SHA):(128|256)/ke-$3-AES256-SHAxxx/g; + s/((EC)?DHE-)?(RSA|ECDSA)-AES(128|256)-(GCM-SHA(256|384)|SHA)(?!:)/ke-$3-AES256-SHA/g; + s/((EC)?DHE-)?(RSA|ECDSA)-AES(128|256)-(GCM-SHA(256|384)|SHA):(128|256)/ke-$3-AES256-SHA:xxx/g; # LibreSSL # TLSv1:ECDHE-RSA-CHACHA20-POLY1305:256 - s/((EC)?DHE-)?(RSA|ECDSA)-CHACHA20-POLY1305\b/ke-$3-AES256-SHAxxx/g; + s/((EC)?DHE-)?(RSA|ECDSA)-CHACHA20-POLY1305\b/ke-$3-AES256-SHA:xxx/g; # GnuTLS have seen: # TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256 |