diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2017-11-11 21:19:50 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2017-11-11 21:19:50 +0000 |
| commit | 205aba45c7693e77489a1fd5d4a73d1d3f2a5cf0 (patch) | |
| tree | 5da01cb52a00f48b259b68da6e297a23009bc3a4 | |
| parent | 0fe373c1d685d2daf59913ef2ae971c56ea60107 (diff) | |
Testsuite: another go at munging cipher-suite strings
| -rwxr-xr-x | test/runtest | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/test/runtest b/test/runtest index 58a31ea06..023289265 100755 --- a/test/runtest +++ b/test/runtest @@ -553,8 +553,15 @@ RESET_AFTER_EXTRA_LINE_READ: s/((EC)?DHE-)?(RSA|ECDSA)-AES(128|256)-(GCM-SHA(256|384)|SHA):(128|256)/ke-$3-AES256-SHA:xxx/g; # LibreSSL + # TLSv1:AES256-GCM-SHA384:256 # TLSv1:ECDHE-RSA-CHACHA20-POLY1305:256 - s/((EC)?DHE-)?(RSA|ECDSA)-CHACHA20-POLY1305:256/ke-$3-AES256-SHA:xxx/g; + # + # ECDHE-RSA-CHACHA20-POLY1305 + # AES256-GCM-SHA384 + + s/(?<!-)(AES256-GCM-SHA384)/RSA-$1/; + s/((EC)?DHE-)?(RSA|ECDSA)-(AES256|CHACHA20)-(GCM-SHA384|POLY1305)(?!:)/ke-$3-AES256-SHA/g; + s/((EC)?DHE-)?(RSA|ECDSA)-(AES256|CHACHA20)-(GCM-SHA384|POLY1305):256/ke-$3-AES256-SHA:xxx/g; # GnuTLS have seen: # TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256 |