kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix ssl_test with BORINGSSL_ANDROID_SYSTEM.

Browse Source 
We need to suppress a few tests on the system Android build until
RSA-PSS is shipped there.

Change-Id: I5843997aae9fa499ec08d76f44fdf3b523599e1c
Reviewed-on: https://boringssl-review.googlesource.com/13267
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2017-01-24 22:47:18 -05:00 committed by Adam Langley
parent c0263ab4c8
commit 3b584332ee
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ssl/ssl_test.cc
View File

@ -1917,6 +1917,12 @@ static bool TestClientHello() {
return false; return false;
} }
// kTLS12ClientHello assumes RSA-PSS, which is disabled for Android system
// builds.
#if defined(BORINGSSL_ANDROID_SYSTEM)
return true;
#endif
static const uint8_t kTLS12ClientHello[] = { static const uint8_t kTLS12ClientHello[] = {
0x16, 0x03, 0x01, 0x00, 0x9a, 0x01, 0x00, 0x00, 0x96, 0x03, 0x03, 0x00, 0x16, 0x03, 0x01, 0x00, 0x9a, 0x01, 0x00, 0x00, 0x96, 0x03, 0x03, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@ -3105,8 +3111,14 @@ static bool ForEachVersion(bool (*test_func)(bool is_dtls,
const SSL_METHOD *method, const SSL_METHOD *method,
uint16_t version)) { uint16_t version)) {
static uint16_t kTLSVersions[] = { static uint16_t kTLSVersions[] = {
SSL3_VERSION, TLS1_VERSION, TLS1_1_VERSION, SSL3_VERSION,
TLS1_2_VERSION, TLS1_3_VERSION, TLS1_VERSION,
TLS1_1_VERSION,
TLS1_2_VERSION,
// TLS 1.3 requires RSA-PSS, which is disabled for Android system builds.
#if !defined(BORINGSSL_ANDROID_SYSTEM)
TLS1_3_VERSION,
#endif
}; };
static uint16_t kDTLSVersions[] = { static uint16_t kDTLSVersions[] = {