From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 11 Nov 2017 21:19:50 +0000 (+0000)
Subject: Testsuite: another go at munging cipher-suite strings
X-Git-Tag: exim-4_90_RC2~3
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=205aba45c7693e77489a1fd5d4a73d1d3f2a5cf0;p=exim.git

Testsuite: another go at munging cipher-suite strings
---

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