diff options
| author | Matt Caswell <matt@openssl.org> | 2017-12-10 11:05:19 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-12-11 09:41:59 +0000 |
| commit | ef178b4eabe7183c5c85a961f4855c277ee7e220 (patch) | |
| tree | bd3e4cec08efcdbec46885043b9555f751cbc3c5 /test/ssl-tests/25-cipher.conf | |
| parent | 3b69eb302e237e6e6d75df6325b844e9a7fd0e27 (diff) | |
| download | openssl-ef178b4eabe7183c5c85a961f4855c277ee7e220.zip openssl-ef178b4eabe7183c5c85a961f4855c277ee7e220.tar.gz openssl-ef178b4eabe7183c5c85a961f4855c277ee7e220.tar.bz2 | |
Don't expect a POLY1305 ciphersuite when using no-poly1305
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4891)
Diffstat (limited to 'test/ssl-tests/25-cipher.conf')
| -rw-r--r-- | test/ssl-tests/25-cipher.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/ssl-tests/25-cipher.conf b/test/ssl-tests/25-cipher.conf index 101ee7c..a28c1f7 100644 --- a/test/ssl-tests/25-cipher.conf +++ b/test/ssl-tests/25-cipher.conf @@ -207,13 +207,13 @@ Options = ServerPreference,PrioritizeChaCha PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [7-cipher-server-pref-mobile-client] -CipherString = ECDHE-RSA-CHACHA20-POLY1305:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384 +CipherString = ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-CHACHA20-POLY1305 MaxProtocol = TLSv1.2 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-7] -ExpectedCipher = ECDHE-RSA-CHACHA20-POLY1305 +ExpectedCipher = ECDHE-RSA-AES256-SHA384 # =========================================================== @@ -233,12 +233,12 @@ Options = ServerPreference,PrioritizeChaCha PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem [8-cipher-server-pref-mobile2-client] -CipherString = ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-CHACHA20-POLY1305 +CipherString = ECDHE-RSA-CHACHA20-POLY1305:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384 MaxProtocol = TLSv1.2 VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem VerifyMode = Peer [test-8] -ExpectedCipher = ECDHE-RSA-AES256-SHA384 +ExpectedCipher = ECDHE-RSA-CHACHA20-POLY1305 |