summaryrefslogtreecommitdiff
path: root/test/runtest
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2017-11-07 16:09:28 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2017-11-07 16:09:28 +0000
commitba86e143c7aeb0d70ea4c9d73a617a98f06f6baa (patch)
tree13d8b028088d6aec1b1436dcf3ad48addaf516fd /test/runtest
parentea792dac9f89e1a0b396e6c8982ff04afafe91be (diff)
TLS: support multiple certificate files in server. Bug 2092
Diffstat (limited to 'test/runtest')
-rwxr-xr-xtest/runtest4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/runtest b/test/runtest
index 57e2d8a10..46c9871d0 100755
--- a/test/runtest
+++ b/test/runtest
@@ -572,8 +572,8 @@ 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_AES_256_CBC_SHA1:256/g;
- s/TLS1.[012]:((EC)?DHE_)?RSA_AES_(256|128)_(CBC|GCM)_SHA(1|256|384):(256|128)/TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256/g;
- s/\b(ECDHE-RSA-AES256-SHA|DHE-RSA-AES256-SHA256)\b/AES256-SHA/g;
+ s/TLS1.[012]:((EC)?DHE_)?(RSA|ECDSA)_AES_(256|128)_(CBC|GCM)_SHA(1|256|384):(256|128)/TLS1.x:ke_$3_AES_256_CBC_SHAnnn:256/g;
+ s/\b(ECDHE-(RSA|ECDSA)-AES256-SHA|DHE-RSA-AES256-SHA256)\b/ke-$2-AES256-SHAxx/g;
# GnuTLS library error message changes
s/No certificate was found/The peer did not send any certificate/g;