Commit 39a80ee
test: adjust tls-set-ciphers for OpenSSL32
Refs: #53382
The test failed as it was using AES128 which is not supported
in OpenSSL32 due to default security level and because
some error messages have changed.
Adjusted to use AES256 where it made sense and not run
tests on OpenSSL32 where test was specific to AES128.
Adjust to use the expected error messages based on version.
Signed-off-by: Michael Dawson <midawson@redhat.com>
PR-URL: #55016
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent b1cad51 commit 39a80ee
1 file changed
Lines changed: 19 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -79,6 +79,11 @@ function test(cciphers, sciphers, cipher, cerr, serr, options) { | |||
| 79 | 79 | ||
| 80 | 80 | const U = undefined; | |
| 81 | 81 | ||
| 82 | + let expectedTLSAlertError = 'ERR_SSL_SSLV3_ALERT_HANDSHAKE_FAILURE'; | ||
| 83 | + if (common.hasOpenSSL(3, 2)) { | ||
| 84 | + expectedTLSAlertError = 'ERR_SSL_SSL/TLS_ALERT_HANDSHAKE_FAILURE'; | ||
| 85 | + } | ||
| 86 | + | ||
| 82 | 87 | // Have shared ciphers. | |
| 83 | 88 | test(U, 'AES256-SHA', 'AES256-SHA'); | |
| 84 | 89 | test('AES256-SHA', U, 'AES256-SHA'); | |
@@ -89,13 +94,13 @@ test('TLS_AES_256_GCM_SHA384:!TLS_CHACHA20_POLY1305_SHA256', U, 'TLS_AES_256_GCM | |||
| 89 | 94 | ||
| 90 | 95 | // Do not have shared ciphers. | |
| 91 | 96 | test('TLS_AES_256_GCM_SHA384', 'TLS_CHACHA20_POLY1305_SHA256', | |
| 92 | - U, 'ERR_SSL_SSLV3_ALERT_HANDSHAKE_FAILURE', 'ERR_SSL_NO_SHARED_CIPHER'); | ||
| 97 | + U, expectedTLSAlertError, 'ERR_SSL_NO_SHARED_CIPHER'); | ||
| 93 | 98 | ||
| 94 | - test('AES128-SHA', 'AES256-SHA', U, 'ERR_SSL_SSLV3_ALERT_HANDSHAKE_FAILURE', | ||
| 99 | + test('AES256-SHA', 'AES256-SHA256', U, expectedTLSAlertError, | ||
| 95 | 100 | 'ERR_SSL_NO_SHARED_CIPHER'); | |
| 96 | - test('AES128-SHA:TLS_AES_256_GCM_SHA384', | ||
| 97 | - 'TLS_CHACHA20_POLY1305_SHA256:AES256-SHA', | ||
| 98 | - U, 'ERR_SSL_SSLV3_ALERT_HANDSHAKE_FAILURE', 'ERR_SSL_NO_SHARED_CIPHER'); | ||
| 101 | + test('AES256-SHA:TLS_AES_256_GCM_SHA384', | ||
| 102 | + 'TLS_CHACHA20_POLY1305_SHA256:AES256-SHA256', | ||
| 103 | + U, expectedTLSAlertError, 'ERR_SSL_NO_SHARED_CIPHER'); | ||
| 99 | 104 | ||
| 100 | 105 | // Cipher order ignored, TLS1.3 chosen before TLS1.2. | |
| 101 | 106 | test('AES256-SHA:TLS_AES_256_GCM_SHA384', U, 'TLS_AES_256_GCM_SHA384'); | |
@@ -110,11 +115,15 @@ test(U, 'AES256-SHA', 'TLS_AES_256_GCM_SHA384', U, U, { maxVersion: 'TLSv1.3' }) | |||
| 110 | 115 | ||
| 111 | 116 | // TLS_AES_128_CCM_8_SHA256 & TLS_AES_128_CCM_SHA256 are not enabled by | |
| 112 | 117 | // default, but work. | |
| 113 | - test('TLS_AES_128_CCM_8_SHA256', U, | ||
| 114 | - U, 'ERR_SSL_SSLV3_ALERT_HANDSHAKE_FAILURE', 'ERR_SSL_NO_SHARED_CIPHER'); | ||
| 115 | - | ||
| 116 | - test('TLS_AES_128_CCM_8_SHA256', 'TLS_AES_128_CCM_8_SHA256', | ||
| 117 | - 'TLS_AES_128_CCM_8_SHA256'); | ||
| 118 | + // However, for OpenSSL32 AES_128 is not enabled due to the | ||
| 119 | + // default security level | ||
| 120 | + if (!common.hasOpenSSL(3, 2)) { | ||
| 121 | + test('TLS_AES_128_CCM_8_SHA256', U, | ||
| 122 | + U, 'ERR_SSL_SSLV3_ALERT_HANDSHAKE_FAILURE', 'ERR_SSL_NO_SHARED_CIPHER'); | ||
| 123 | + | ||
| 124 | + test('TLS_AES_128_CCM_8_SHA256', 'TLS_AES_128_CCM_8_SHA256', | ||
| 125 | + 'TLS_AES_128_CCM_8_SHA256'); | ||
| 126 | + } | ||
| 118 | 127 | ||
| 119 | 128 | // Invalid cipher values | |
| 120 | 129 | test(9, 'AES256-SHA', U, 'ERR_INVALID_ARG_TYPE', U); | |
0 commit comments