diff options
| author | Matt Caswell <matt@openssl.org> | 2017-03-14 14:16:19 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-03-14 14:29:31 +0000 |
| commit | 64e2b23ce3b75fc6c73ac8c979894e190c9e78d1 (patch) | |
| tree | 99c385ea2d250bec56fa655d52edcb85b7151cc0 /test/ossl_shim/ossl_config.json | |
| parent | 49619ab008a651e49e7524c73ba6fb4b3c96f67f (diff) | |
Fix 12 Boring tests involving NULL-SHA ciphersuites
The Boring runner attempts to enable the NULL-SHA ciphersuite using the
cipherstring "DEFAULT:NULL-SHA". However in OpenSSL DEFAULT permanently
switches off NULL ciphersuites, so we fix this up to be "ALL:NULL-SHA"
instead. We can't change the runner so we have to change the shim to
detect this.
(Merged from https://github.com/openssl/openssl/pull/2933)
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Diffstat (limited to 'test/ossl_shim/ossl_config.json')
| -rw-r--r-- | test/ossl_shim/ossl_config.json | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/test/ossl_shim/ossl_config.json b/test/ossl_shim/ossl_config.json index e342082603..cdde095347 100644 --- a/test/ossl_shim/ossl_config.json +++ b/test/ossl_shim/ossl_config.json @@ -36,22 +36,10 @@ "KeyUpdate-Server":"Test failure - reason unknown", "SSL3-ECDHE-PSK-AES128-CBC-SHA-server":"Test failure - reason unknown", "SSL3-ECDHE-PSK-AES256-CBC-SHA-server":"Test failure - reason unknown", - "SSL3-NULL-SHA-server":"Test failure - reason unknown", - "SSL3-NULL-SHA-client":"Test failure - reason unknown", - "SSL3-NULL-SHA-LargeRecord":"Test failure - reason unknown", - "SSL3-NULL-SHA-BadRecord":"Test failure - reason unknown", - "TLS1-NULL-SHA-server":"Test failure - reason unknown", - "TLS1-NULL-SHA-LargeRecord":"Test failure - reason unknown", - "TLS1-NULL-SHA-BadRecord":"Test failure - reason unknown", - "TLS11-NULL-SHA-server":"Test failure - reason unknown", - "TLS1-NULL-SHA-client":"Test failure - reason unknown", - "TLS11-NULL-SHA-client":"Test failure - reason unknown", - "TLS11-NULL-SHA-LargeRecord":"Test failure - reason unknown", - "TLS12-NULL-SHA-client":"Test failure - reason unknown", - "TLS12-NULL-SHA-server":"Test failure - reason unknown", - "TLS12-NULL-SHA-LargeRecord":"Test failure - reason unknown", - "TLS11-NULL-SHA-BadRecord":"Test failure - reason unknown", - "TLS12-NULL-SHA-BadRecord":"Test failure - reason unknown", + "DTLS1-NULL-SHA-server":"Test failure - reason unknown", + "DTLS1-NULL-SHA-client":"Test failure - reason unknown", + "DTLS12-NULL-SHA-client":"Test failure - reason unknown", + "DTLS12-NULL-SHA-server":"Test failure - reason unknown", "BadECDSA-1-4":"Test failure - reason unknown", "BadECDSA-3-4":"Test failure - reason unknown", "BadECDSA-4-1":"Test failure - reason unknown", |