X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/7172970e1dd8f3d85e7daa3e64331e4a5b8f8c3b..e20c4072da517616060d7a6e899b42f65ded4fb0:/test/runtest

diff --git a/test/runtest b/test/runtest
index b6d419bba..f79cc9466 100755
--- a/test/runtest
+++ b/test/runtest
@@ -615,6 +615,7 @@ RESET_AFTER_EXTRA_LINE_READ:
   #   TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256
   #   TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_128_CBC__SHA256:128
   #   TLS1.2:ECDHE_SECP256R1__ECDSA_SHA512__AES_256_GCM:256
+  #   TLS1.2:ECDHE_RSA_SECP256R1__AES_256_GCM:256 (! 3.5.18 !)
   #   TLS1.2:RSA__CAMELLIA_256_GCM:256	(leave the cipher name)
   #
   #   X=TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256
@@ -627,12 +628,12 @@ RESET_AFTER_EXTRA_LINE_READ:
   #   DHE-RSA-AES256-SHA
   # picking latter as canonical simply because regex easier that way.
   s/\bDHE_RSA_AES_128_CBC_SHA1:128/RSA-AES256-SHA1:256/g;
-  s/TLS1.[0123]:						# TLS version
-	((EC)?DHE(_((?<psk>PSK)_)?(SECP256R1|X25519))?__?)?	# key-exchange
-	((?<auth>RSA|ECDSA)((_PSS_RSAE)?_SHA(512|256))?__?)?	# authentication
-	AES_(256|128)_(CBC|GCM)					# cipher
-	(__?SHA(1|256|384))?:					# PRF
-	(256|128)						# cipher strength
+  s/TLS1.[0123]:								# TLS version
+    ((EC)?DHE(_((?<psk>PSK)_)?((?<auth>RSA|ECDSA)_)?(SECP256R1|X25519))?__?)?	# key-exchange
+    ((?<auth>RSA|ECDSA)((_PSS_RSAE)?_SHA(512|256))?__?)?			# authentication
+    AES_(256|128)_(CBC|GCM)							# cipher
+    (__?SHA(1|256|384))?:							# PRF
+    (256|128)									# cipher strength
     /"TLS1.x:ke-"
 	. (defined($+{psk}) ? $+{psk} : "")
 	. (defined($+{auth}) ? $+{auth} : "")