kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
0bd71eb85d
boringssl/ssl/ssl_test.cc

1034 lines
37 KiB
C++
Raw Normal View History

Fix magic SSL reason codes. SSL reason codes corresponding to alerts have special values. Teach make_errors.go that values above 1000 are reserved (otherwise it will assign new values in that namespace). Also fix all the existing reason codes which corresponded to alerts. Change-Id: Ieabdf8fd59f4802938616934e1d84e659227cf84 Reviewed-on: https://boringssl-review.googlesource.com/1212 Reviewed-by: Adam Langley <agl@google.com>
2014-07-16 19:37:51 +01:00
/* Copyright (c) 2014, Google Inc.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
#include <stdio.h>
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
#include <string.h>
Never use the internal session cache for a client. The internal session cache is keyed on session ID, so this is completely useless for clients (indeed we never look it up internally). Along the way, tidy up ssl_update_cache to be more readable. The slight behavior change is that SSL_CTX_add_session's return code no longer controls the external callback. It's not clear to me what that could have accomplished. (It can only fail on allocation error. We only call it for new sessions, so the duplicate case is impossible.) The one thing of value the internal cache might have provided is managing the timeout. The SSL_CTX_flush_sessions logic would flip the not_resumable bit and cause us not to offer expired sessions (modulo SSL_CTX_flush_sessions's delay and any discrepancies between the two caches). Instead, just check expiration when deciding whether or not to offer a session. This way clients that set SSL_SESS_CACHE_CLIENT blindly don't accidentally consume gobs of memory. BUG=531194 Change-Id: If97485beab21874f37737edc44df24e61ce23705 Reviewed-on: https://boringssl-review.googlesource.com/6321 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-18 20:18:55 +01:00
#include <time.h>
Fix magic SSL reason codes. SSL reason codes corresponding to alerts have special values. Teach make_errors.go that values above 1000 are reserved (otherwise it will assign new values in that namespace). Also fix all the existing reason codes which corresponded to alerts. Change-Id: Ieabdf8fd59f4802938616934e1d84e659227cf84 Reviewed-on: https://boringssl-review.googlesource.com/1212 Reviewed-by: Adam Langley <agl@google.com>
2014-07-16 19:37:51 +01:00
Add tests for the internal session cache behavior. In doing so, fix the documentation for SSL_CTX_add_session and SSL_CTX_remove_session. I misread the code and documented the behavior on session ID collision wrong. Change-Id: I6f364305e1f092b9eb0b1402962fd04577269d30 Reviewed-on: https://boringssl-review.googlesource.com/6319 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-18 19:28:01 +01:00
#include <algorithm>
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
#include <string>
#include <vector>
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
#include <openssl/base64.h>
#include <openssl/bio.h>
Deprecate SSL_library_init. It just calls CRYPTO_library_init and doesn't do anything else. If anything, I'd like to make CRYPTO_library_init completely go away too. We have CRYPTO_once now, so I think it's safe to assume that, if ssl/ ever grows initialization needs beyond that of crypto/, we can hide it behind a CRYPTO_once and not burden callers. Change-Id: I63dc362e0e9e98deec5516f4620d1672151a91b6 Reviewed-on: https://boringssl-review.googlesource.com/6311 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-18 04:39:22 +01:00
#include <openssl/crypto.h>
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
#include <openssl/err.h>
#include <openssl/ssl.h>
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
#include "test/scoped_types.h"
Make key exchange strength available. This change stores the size of the group/modulus (for RSA/DHE) or curve ID (for ECDHE) in the |SSL_SESSION|. This makes it available for UIs where desired. Change-Id: I354141da432a08f71704c9683f298b361362483d Reviewed-on: https://boringssl-review.googlesource.com/5280 Reviewed-by: Adam Langley <agl@google.com>
2015-06-29 14:07:26 +01:00
#include "../crypto/test/test_util.h"
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
struct ExpectedCipher {
unsigned long id;
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
int in_group_flag;
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
};
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
struct CipherTest {
// The rule string to apply.
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
const char *rule;
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// The list of expected ciphers, in order, terminated with -1.
const ExpectedCipher *expected;
};
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// Selecting individual ciphers should work.
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
static const char kRule1[] =
"ECDHE-ECDSA-CHACHA20-POLY1305:"
"ECDHE-RSA-CHACHA20-POLY1305:"
"ECDHE-ECDSA-AES128-GCM-SHA256:"
"ECDHE-RSA-AES128-GCM-SHA256";
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
static const ExpectedCipher kExpected1[] = {
Refactor ChaCha20-Poly1305 AEAD nonce handling. This change reduces unnecessary copying and makes the pre-RFC-7539 nonces 96 bits just like the AES-GCM, AES-CCM, and RFC 7539 ChaCha20-Poly1305 cipher suites. Also, all the symbols related to the pre-RFC-7539 cipher suites now have "_OLD" appended, in preparation for adding the RFC 7539 variants. Change-Id: I1f85bd825b383c3134df0b6214266069ded029ae Reviewed-on: https://boringssl-review.googlesource.com/6103 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-04 00:53:33 +01:00
{ TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305_OLD, 0 },
{ TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305_OLD, 0 },
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
{ TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, 0 },
{ TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256, 0 },
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
{ 0, 0 },
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
};
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// + reorders selected ciphers to the end, keeping their relative
// order.
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
static const char kRule2[] =
"ECDHE-ECDSA-CHACHA20-POLY1305:"
"ECDHE-RSA-CHACHA20-POLY1305:"
"ECDHE-ECDSA-AES128-GCM-SHA256:"
"ECDHE-RSA-AES128-GCM-SHA256:"
"+aRSA";
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
static const ExpectedCipher kExpected2[] = {
Refactor ChaCha20-Poly1305 AEAD nonce handling. This change reduces unnecessary copying and makes the pre-RFC-7539 nonces 96 bits just like the AES-GCM, AES-CCM, and RFC 7539 ChaCha20-Poly1305 cipher suites. Also, all the symbols related to the pre-RFC-7539 cipher suites now have "_OLD" appended, in preparation for adding the RFC 7539 variants. Change-Id: I1f85bd825b383c3134df0b6214266069ded029ae Reviewed-on: https://boringssl-review.googlesource.com/6103 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-04 00:53:33 +01:00
{ TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305_OLD, 0 },
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
{ TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, 0 },
Refactor ChaCha20-Poly1305 AEAD nonce handling. This change reduces unnecessary copying and makes the pre-RFC-7539 nonces 96 bits just like the AES-GCM, AES-CCM, and RFC 7539 ChaCha20-Poly1305 cipher suites. Also, all the symbols related to the pre-RFC-7539 cipher suites now have "_OLD" appended, in preparation for adding the RFC 7539 variants. Change-Id: I1f85bd825b383c3134df0b6214266069ded029ae Reviewed-on: https://boringssl-review.googlesource.com/6103 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-04 00:53:33 +01:00
{ TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305_OLD, 0 },
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
{ TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256, 0 },
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
{ 0, 0 },
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
};
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// ! banishes ciphers from future selections.
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
static const char kRule3[] =
"!aRSA:"
"ECDHE-ECDSA-CHACHA20-POLY1305:"
"ECDHE-RSA-CHACHA20-POLY1305:"
"ECDHE-ECDSA-AES128-GCM-SHA256:"
"ECDHE-RSA-AES128-GCM-SHA256";
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
static const ExpectedCipher kExpected3[] = {
Refactor ChaCha20-Poly1305 AEAD nonce handling. This change reduces unnecessary copying and makes the pre-RFC-7539 nonces 96 bits just like the AES-GCM, AES-CCM, and RFC 7539 ChaCha20-Poly1305 cipher suites. Also, all the symbols related to the pre-RFC-7539 cipher suites now have "_OLD" appended, in preparation for adding the RFC 7539 variants. Change-Id: I1f85bd825b383c3134df0b6214266069ded029ae Reviewed-on: https://boringssl-review.googlesource.com/6103 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-04 00:53:33 +01:00
{ TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305_OLD, 0 },
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
{ TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, 0 },
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
{ 0, 0 },
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
};
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// Multiple masks can be ANDed in a single rule.
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
static const char kRule4[] = "kRSA+AESGCM+AES128";
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
static const ExpectedCipher kExpected4[] = {
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
{ TLS1_CK_RSA_WITH_AES_128_GCM_SHA256, 0 },
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
{ 0, 0 },
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
};
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// - removes selected ciphers, but preserves their order for future
// selections. Select AES_128_GCM, but order the key exchanges RSA,
// DHE_RSA, ECDHE_RSA.
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
static const char kRule5[] =
Rename EECDH and EDH to ECDHE and DHE. Align with upstream's renames from a while ago. These names are considerably more standard. This also aligns with upstream in that both "ECDHE" and "EECDH" are now accepted in the various cipher string parsing bits. Change-Id: I84c3daeacf806f79f12bc661c314941828656b04 Reviewed-on: https://boringssl-review.googlesource.com/4053 Reviewed-by: Adam Langley <agl@google.com>
2015-03-19 15:10:48 +00:00
"ALL:-kECDHE:-kDHE:-kRSA:-ALL:"
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
"AESGCM+AES128+aRSA";
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
static const ExpectedCipher kExpected5[] = {
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
{ TLS1_CK_RSA_WITH_AES_128_GCM_SHA256, 0 },
{ TLS1_CK_DHE_RSA_WITH_AES_128_GCM_SHA256, 0 },
{ TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256, 0 },
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
{ 0, 0 },
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
};
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// Unknown selectors are no-ops.
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
static const char kRule6[] =
"ECDHE-ECDSA-CHACHA20-POLY1305:"
"ECDHE-RSA-CHACHA20-POLY1305:"
"ECDHE-ECDSA-AES128-GCM-SHA256:"
"ECDHE-RSA-AES128-GCM-SHA256:"
"BOGUS1:-BOGUS2:+BOGUS3:!BOGUS4";
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
static const ExpectedCipher kExpected6[] = {
Refactor ChaCha20-Poly1305 AEAD nonce handling. This change reduces unnecessary copying and makes the pre-RFC-7539 nonces 96 bits just like the AES-GCM, AES-CCM, and RFC 7539 ChaCha20-Poly1305 cipher suites. Also, all the symbols related to the pre-RFC-7539 cipher suites now have "_OLD" appended, in preparation for adding the RFC 7539 variants. Change-Id: I1f85bd825b383c3134df0b6214266069ded029ae Reviewed-on: https://boringssl-review.googlesource.com/6103 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-04 00:53:33 +01:00
{ TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305_OLD, 0 },
{ TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305_OLD, 0 },
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
{ TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, 0 },
{ TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256, 0 },
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
{ 0, 0 },
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
};
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// Square brackets specify equi-preference groups.
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
static const char kRule7[] =
"[ECDHE-ECDSA-CHACHA20-POLY1305|ECDHE-ECDSA-AES128-GCM-SHA256]:"
"[ECDHE-RSA-CHACHA20-POLY1305]:"
"ECDHE-RSA-AES128-GCM-SHA256";
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
static const ExpectedCipher kExpected7[] = {
Refactor ChaCha20-Poly1305 AEAD nonce handling. This change reduces unnecessary copying and makes the pre-RFC-7539 nonces 96 bits just like the AES-GCM, AES-CCM, and RFC 7539 ChaCha20-Poly1305 cipher suites. Also, all the symbols related to the pre-RFC-7539 cipher suites now have "_OLD" appended, in preparation for adding the RFC 7539 variants. Change-Id: I1f85bd825b383c3134df0b6214266069ded029ae Reviewed-on: https://boringssl-review.googlesource.com/6103 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-04 00:53:33 +01:00
{ TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305_OLD, 1 },
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
{ TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, 0 },
Refactor ChaCha20-Poly1305 AEAD nonce handling. This change reduces unnecessary copying and makes the pre-RFC-7539 nonces 96 bits just like the AES-GCM, AES-CCM, and RFC 7539 ChaCha20-Poly1305 cipher suites. Also, all the symbols related to the pre-RFC-7539 cipher suites now have "_OLD" appended, in preparation for adding the RFC 7539 variants. Change-Id: I1f85bd825b383c3134df0b6214266069ded029ae Reviewed-on: https://boringssl-review.googlesource.com/6103 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-04 00:53:33 +01:00
{ TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305_OLD, 0 },
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
{ TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256, 0 },
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
{ 0, 0 },
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
};
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// @STRENGTH performs a stable strength-sort of the selected
// ciphers and only the selected ciphers.
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
static const char kRule8[] =
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// To simplify things, banish all but {ECDHE_RSA,RSA} x
// {CHACHA20,AES_256_CBC,AES_128_CBC,RC4} x SHA1.
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
"!kEDH:!AESGCM:!3DES:!SHA256:!MD5:!SHA384:"
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// Order some ciphers backwards by strength.
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
"ALL:-CHACHA20:-AES256:-AES128:-RC4:-ALL:"
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// Select ECDHE ones and sort them by strength. Ties should resolve
// based on the order above.
Rename EECDH and EDH to ECDHE and DHE. Align with upstream's renames from a while ago. These names are considerably more standard. This also aligns with upstream in that both "ECDHE" and "EECDH" are now accepted in the various cipher string parsing bits. Change-Id: I84c3daeacf806f79f12bc661c314941828656b04 Reviewed-on: https://boringssl-review.googlesource.com/4053 Reviewed-by: Adam Langley <agl@google.com>
2015-03-19 15:10:48 +00:00
"kECDHE:@STRENGTH:-ALL:"
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// Now bring back everything uses RSA. ECDHE_RSA should be first,
// sorted by strength. Then RSA, backwards by strength.
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
"aRSA";
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
static const ExpectedCipher kExpected8[] = {
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
{ TLS1_CK_ECDHE_RSA_WITH_AES_256_CBC_SHA, 0 },
Refactor ChaCha20-Poly1305 AEAD nonce handling. This change reduces unnecessary copying and makes the pre-RFC-7539 nonces 96 bits just like the AES-GCM, AES-CCM, and RFC 7539 ChaCha20-Poly1305 cipher suites. Also, all the symbols related to the pre-RFC-7539 cipher suites now have "_OLD" appended, in preparation for adding the RFC 7539 variants. Change-Id: I1f85bd825b383c3134df0b6214266069ded029ae Reviewed-on: https://boringssl-review.googlesource.com/6103 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-04 00:53:33 +01:00
{ TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305_OLD, 0 },
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
{ TLS1_CK_ECDHE_RSA_WITH_RC4_128_SHA, 0 },
{ TLS1_CK_ECDHE_RSA_WITH_AES_128_CBC_SHA, 0 },
{ SSL3_CK_RSA_RC4_128_SHA, 0 },
{ TLS1_CK_RSA_WITH_AES_128_SHA, 0 },
{ TLS1_CK_RSA_WITH_AES_256_SHA, 0 },
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
{ 0, 0 },
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
};
Tidy cipher rule processing. Rather than shoehorn real ciphers and cipher aliases into the same type (that's what cipher->valid is used for), treat them separately. Make ssl_cipher_apply_rule match ciphers by cipher_id (the parameter was ignored and we assumed that masks uniquely identify a cipher) and remove the special cases around zero for all the masks. This requires us to remember which fields default to 0 and which default to ~0u, but the logic is much clearer. Finally, now that ciphers and cipher aliases are different, don't process rules which sum together an actual cipher with cipher aliases. This would AND together the masks for the alias with the values in the cipher and do something weird around alg_ssl. (alg_ssl is just weird in general, as everyone trying to disable SSLv3 in OpenSSL recently discovered.) With all that, we can finally remove cipher->valid which was always one. Change-Id: Iefcfe159bd6c22dbaea3a5f1517bd82f756dcfe1 Reviewed-on: https://boringssl-review.googlesource.com/4284 Reviewed-by: Adam Langley <agl@google.com>
2015-04-08 07:08:01 +01:00
// Exact ciphers may not be used in multi-part rules; they are treated
// as unknown aliases.
static const char kRule9[] =
"ECDHE-ECDSA-CHACHA20-POLY1305:"
"ECDHE-RSA-CHACHA20-POLY1305:"
"!ECDHE-RSA-CHACHA20-POLY1305+RSA:"
"!ECDSA+ECDHE-ECDSA-CHACHA20-POLY1305";
static const ExpectedCipher kExpected9[] = {
Refactor ChaCha20-Poly1305 AEAD nonce handling. This change reduces unnecessary copying and makes the pre-RFC-7539 nonces 96 bits just like the AES-GCM, AES-CCM, and RFC 7539 ChaCha20-Poly1305 cipher suites. Also, all the symbols related to the pre-RFC-7539 cipher suites now have "_OLD" appended, in preparation for adding the RFC 7539 variants. Change-Id: I1f85bd825b383c3134df0b6214266069ded029ae Reviewed-on: https://boringssl-review.googlesource.com/6103 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-04 00:53:33 +01:00
{ TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305_OLD, 0 },
{ TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305_OLD, 0 },
Tidy cipher rule processing. Rather than shoehorn real ciphers and cipher aliases into the same type (that's what cipher->valid is used for), treat them separately. Make ssl_cipher_apply_rule match ciphers by cipher_id (the parameter was ignored and we assumed that masks uniquely identify a cipher) and remove the special cases around zero for all the masks. This requires us to remember which fields default to 0 and which default to ~0u, but the logic is much clearer. Finally, now that ciphers and cipher aliases are different, don't process rules which sum together an actual cipher with cipher aliases. This would AND together the masks for the alias with the values in the cipher and do something weird around alg_ssl. (alg_ssl is just weird in general, as everyone trying to disable SSLv3 in OpenSSL recently discovered.) With all that, we can finally remove cipher->valid which was always one. Change-Id: Iefcfe159bd6c22dbaea3a5f1517bd82f756dcfe1 Reviewed-on: https://boringssl-review.googlesource.com/4284 Reviewed-by: Adam Langley <agl@google.com>
2015-04-08 07:08:01 +01:00
{ 0, 0 },
};
Remove algorithm_ssl. It's redundant with other cipher properties. We can express these in code. Cipher rule matching gets a little bit complicated due to the confusing legacy protocol version cipher rules, so add some tests for it. (It's really hard to grep for uses of them, so I've kept them working to be safe.) Change-Id: Ic6b3fcd55d76d4a51b31bf7ae629a2da50a7450e Reviewed-on: https://boringssl-review.googlesource.com/6453 Reviewed-by: Adam Langley <agl@google.com>
2015-11-06 20:35:54 +00:00
// SSLv3 matches everything that existed before TLS 1.2.
static const char kRule10[] = "AES128-SHA:AES128-SHA256:!SSLv3";
static const ExpectedCipher kExpected10[] = {
{ TLS1_CK_RSA_WITH_AES_128_SHA256, 0 },
{ 0, 0 },
};
// TLSv1.2 matches everything added in TLS 1.2.
static const char kRule11[] = "AES128-SHA:AES128-SHA256:!TLSv1.2";
static const ExpectedCipher kExpected11[] = {
{ TLS1_CK_RSA_WITH_AES_128_SHA, 0 },
{ 0, 0 },
};
// The two directives have no intersection.
static const char kRule12[] = "AES128-SHA:AES128-SHA256:!TLSv1.2+SSLv3";
static const ExpectedCipher kExpected12[] = {
{ TLS1_CK_RSA_WITH_AES_128_SHA, 0 },
{ TLS1_CK_RSA_WITH_AES_128_SHA256, 0 },
{ 0, 0 },
};
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
static CipherTest kCipherTests[] = {
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
{ kRule1, kExpected1 },
{ kRule2, kExpected2 },
{ kRule3, kExpected3 },
{ kRule4, kExpected4 },
{ kRule5, kExpected5 },
{ kRule6, kExpected6 },
{ kRule7, kExpected7 },
{ kRule8, kExpected8 },
Tidy cipher rule processing. Rather than shoehorn real ciphers and cipher aliases into the same type (that's what cipher->valid is used for), treat them separately. Make ssl_cipher_apply_rule match ciphers by cipher_id (the parameter was ignored and we assumed that masks uniquely identify a cipher) and remove the special cases around zero for all the masks. This requires us to remember which fields default to 0 and which default to ~0u, but the logic is much clearer. Finally, now that ciphers and cipher aliases are different, don't process rules which sum together an actual cipher with cipher aliases. This would AND together the masks for the alias with the values in the cipher and do something weird around alg_ssl. (alg_ssl is just weird in general, as everyone trying to disable SSLv3 in OpenSSL recently discovered.) With all that, we can finally remove cipher->valid which was always one. Change-Id: Iefcfe159bd6c22dbaea3a5f1517bd82f756dcfe1 Reviewed-on: https://boringssl-review.googlesource.com/4284 Reviewed-by: Adam Langley <agl@google.com>
2015-04-08 07:08:01 +01:00
{ kRule9, kExpected9 },
Remove algorithm_ssl. It's redundant with other cipher properties. We can express these in code. Cipher rule matching gets a little bit complicated due to the confusing legacy protocol version cipher rules, so add some tests for it. (It's really hard to grep for uses of them, so I've kept them working to be safe.) Change-Id: Ic6b3fcd55d76d4a51b31bf7ae629a2da50a7450e Reviewed-on: https://boringssl-review.googlesource.com/6453 Reviewed-by: Adam Langley <agl@google.com>
2015-11-06 20:35:54 +00:00
{ kRule10, kExpected10 },
{ kRule11, kExpected11 },
{ kRule12, kExpected12 },
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
{ NULL, NULL },
};
static const char *kBadRules[] = {
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// Invalid brackets.
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
"[ECDHE-RSA-CHACHA20-POLY1305|ECDHE-RSA-AES128-GCM-SHA256",
"RSA]",
"[[RSA]]",
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// Operators inside brackets.
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
"[+RSA]",
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// Unknown directive.
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
"@BOGUS",
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// Empty cipher lists error at SSL_CTX_set_cipher_list.
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
"",
"BOGUS",
Remove anonymous cipher suites. These are the remaining untested cipher suites. Rather than add support in runner.go, just remove them altogether. Grepping for this is a little tricky, but nothing enables aNULL (all occurrences disable it), and all occurrences of ["ALL:] seem to be either unused or explicitly disable anonymous ciphers. Change-Id: I4fd4b8dc6a273d6c04a26e93839641ddf738343f Reviewed-on: https://boringssl-review.googlesource.com/4258 Reviewed-by: Adam Langley <agl@google.com>
2015-04-07 06:14:06 +01:00
// COMPLEMENTOFDEFAULT is empty.
"COMPLEMENTOFDEFAULT",
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// Invalid command.
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
"?BAR",
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// Special operators are not allowed if groups are used.
Disallow all special operators once groups are used. + and - should also be forbidden. Any operation other than appending will mix up the in_group bits and give unexpected behavior. Change-Id: Ieaebb9ee6393aa36243d0765e45cae667f977ef5 Reviewed-on: https://boringssl-review.googlesource.com/1803 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 22:54:24 +01:00
"[ECDHE-RSA-CHACHA20-POLY1305|ECDHE-RSA-AES128-GCM-SHA256]:+FOO",
"[ECDHE-RSA-CHACHA20-POLY1305|ECDHE-RSA-AES128-GCM-SHA256]:!FOO",
"[ECDHE-RSA-CHACHA20-POLY1305|ECDHE-RSA-AES128-GCM-SHA256]:-FOO",
"[ECDHE-RSA-CHACHA20-POLY1305|ECDHE-RSA-AES128-GCM-SHA256]:@STRENGTH",
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
NULL,
};
Restore the NULL-SHA ciphersuite. (Alas.) Change-Id: Ia5398f3b86a13fb20dba053f730b51a0e57b9aa4 Reviewed-on: https://boringssl-review.googlesource.com/5791 Reviewed-by: Adam Langley <agl@google.com>
2015-09-03 03:48:16 +01:00
static const char *kMustNotIncludeNull[] = {
"ALL",
"DEFAULT",
"ALL:!eNULL",
"ALL:!NULL",
Remove algo_strength. FIPS is the same as HIGH (but for CHACHA20), so those are redundant. Likewise, MEDIUM vs HIGH was just RC4. Remove those in favor of redefining those legacy rules to mean this. One less field to keep track of in each cipher. Change-Id: I2b2489cffb9e16efb0ac7d7290c173cac061432a Reviewed-on: https://boringssl-review.googlesource.com/6515 Reviewed-by: Adam Langley <agl@google.com>
2015-11-18 14:48:55 +00:00
"MEDIUM",
"HIGH",
Restore the NULL-SHA ciphersuite. (Alas.) Change-Id: Ia5398f3b86a13fb20dba053f730b51a0e57b9aa4 Reviewed-on: https://boringssl-review.googlesource.com/5791 Reviewed-by: Adam Langley <agl@google.com>
2015-09-03 03:48:16 +01:00
"FIPS",
"SHA",
"SHA1",
"RSA",
"SSLv3",
"TLSv1",
"TLSv1.2",
NULL
};
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
static void PrintCipherPreferenceList(ssl_cipher_preference_list_st *list) {
bool in_group = false;
for (size_t i = 0; i < sk_SSL_CIPHER_num(list->ciphers); i++) {
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
const SSL_CIPHER *cipher = sk_SSL_CIPHER_value(list->ciphers, i);
if (!in_group && list->in_group_flags[i]) {
fprintf(stderr, "\t[\n");
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
in_group = true;
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
}
fprintf(stderr, "\t");
if (in_group) {
fprintf(stderr, " ");
}
fprintf(stderr, "%s\n", SSL_CIPHER_get_name(cipher));
if (in_group && !list->in_group_flags[i]) {
fprintf(stderr, "\t]\n");
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
in_group = false;
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
}
}
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
static bool TestCipherRule(CipherTest *t) {
ScopedSSL_CTX ctx(SSL_CTX_new(TLS_method()));
if (!ctx) {
return false;
Add SSL_CIPHER_get_rfc_name. OpenSSL's internal names for the ciphers are not the standard ones and are not easy to consistently map to the standard ones. Add an API to get the real names out. (WebRTC wants an API to get the standard names out.) Also change some incorrect flags on SHA-256 TLS 1.2 ciphers; SSL_HANDSHAKE_MAC_DEFAULT and SSL_HANDSHAKE_MAC_SHA256 are the same after TLS 1.2. A TLS 1.2 cipher should be tagged explicitly with SHA-256. (This avoids tripping a check in SSL_CIPHER_get_rfc_name which asserts that default-hash ciphers only ever use SHA-1 or MD5 for the bulk cipher MAC.) Change-Id: Iaec2fd4aa97df29883094d3c2ae60f0ba003bf07
2015-02-05 21:49:47 +00:00
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
if (!SSL_CTX_set_cipher_list(ctx.get(), t->rule)) {
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
fprintf(stderr, "Error testing cipher rule '%s'\n", t->rule);
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
return false;
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// Compare the two lists.
size_t i;
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
for (i = 0; i < sk_SSL_CIPHER_num(ctx->cipher_list->ciphers); i++) {
const SSL_CIPHER *cipher =
sk_SSL_CIPHER_value(ctx->cipher_list->ciphers, i);
if (t->expected[i].id != SSL_CIPHER_get_id(cipher) ||
t->expected[i].in_group_flag != ctx->cipher_list->in_group_flags[i]) {
Tidy cipher rule processing. Rather than shoehorn real ciphers and cipher aliases into the same type (that's what cipher->valid is used for), treat them separately. Make ssl_cipher_apply_rule match ciphers by cipher_id (the parameter was ignored and we assumed that masks uniquely identify a cipher) and remove the special cases around zero for all the masks. This requires us to remember which fields default to 0 and which default to ~0u, but the logic is much clearer. Finally, now that ciphers and cipher aliases are different, don't process rules which sum together an actual cipher with cipher aliases. This would AND together the masks for the alias with the values in the cipher and do something weird around alg_ssl. (alg_ssl is just weird in general, as everyone trying to disable SSLv3 in OpenSSL recently discovered.) With all that, we can finally remove cipher->valid which was always one. Change-Id: Iefcfe159bd6c22dbaea3a5f1517bd82f756dcfe1 Reviewed-on: https://boringssl-review.googlesource.com/4284 Reviewed-by: Adam Langley <agl@google.com>
2015-04-08 07:08:01 +01:00
fprintf(stderr, "Error: cipher rule '%s' evaluated to:\n", t->rule);
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
PrintCipherPreferenceList(ctx->cipher_list);
return false;
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
}
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
if (t->expected[i].id != 0) {
Tidy cipher rule processing. Rather than shoehorn real ciphers and cipher aliases into the same type (that's what cipher->valid is used for), treat them separately. Make ssl_cipher_apply_rule match ciphers by cipher_id (the parameter was ignored and we assumed that masks uniquely identify a cipher) and remove the special cases around zero for all the masks. This requires us to remember which fields default to 0 and which default to ~0u, but the logic is much clearer. Finally, now that ciphers and cipher aliases are different, don't process rules which sum together an actual cipher with cipher aliases. This would AND together the masks for the alias with the values in the cipher and do something weird around alg_ssl. (alg_ssl is just weird in general, as everyone trying to disable SSLv3 in OpenSSL recently discovered.) With all that, we can finally remove cipher->valid which was always one. Change-Id: Iefcfe159bd6c22dbaea3a5f1517bd82f756dcfe1 Reviewed-on: https://boringssl-review.googlesource.com/4284 Reviewed-by: Adam Langley <agl@google.com>
2015-04-08 07:08:01 +01:00
fprintf(stderr, "Error: cipher rule '%s' evaluated to:\n", t->rule);
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
PrintCipherPreferenceList(ctx->cipher_list);
return false;
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
return true;
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
}
Restore the NULL-SHA ciphersuite. (Alas.) Change-Id: Ia5398f3b86a13fb20dba053f730b51a0e57b9aa4 Reviewed-on: https://boringssl-review.googlesource.com/5791 Reviewed-by: Adam Langley <agl@google.com>
2015-09-03 03:48:16 +01:00
static bool TestRuleDoesNotIncludeNull(const char *rule) {
ScopedSSL_CTX ctx(SSL_CTX_new(SSLv23_server_method()));
if (!ctx) {
return false;
}
if (!SSL_CTX_set_cipher_list(ctx.get(), rule)) {
fprintf(stderr, "Error: cipher rule '%s' failed\n", rule);
return false;
}
for (size_t i = 0; i < sk_SSL_CIPHER_num(ctx->cipher_list->ciphers); i++) {
if (SSL_CIPHER_is_NULL(sk_SSL_CIPHER_value(ctx->cipher_list->ciphers, i))) {
fprintf(stderr, "Error: cipher rule '%s' includes NULL\n",rule);
return false;
}
}
return true;
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
static bool TestCipherRules() {
for (size_t i = 0; kCipherTests[i].rule != NULL; i++) {
if (!TestCipherRule(&kCipherTests[i])) {
return false;
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
}
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
for (size_t i = 0; kBadRules[i] != NULL; i++) {
ScopedSSL_CTX ctx(SSL_CTX_new(SSLv23_server_method()));
if (!ctx) {
return false;
Add SSL_CIPHER_get_rfc_name. OpenSSL's internal names for the ciphers are not the standard ones and are not easy to consistently map to the standard ones. Add an API to get the real names out. (WebRTC wants an API to get the standard names out.) Also change some incorrect flags on SHA-256 TLS 1.2 ciphers; SSL_HANDSHAKE_MAC_DEFAULT and SSL_HANDSHAKE_MAC_SHA256 are the same after TLS 1.2. A TLS 1.2 cipher should be tagged explicitly with SHA-256. (This avoids tripping a check in SSL_CIPHER_get_rfc_name which asserts that default-hash ciphers only ever use SHA-1 or MD5 for the bulk cipher MAC.) Change-Id: Iaec2fd4aa97df29883094d3c2ae60f0ba003bf07
2015-02-05 21:49:47 +00:00
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
if (SSL_CTX_set_cipher_list(ctx.get(), kBadRules[i])) {
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
fprintf(stderr, "Cipher rule '%s' unexpectedly succeeded\n", kBadRules[i]);
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
return false;
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
}
ERR_clear_error();
}
Restore the NULL-SHA ciphersuite. (Alas.) Change-Id: Ia5398f3b86a13fb20dba053f730b51a0e57b9aa4 Reviewed-on: https://boringssl-review.googlesource.com/5791 Reviewed-by: Adam Langley <agl@google.com>
2015-09-03 03:48:16 +01:00
for (size_t i = 0; kMustNotIncludeNull[i] != NULL; i++) {
if (!TestRuleDoesNotIncludeNull(kMustNotIncludeNull[i])) {
return false;
}
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
return true;
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
}
Fix magic SSL reason codes. SSL reason codes corresponding to alerts have special values. Teach make_errors.go that values above 1000 are reserved (otherwise it will assign new values in that namespace). Also fix all the existing reason codes which corresponded to alerts. Change-Id: Ieabdf8fd59f4802938616934e1d84e659227cf84 Reviewed-on: https://boringssl-review.googlesource.com/1212 Reviewed-by: Adam Langley <agl@google.com>
2014-07-16 19:37:51 +01:00
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// kOpenSSLSession is a serialized SSL_SESSION generated from openssl
// s_client -sess_out.
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
static const char kOpenSSLSession[] =
Remove psk_identity_hint from SSL_SESSION. There's not much point in retaining the identity hint in the SSL_SESSION. This avoids the complexity around setting psk_identity hint on either the SSL or the SSL_SESSION. Introduce a peer_psk_identity_hint for the client to store the one received from the server. This changes the semantics of SSL_get_psk_identity_hint; it now only returns the value configured for the server. The client learns the hint through the callback. This is compatible with the one use of this API in conscrypt (it pulls the hint back out to pass to a callback). Change-Id: I6d9131636b47f13ac5800b4451436a057021054a Reviewed-on: https://boringssl-review.googlesource.com/2213 Reviewed-by: Adam Langley <agl@google.com>
2014-11-03 04:06:42 +00:00
"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"
"i4gv7Y5oliyn";
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// kCustomSession is a custom serialized SSL_SESSION generated by
// filling in missing fields from |kOpenSSLSession|. This includes
// providing |peer_sha256|, so |peer| is not serialized.
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
static const char kCustomSession[] =
Remove psk_identity_hint from SSL_SESSION. There's not much point in retaining the identity hint in the SSL_SESSION. This avoids the complexity around setting psk_identity hint on either the SSL or the SSL_SESSION. Introduce a peer_psk_identity_hint for the client to store the one received from the server. This changes the semantics of SSL_get_psk_identity_hint; it now only returns the value configured for the server. The client learns the hint through the callback. This is compatible with the one use of this API in conscrypt (it pulls the hint back out to pass to a callback). Change-Id: I6d9131636b47f13ac5800b4451436a057021054a Reviewed-on: https://boringssl-review.googlesource.com/2213 Reviewed-by: Adam Langley <agl@google.com>
2014-11-03 04:06:42 +00:00
"MIIBdgIBAQICAwMEAsAvBCAG5Q1ndq4Yfmbeo1zwLkNRKmCXGdNgWvGT3cskV0yQ"
"kAQwJlrlzkAWBOWiLj/jJ76D7l+UXoizP2KI2C7I2FccqMmIfFmmkUy32nIJ0mZH"
"IWoJoQYCBFRDO46iBAICASykAwQBAqUDAgEUphAEDnd3dy5nb29nbGUuY29tqAcE"
"BXdvcmxkqQUCAwGJwKqBpwSBpBwUQvoeOk0Kg36SYTcLEkXqKwOBfF9vE4KX0Nxe"
"LwjcDTpsuh3qXEaZ992r1N38VDcyS6P7I6HBYN9BsNHM362zZnY27GpTw+Kwd751"
"CLoXFPoaMOe57dbBpXoro6Pd3BTbf/Tzr88K06yEOTDKPNj3+inbMaVigtK4PLyP"
"q+Topyzvx9USFgRvyuoxn0Hgb+R0A3j6SLRuyOdAi4gv7Y5oliynrSIEIAYGBgYG"
"BgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGrgMEAQevAwQBBLADBAEF";
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
Remove the last of SESS_CERT. Move cert_chain to the SSL_SESSION. Now everything on an SSL_SESSION is properly serialized. The cert_chain field is, unfortunately, messed up since it means different things between client and server. There exists code which calls SSL_get_peer_cert_chain as both client and server and assumes the existing semantics for each. Since that function doesn't return a newly-allocated STACK_OF(X509), normalizing between the two formats is a nuisance (we'd either need to store both cert_chain and cert_chain_full on the SSL_SESSION or create one of the two variants on-demand and stash it into the SSL). This CL does not resolve this and retains the client/server difference in SSL_SESSION. The SSL_SESSION serialization is a little inefficient (two copies of the leaf certificate) for a client, but clients don't typically serialize sessions. Should we wish to resolve it in the future, we can use a different tag number. Because this was historically unserialized, existing code must already allow for cert_chain not being preserved across i2d/d2i. In keeping with the semantics of retain_only_sha256_of_client_certs, cert_chain is not retained when that flag is set. Change-Id: Ieb72fc62c3076dd59750219e550902f1ad039651 Reviewed-on: https://boringssl-review.googlesource.com/5759 Reviewed-by: Adam Langley <agl@google.com>
2015-08-22 21:04:17 +01:00
// kBoringSSLSession is a serialized SSL_SESSION generated from bssl client.
static const char kBoringSSLSession[] =
"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";
Reject unknown fields in d2i_SSL_SESSION. The original OpenSSL implementation did the same. M_ASN1_D2I_Finish checks this. Forwards compatibility with future sessions with unknown fields is probably not desirable. Change-Id: I116a8c482cbcc47c3fcc31515c4a3718f66cf268 Reviewed-on: https://boringssl-review.googlesource.com/4941 Reviewed-by: Adam Langley <agl@google.com>
2015-05-29 00:55:29 +01:00
// kBadSessionExtraField is a custom serialized SSL_SESSION generated by replacing
// the final (optional) element of |kCustomSession| with tag number 30.
static const char kBadSessionExtraField[] =
"MIIBdgIBAQICAwMEAsAvBCAG5Q1ndq4Yfmbeo1zwLkNRKmCXGdNgWvGT3cskV0yQ"
"kAQwJlrlzkAWBOWiLj/jJ76D7l+UXoizP2KI2C7I2FccqMmIfFmmkUy32nIJ0mZH"
"IWoJoQYCBFRDO46iBAICASykAwQBAqUDAgEUphAEDnd3dy5nb29nbGUuY29tqAcE"
"BXdvcmxkqQUCAwGJwKqBpwSBpBwUQvoeOk0Kg36SYTcLEkXqKwOBfF9vE4KX0Nxe"
"LwjcDTpsuh3qXEaZ992r1N38VDcyS6P7I6HBYN9BsNHM362zZnY27GpTw+Kwd751"
"CLoXFPoaMOe57dbBpXoro6Pd3BTbf/Tzr88K06yEOTDKPNj3+inbMaVigtK4PLyP"
"q+Topyzvx9USFgRvyuoxn0Hgb+R0A3j6SLRuyOdAi4gv7Y5oliynrSIEIAYGBgYG"
"BgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGrgMEAQevAwQBBL4DBAEF";
Reject sessions with the wrong structure version. The old upstream logic actually didn't do this, but 1.1.0's new code does. Given that the version has never changed and even unknown fields were rejected by the old code, this seems a safe and prudent thing to do. Change-Id: I09071585e5183993b358c10ad36fc206f8bceeda Reviewed-on: https://boringssl-review.googlesource.com/4942 Reviewed-by: Adam Langley <agl@google.com>
2015-05-29 01:00:08 +01:00
// kBadSessionVersion is a custom serialized SSL_SESSION generated by replacing
// the version of |kCustomSession| with 2.
static const char kBadSessionVersion[] =
"MIIBdgIBAgICAwMEAsAvBCAG5Q1ndq4Yfmbeo1zwLkNRKmCXGdNgWvGT3cskV0yQ"
"kAQwJlrlzkAWBOWiLj/jJ76D7l+UXoizP2KI2C7I2FccqMmIfFmmkUy32nIJ0mZH"
"IWoJoQYCBFRDO46iBAICASykAwQBAqUDAgEUphAEDnd3dy5nb29nbGUuY29tqAcE"
"BXdvcmxkqQUCAwGJwKqBpwSBpBwUQvoeOk0Kg36SYTcLEkXqKwOBfF9vE4KX0Nxe"
"LwjcDTpsuh3qXEaZ992r1N38VDcyS6P7I6HBYN9BsNHM362zZnY27GpTw+Kwd751"
"CLoXFPoaMOe57dbBpXoro6Pd3BTbf/Tzr88K06yEOTDKPNj3+inbMaVigtK4PLyP"
"q+Topyzvx9USFgRvyuoxn0Hgb+R0A3j6SLRuyOdAi4gv7Y5oliynrSIEIAYGBgYG"
"BgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGrgMEAQevAwQBBLADBAEF";
Add SSL_SESSION_from_bytes. Mirrors SSL_SESSION_to_bytes. It avoids having to deal with object-reuse, the non-size_t length parameter, and trailing data. Both it and the object-reuse variant back onto an unexposed SSL_SESSION_parse which reads a CBS. Note that this changes the object reuse story slightly. It's now merely an optional output pointer that frees its old contents. No d2i_SSL_SESSION consumer in Google that's built does reuse, much less reuse with the assumption that the top-level object won't be overridden. Change-Id: I5cb8522f96909bb222cab0f342423f2dd7814282 Reviewed-on: https://boringssl-review.googlesource.com/5121 Reviewed-by: Adam Langley <agl@google.com>
2015-06-16 00:41:48 +01:00
// kBadSessionTrailingData is a custom serialized SSL_SESSION with trailing data
// appended.
static const char kBadSessionTrailingData[] =
"MIIBdgIBAQICAwMEAsAvBCAG5Q1ndq4Yfmbeo1zwLkNRKmCXGdNgWvGT3cskV0yQ"
"kAQwJlrlzkAWBOWiLj/jJ76D7l+UXoizP2KI2C7I2FccqMmIfFmmkUy32nIJ0mZH"
"IWoJoQYCBFRDO46iBAICASykAwQBAqUDAgEUphAEDnd3dy5nb29nbGUuY29tqAcE"
"BXdvcmxkqQUCAwGJwKqBpwSBpBwUQvoeOk0Kg36SYTcLEkXqKwOBfF9vE4KX0Nxe"
"LwjcDTpsuh3qXEaZ992r1N38VDcyS6P7I6HBYN9BsNHM362zZnY27GpTw+Kwd751"
"CLoXFPoaMOe57dbBpXoro6Pd3BTbf/Tzr88K06yEOTDKPNj3+inbMaVigtK4PLyP"
"q+Topyzvx9USFgRvyuoxn0Hgb+R0A3j6SLRuyOdAi4gv7Y5oliynrSIEIAYGBgYG"
"BgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGBgYGrgMEAQevAwQBBLADBAEFAAAA";
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
static bool DecodeBase64(std::vector<uint8_t> *out, const char *in) {
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
size_t len;
if (!EVP_DecodedLength(&len, strlen(in))) {
fprintf(stderr, "EVP_DecodedLength failed\n");
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
return false;
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
out->resize(len);
Remove stl_compat.h. Chromium's toolchains may now assume C++11 library support, so we may freely use C++11 features. (Chromium's still in the process of deciding what to allow, but we use Google's style guide directly, toolchain limitations aside.) Change-Id: I1c7feb92b7f5f51d9091a4c686649fb574ac138d Reviewed-on: https://boringssl-review.googlesource.com/6465 Reviewed-by: Adam Langley <agl@google.com>
2015-11-11 22:01:27 +00:00
if (!EVP_DecodeBase64(out->data(), &len, len, (const uint8_t *)in,
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
strlen(in))) {
fprintf(stderr, "EVP_DecodeBase64 failed\n");
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
return false;
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
out->resize(len);
return true;
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
static bool TestSSL_SESSIONEncoding(const char *input_b64) {
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
const uint8_t *cptr;
uint8_t *ptr;
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// Decode the input.
std::vector<uint8_t> input;
if (!DecodeBase64(&input, input_b64)) {
return false;
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// Verify the SSL_SESSION decodes.
Remove stl_compat.h. Chromium's toolchains may now assume C++11 library support, so we may freely use C++11 features. (Chromium's still in the process of deciding what to allow, but we use Google's style guide directly, toolchain limitations aside.) Change-Id: I1c7feb92b7f5f51d9091a4c686649fb574ac138d Reviewed-on: https://boringssl-review.googlesource.com/6465 Reviewed-by: Adam Langley <agl@google.com>
2015-11-11 22:01:27 +00:00
ScopedSSL_SESSION session(SSL_SESSION_from_bytes(input.data(), input.size()));
Add SSL_SESSION_from_bytes. Mirrors SSL_SESSION_to_bytes. It avoids having to deal with object-reuse, the non-size_t length parameter, and trailing data. Both it and the object-reuse variant back onto an unexposed SSL_SESSION_parse which reads a CBS. Note that this changes the object reuse story slightly. It's now merely an optional output pointer that frees its old contents. No d2i_SSL_SESSION consumer in Google that's built does reuse, much less reuse with the assumption that the top-level object won't be overridden. Change-Id: I5cb8522f96909bb222cab0f342423f2dd7814282 Reviewed-on: https://boringssl-review.googlesource.com/5121 Reviewed-by: Adam Langley <agl@google.com>
2015-06-16 00:41:48 +01:00
if (!session) {
fprintf(stderr, "SSL_SESSION_from_bytes failed\n");
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
return false;
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// Verify the SSL_SESSION encoding round-trips.
size_t encoded_len;
ScopedOpenSSLBytes encoded;
uint8_t *encoded_raw;
if (!SSL_SESSION_to_bytes(session.get(), &encoded_raw, &encoded_len)) {
Add SSL_SESSION_to_bytes to replace i2d_SSL_SESSION. Deprecate the old two-pass version of the function. If the ticket is too long, replace it with a placeholder value but keep the connection working. Change-Id: Ib9fdea66389b171862143d79b5540ea90a9bd5fb Reviewed-on: https://boringssl-review.googlesource.com/2011 Reviewed-by: Adam Langley <agl@google.com>
2014-10-21 06:46:30 +01:00
fprintf(stderr, "SSL_SESSION_to_bytes failed\n");
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
return false;
Add SSL_SESSION_to_bytes to replace i2d_SSL_SESSION. Deprecate the old two-pass version of the function. If the ticket is too long, replace it with a placeholder value but keep the connection working. Change-Id: Ib9fdea66389b171862143d79b5540ea90a9bd5fb Reviewed-on: https://boringssl-review.googlesource.com/2011 Reviewed-by: Adam Langley <agl@google.com>
2014-10-21 06:46:30 +01:00
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
encoded.reset(encoded_raw);
if (encoded_len != input.size() ||
Remove stl_compat.h. Chromium's toolchains may now assume C++11 library support, so we may freely use C++11 features. (Chromium's still in the process of deciding what to allow, but we use Google's style guide directly, toolchain limitations aside.) Change-Id: I1c7feb92b7f5f51d9091a4c686649fb574ac138d Reviewed-on: https://boringssl-review.googlesource.com/6465 Reviewed-by: Adam Langley <agl@google.com>
2015-11-11 22:01:27 +00:00
memcmp(input.data(), encoded.get(), input.size()) != 0) {
Add SSL_SESSION_to_bytes to replace i2d_SSL_SESSION. Deprecate the old two-pass version of the function. If the ticket is too long, replace it with a placeholder value but keep the connection working. Change-Id: Ib9fdea66389b171862143d79b5540ea90a9bd5fb Reviewed-on: https://boringssl-review.googlesource.com/2011 Reviewed-by: Adam Langley <agl@google.com>
2014-10-21 06:46:30 +01:00
fprintf(stderr, "SSL_SESSION_to_bytes did not round-trip\n");
Make key exchange strength available. This change stores the size of the group/modulus (for RSA/DHE) or curve ID (for ECDHE) in the |SSL_SESSION|. This makes it available for UIs where desired. Change-Id: I354141da432a08f71704c9683f298b361362483d Reviewed-on: https://boringssl-review.googlesource.com/5280 Reviewed-by: Adam Langley <agl@google.com>
2015-06-29 14:07:26 +01:00
hexdump(stderr, "Before: ", input.data(), input.size());
hexdump(stderr, "After: ", encoded_raw, encoded_len);
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
return false;
Add SSL_SESSION_to_bytes to replace i2d_SSL_SESSION. Deprecate the old two-pass version of the function. If the ticket is too long, replace it with a placeholder value but keep the connection working. Change-Id: Ib9fdea66389b171862143d79b5540ea90a9bd5fb Reviewed-on: https://boringssl-review.googlesource.com/2011 Reviewed-by: Adam Langley <agl@google.com>
2014-10-21 06:46:30 +01:00
}
Add SSL_SESSION_from_bytes. Mirrors SSL_SESSION_to_bytes. It avoids having to deal with object-reuse, the non-size_t length parameter, and trailing data. Both it and the object-reuse variant back onto an unexposed SSL_SESSION_parse which reads a CBS. Note that this changes the object reuse story slightly. It's now merely an optional output pointer that frees its old contents. No d2i_SSL_SESSION consumer in Google that's built does reuse, much less reuse with the assumption that the top-level object won't be overridden. Change-Id: I5cb8522f96909bb222cab0f342423f2dd7814282 Reviewed-on: https://boringssl-review.googlesource.com/5121 Reviewed-by: Adam Langley <agl@google.com>
2015-06-16 00:41:48 +01:00
// Verify the SSL_SESSION also decodes with the legacy API.
Remove stl_compat.h. Chromium's toolchains may now assume C++11 library support, so we may freely use C++11 features. (Chromium's still in the process of deciding what to allow, but we use Google's style guide directly, toolchain limitations aside.) Change-Id: I1c7feb92b7f5f51d9091a4c686649fb574ac138d Reviewed-on: https://boringssl-review.googlesource.com/6465 Reviewed-by: Adam Langley <agl@google.com>
2015-11-11 22:01:27 +00:00
cptr = input.data();
Add SSL_SESSION_from_bytes. Mirrors SSL_SESSION_to_bytes. It avoids having to deal with object-reuse, the non-size_t length parameter, and trailing data. Both it and the object-reuse variant back onto an unexposed SSL_SESSION_parse which reads a CBS. Note that this changes the object reuse story slightly. It's now merely an optional output pointer that frees its old contents. No d2i_SSL_SESSION consumer in Google that's built does reuse, much less reuse with the assumption that the top-level object won't be overridden. Change-Id: I5cb8522f96909bb222cab0f342423f2dd7814282 Reviewed-on: https://boringssl-review.googlesource.com/5121 Reviewed-by: Adam Langley <agl@google.com>
2015-06-16 00:41:48 +01:00
session.reset(d2i_SSL_SESSION(NULL, &cptr, input.size()));
Remove stl_compat.h. Chromium's toolchains may now assume C++11 library support, so we may freely use C++11 features. (Chromium's still in the process of deciding what to allow, but we use Google's style guide directly, toolchain limitations aside.) Change-Id: I1c7feb92b7f5f51d9091a4c686649fb574ac138d Reviewed-on: https://boringssl-review.googlesource.com/6465 Reviewed-by: Adam Langley <agl@google.com>
2015-11-11 22:01:27 +00:00
if (!session || cptr != input.data() + input.size()) {
Add SSL_SESSION_from_bytes. Mirrors SSL_SESSION_to_bytes. It avoids having to deal with object-reuse, the non-size_t length parameter, and trailing data. Both it and the object-reuse variant back onto an unexposed SSL_SESSION_parse which reads a CBS. Note that this changes the object reuse story slightly. It's now merely an optional output pointer that frees its old contents. No d2i_SSL_SESSION consumer in Google that's built does reuse, much less reuse with the assumption that the top-level object won't be overridden. Change-Id: I5cb8522f96909bb222cab0f342423f2dd7814282 Reviewed-on: https://boringssl-review.googlesource.com/5121 Reviewed-by: Adam Langley <agl@google.com>
2015-06-16 00:41:48 +01:00
fprintf(stderr, "d2i_SSL_SESSION failed\n");
return false;
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// Verify the SSL_SESSION encoding round-trips via the legacy API.
int len = i2d_SSL_SESSION(session.get(), NULL);
if (len < 0 || (size_t)len != input.size()) {
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
fprintf(stderr, "i2d_SSL_SESSION(NULL) returned invalid length\n");
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
return false;
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
encoded.reset((uint8_t *)OPENSSL_malloc(input.size()));
if (!encoded) {
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
fprintf(stderr, "malloc failed\n");
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
return false;
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
ptr = encoded.get();
len = i2d_SSL_SESSION(session.get(), &ptr);
if (len < 0 || (size_t)len != input.size()) {
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
fprintf(stderr, "i2d_SSL_SESSION returned invalid length\n");
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
return false;
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
if (ptr != encoded.get() + input.size()) {
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
fprintf(stderr, "i2d_SSL_SESSION did not advance ptr correctly\n");
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
return false;
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
}
Remove stl_compat.h. Chromium's toolchains may now assume C++11 library support, so we may freely use C++11 features. (Chromium's still in the process of deciding what to allow, but we use Google's style guide directly, toolchain limitations aside.) Change-Id: I1c7feb92b7f5f51d9091a4c686649fb574ac138d Reviewed-on: https://boringssl-review.googlesource.com/6465 Reviewed-by: Adam Langley <agl@google.com>
2015-11-11 22:01:27 +00:00
if (memcmp(input.data(), encoded.get(), input.size()) != 0) {
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
fprintf(stderr, "i2d_SSL_SESSION did not round-trip\n");
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
return false;
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
return true;
Add SSL_SESSION serialization and deserialization tests. Change-Id: Ia59e4accb644c8807b7c4ab6267efa624be95c18 Reviewed-on: https://boringssl-review.googlesource.com/1992 Reviewed-by: Adam Langley <agl@google.com>
2014-10-19 05:59:36 +01:00
}
Reject unknown fields in d2i_SSL_SESSION. The original OpenSSL implementation did the same. M_ASN1_D2I_Finish checks this. Forwards compatibility with future sessions with unknown fields is probably not desirable. Change-Id: I116a8c482cbcc47c3fcc31515c4a3718f66cf268 Reviewed-on: https://boringssl-review.googlesource.com/4941 Reviewed-by: Adam Langley <agl@google.com>
2015-05-29 00:55:29 +01:00
static bool TestBadSSL_SESSIONEncoding(const char *input_b64) {
std::vector<uint8_t> input;
if (!DecodeBase64(&input, input_b64)) {
return false;
}
// Verify that the SSL_SESSION fails to decode.
Remove stl_compat.h. Chromium's toolchains may now assume C++11 library support, so we may freely use C++11 features. (Chromium's still in the process of deciding what to allow, but we use Google's style guide directly, toolchain limitations aside.) Change-Id: I1c7feb92b7f5f51d9091a4c686649fb574ac138d Reviewed-on: https://boringssl-review.googlesource.com/6465 Reviewed-by: Adam Langley <agl@google.com>
2015-11-11 22:01:27 +00:00
ScopedSSL_SESSION session(SSL_SESSION_from_bytes(input.data(), input.size()));
Reject unknown fields in d2i_SSL_SESSION. The original OpenSSL implementation did the same. M_ASN1_D2I_Finish checks this. Forwards compatibility with future sessions with unknown fields is probably not desirable. Change-Id: I116a8c482cbcc47c3fcc31515c4a3718f66cf268 Reviewed-on: https://boringssl-review.googlesource.com/4941 Reviewed-by: Adam Langley <agl@google.com>
2015-05-29 00:55:29 +01:00
if (session) {
Add SSL_SESSION_from_bytes. Mirrors SSL_SESSION_to_bytes. It avoids having to deal with object-reuse, the non-size_t length parameter, and trailing data. Both it and the object-reuse variant back onto an unexposed SSL_SESSION_parse which reads a CBS. Note that this changes the object reuse story slightly. It's now merely an optional output pointer that frees its old contents. No d2i_SSL_SESSION consumer in Google that's built does reuse, much less reuse with the assumption that the top-level object won't be overridden. Change-Id: I5cb8522f96909bb222cab0f342423f2dd7814282 Reviewed-on: https://boringssl-review.googlesource.com/5121 Reviewed-by: Adam Langley <agl@google.com>
2015-06-16 00:41:48 +01:00
fprintf(stderr, "SSL_SESSION_from_bytes unexpectedly succeeded\n");
Reject unknown fields in d2i_SSL_SESSION. The original OpenSSL implementation did the same. M_ASN1_D2I_Finish checks this. Forwards compatibility with future sessions with unknown fields is probably not desirable. Change-Id: I116a8c482cbcc47c3fcc31515c4a3718f66cf268 Reviewed-on: https://boringssl-review.googlesource.com/4941 Reviewed-by: Adam Langley <agl@google.com>
2015-05-29 00:55:29 +01:00
return false;
}
ERR_clear_error();
return true;
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
static bool TestDefaultVersion(uint16_t version,
const SSL_METHOD *(*method)(void)) {
ScopedSSL_CTX ctx(SSL_CTX_new(method()));
if (!ctx) {
return false;
Merge SSLv23_method and DTLS_ANY_VERSION. This makes SSLv23_method go through DTLS_ANY_VERSION's version negotiation logic. This allows us to get rid of duplicate ClientHello logic. For compatibility, SSL_METHOD is now split into SSL_PROTOCOL_METHOD and a version. The legacy version-locked methods set min_version and max_version based this version field to emulate the original semantics. As a bonus, we can now handle fragmented ClientHello versions now. Because SSLv23_method is a silly name, deprecate that too and introduce TLS_method. Change-Id: I8b3df2b427ae34c44ecf972f466ad64dc3dbb171
2014-12-12 20:55:27 +00:00
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
return ctx->min_version == version && ctx->max_version == version;
Merge SSLv23_method and DTLS_ANY_VERSION. This makes SSLv23_method go through DTLS_ANY_VERSION's version negotiation logic. This allows us to get rid of duplicate ClientHello logic. For compatibility, SSL_METHOD is now split into SSL_PROTOCOL_METHOD and a version. The legacy version-locked methods set min_version and max_version based this version field to emulate the original semantics. As a bonus, we can now handle fragmented ClientHello versions now. Because SSLv23_method is a silly name, deprecate that too and introduce TLS_method. Change-Id: I8b3df2b427ae34c44ecf972f466ad64dc3dbb171
2014-12-12 20:55:27 +00:00
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
static bool CipherGetRFCName(std::string *out, uint16_t value) {
Use SSL_get_cipher_by_value in cipher_get_rfc_name tests. Saves making a temporary SSL_CTX and looking at its insides. Change-Id: Ia351b9b91aec8b813ad7b6e373773396f0975f9a Reviewed-on: https://boringssl-review.googlesource.com/3561 Reviewed-by: Adam Langley <agl@google.com>
2015-02-21 16:03:06 +00:00
const SSL_CIPHER *cipher = SSL_get_cipher_by_value(value);
if (cipher == NULL) {
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
return false;
Add SSL_CIPHER_get_rfc_name. OpenSSL's internal names for the ciphers are not the standard ones and are not easy to consistently map to the standard ones. Add an API to get the real names out. (WebRTC wants an API to get the standard names out.) Also change some incorrect flags on SHA-256 TLS 1.2 ciphers; SSL_HANDSHAKE_MAC_DEFAULT and SSL_HANDSHAKE_MAC_SHA256 are the same after TLS 1.2. A TLS 1.2 cipher should be tagged explicitly with SHA-256. (This avoids tripping a check in SSL_CIPHER_get_rfc_name which asserts that default-hash ciphers only ever use SHA-1 or MD5 for the bulk cipher MAC.) Change-Id: Iaec2fd4aa97df29883094d3c2ae60f0ba003bf07
2015-02-05 21:49:47 +00:00
}
Convert ec_test to C++ Change-Id: I5e25ddbc87370b58d9b6fc410f51e259947df8dd Reviewed-on: https://boringssl-review.googlesource.com/4468 Reviewed-by: Adam Langley <agl@google.com>
2015-04-20 21:19:00 +01:00
ScopedOpenSSLString rfc_name(SSL_CIPHER_get_rfc_name(cipher));
Fix some malloc test crashs. This isn't exhaustive. There are still failures in some tests which probably ought to get C++'d first. Change-Id: Iac58df9d98cdfd94603d54374a531b2559df64c3 Reviewed-on: https://boringssl-review.googlesource.com/4795 Reviewed-by: Adam Langley <agl@google.com>
2015-05-16 00:11:57 +01:00
if (!rfc_name) {
return false;
}
Convert ec_test to C++ Change-Id: I5e25ddbc87370b58d9b6fc410f51e259947df8dd Reviewed-on: https://boringssl-review.googlesource.com/4468 Reviewed-by: Adam Langley <agl@google.com>
2015-04-20 21:19:00 +01:00
out->assign(rfc_name.get());
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
return true;
Add SSL_CIPHER_get_rfc_name. OpenSSL's internal names for the ciphers are not the standard ones and are not easy to consistently map to the standard ones. Add an API to get the real names out. (WebRTC wants an API to get the standard names out.) Also change some incorrect flags on SHA-256 TLS 1.2 ciphers; SSL_HANDSHAKE_MAC_DEFAULT and SSL_HANDSHAKE_MAC_SHA256 are the same after TLS 1.2. A TLS 1.2 cipher should be tagged explicitly with SHA-256. (This avoids tripping a check in SSL_CIPHER_get_rfc_name which asserts that default-hash ciphers only ever use SHA-1 or MD5 for the bulk cipher MAC.) Change-Id: Iaec2fd4aa97df29883094d3c2ae60f0ba003bf07
2015-02-05 21:49:47 +00:00
}
typedef struct {
Use SSL_get_cipher_by_value in cipher_get_rfc_name tests. Saves making a temporary SSL_CTX and looking at its insides. Change-Id: Ia351b9b91aec8b813ad7b6e373773396f0975f9a Reviewed-on: https://boringssl-review.googlesource.com/3561 Reviewed-by: Adam Langley <agl@google.com>
2015-02-21 16:03:06 +00:00
int id;
Add SSL_CIPHER_get_rfc_name. OpenSSL's internal names for the ciphers are not the standard ones and are not easy to consistently map to the standard ones. Add an API to get the real names out. (WebRTC wants an API to get the standard names out.) Also change some incorrect flags on SHA-256 TLS 1.2 ciphers; SSL_HANDSHAKE_MAC_DEFAULT and SSL_HANDSHAKE_MAC_SHA256 are the same after TLS 1.2. A TLS 1.2 cipher should be tagged explicitly with SHA-256. (This avoids tripping a check in SSL_CIPHER_get_rfc_name which asserts that default-hash ciphers only ever use SHA-1 or MD5 for the bulk cipher MAC.) Change-Id: Iaec2fd4aa97df29883094d3c2ae60f0ba003bf07
2015-02-05 21:49:47 +00:00
const char *rfc_name;
} CIPHER_RFC_NAME_TEST;
static const CIPHER_RFC_NAME_TEST kCipherRFCNameTests[] = {
Use SSL_get_cipher_by_value in cipher_get_rfc_name tests. Saves making a temporary SSL_CTX and looking at its insides. Change-Id: Ia351b9b91aec8b813ad7b6e373773396f0975f9a Reviewed-on: https://boringssl-review.googlesource.com/3561 Reviewed-by: Adam Langley <agl@google.com>
2015-02-21 16:03:06 +00:00
{ SSL3_CK_RSA_DES_192_CBC3_SHA, "TLS_RSA_WITH_3DES_EDE_CBC_SHA" },
{ SSL3_CK_RSA_RC4_128_MD5, "TLS_RSA_WITH_RC4_MD5" },
{ TLS1_CK_RSA_WITH_AES_128_SHA, "TLS_RSA_WITH_AES_128_CBC_SHA" },
{ TLS1_CK_DHE_RSA_WITH_AES_256_SHA, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA" },
{ TLS1_CK_DHE_RSA_WITH_AES_256_SHA256,
"TLS_DHE_RSA_WITH_AES_256_CBC_SHA256" },
{ TLS1_CK_ECDHE_RSA_WITH_AES_128_SHA256,
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" },
{ TLS1_CK_ECDHE_RSA_WITH_AES_256_SHA384,
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384" },
{ TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256" },
{ TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" },
{ TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" },
{ TLS1_CK_PSK_WITH_RC4_128_SHA, "TLS_PSK_WITH_RC4_SHA" },
Add ECDHE-PSK-AES{128,256}-SHA cipher suites. If we're going to have PSK and use standard cipher suites, this might be the best that we can do for the moment. Change-Id: I35d9831b2991dc5b23c9e24d98cdc0db95919d39 Reviewed-on: https://boringssl-review.googlesource.com/5052 Reviewed-by: Adam Langley <agl@google.com>
2015-06-09 17:54:04 +01:00
{ TLS1_CK_ECDHE_PSK_WITH_AES_128_CBC_SHA,
"TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA" },
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
// These names are non-standard:
Refactor ChaCha20-Poly1305 AEAD nonce handling. This change reduces unnecessary copying and makes the pre-RFC-7539 nonces 96 bits just like the AES-GCM, AES-CCM, and RFC 7539 ChaCha20-Poly1305 cipher suites. Also, all the symbols related to the pre-RFC-7539 cipher suites now have "_OLD" appended, in preparation for adding the RFC 7539 variants. Change-Id: I1f85bd825b383c3134df0b6214266069ded029ae Reviewed-on: https://boringssl-review.googlesource.com/6103 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-04 00:53:33 +01:00
{ TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305_OLD,
Use SSL_get_cipher_by_value in cipher_get_rfc_name tests. Saves making a temporary SSL_CTX and looking at its insides. Change-Id: Ia351b9b91aec8b813ad7b6e373773396f0975f9a Reviewed-on: https://boringssl-review.googlesource.com/3561 Reviewed-by: Adam Langley <agl@google.com>
2015-02-21 16:03:06 +00:00
"TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256" },
Refactor ChaCha20-Poly1305 AEAD nonce handling. This change reduces unnecessary copying and makes the pre-RFC-7539 nonces 96 bits just like the AES-GCM, AES-CCM, and RFC 7539 ChaCha20-Poly1305 cipher suites. Also, all the symbols related to the pre-RFC-7539 cipher suites now have "_OLD" appended, in preparation for adding the RFC 7539 variants. Change-Id: I1f85bd825b383c3134df0b6214266069ded029ae Reviewed-on: https://boringssl-review.googlesource.com/6103 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-04 00:53:33 +01:00
{ TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305_OLD,
Use SSL_get_cipher_by_value in cipher_get_rfc_name tests. Saves making a temporary SSL_CTX and looking at its insides. Change-Id: Ia351b9b91aec8b813ad7b6e373773396f0975f9a Reviewed-on: https://boringssl-review.googlesource.com/3561 Reviewed-by: Adam Langley <agl@google.com>
2015-02-21 16:03:06 +00:00
"TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256" },
Add SSL_CIPHER_get_rfc_name. OpenSSL's internal names for the ciphers are not the standard ones and are not easy to consistently map to the standard ones. Add an API to get the real names out. (WebRTC wants an API to get the standard names out.) Also change some incorrect flags on SHA-256 TLS 1.2 ciphers; SSL_HANDSHAKE_MAC_DEFAULT and SSL_HANDSHAKE_MAC_SHA256 are the same after TLS 1.2. A TLS 1.2 cipher should be tagged explicitly with SHA-256. (This avoids tripping a check in SSL_CIPHER_get_rfc_name which asserts that default-hash ciphers only ever use SHA-1 or MD5 for the bulk cipher MAC.) Change-Id: Iaec2fd4aa97df29883094d3c2ae60f0ba003bf07
2015-02-05 21:49:47 +00:00
};
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
static bool TestCipherGetRFCName(void) {
for (size_t i = 0;
i < sizeof(kCipherRFCNameTests) / sizeof(kCipherRFCNameTests[0]); i++) {
Add SSL_CIPHER_get_rfc_name. OpenSSL's internal names for the ciphers are not the standard ones and are not easy to consistently map to the standard ones. Add an API to get the real names out. (WebRTC wants an API to get the standard names out.) Also change some incorrect flags on SHA-256 TLS 1.2 ciphers; SSL_HANDSHAKE_MAC_DEFAULT and SSL_HANDSHAKE_MAC_SHA256 are the same after TLS 1.2. A TLS 1.2 cipher should be tagged explicitly with SHA-256. (This avoids tripping a check in SSL_CIPHER_get_rfc_name which asserts that default-hash ciphers only ever use SHA-1 or MD5 for the bulk cipher MAC.) Change-Id: Iaec2fd4aa97df29883094d3c2ae60f0ba003bf07
2015-02-05 21:49:47 +00:00
const CIPHER_RFC_NAME_TEST *test = &kCipherRFCNameTests[i];
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
std::string rfc_name;
if (!CipherGetRFCName(&rfc_name, test->id & 0xffff)) {
fprintf(stderr, "SSL_CIPHER_get_rfc_name failed\n");
return false;
Add SSL_CIPHER_get_rfc_name. OpenSSL's internal names for the ciphers are not the standard ones and are not easy to consistently map to the standard ones. Add an API to get the real names out. (WebRTC wants an API to get the standard names out.) Also change some incorrect flags on SHA-256 TLS 1.2 ciphers; SSL_HANDSHAKE_MAC_DEFAULT and SSL_HANDSHAKE_MAC_SHA256 are the same after TLS 1.2. A TLS 1.2 cipher should be tagged explicitly with SHA-256. (This avoids tripping a check in SSL_CIPHER_get_rfc_name which asserts that default-hash ciphers only ever use SHA-1 or MD5 for the bulk cipher MAC.) Change-Id: Iaec2fd4aa97df29883094d3c2ae60f0ba003bf07
2015-02-05 21:49:47 +00:00
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
if (rfc_name != test->rfc_name) {
Add SSL_CIPHER_get_rfc_name. OpenSSL's internal names for the ciphers are not the standard ones and are not easy to consistently map to the standard ones. Add an API to get the real names out. (WebRTC wants an API to get the standard names out.) Also change some incorrect flags on SHA-256 TLS 1.2 ciphers; SSL_HANDSHAKE_MAC_DEFAULT and SSL_HANDSHAKE_MAC_SHA256 are the same after TLS 1.2. A TLS 1.2 cipher should be tagged explicitly with SHA-256. (This avoids tripping a check in SSL_CIPHER_get_rfc_name which asserts that default-hash ciphers only ever use SHA-1 or MD5 for the bulk cipher MAC.) Change-Id: Iaec2fd4aa97df29883094d3c2ae60f0ba003bf07
2015-02-05 21:49:47 +00:00
fprintf(stderr, "SSL_CIPHER_get_rfc_name: got '%s', wanted '%s'\n",
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
rfc_name.c_str(), test->rfc_name);
return false;
Add SSL_CIPHER_get_rfc_name. OpenSSL's internal names for the ciphers are not the standard ones and are not easy to consistently map to the standard ones. Add an API to get the real names out. (WebRTC wants an API to get the standard names out.) Also change some incorrect flags on SHA-256 TLS 1.2 ciphers; SSL_HANDSHAKE_MAC_DEFAULT and SSL_HANDSHAKE_MAC_SHA256 are the same after TLS 1.2. A TLS 1.2 cipher should be tagged explicitly with SHA-256. (This avoids tripping a check in SSL_CIPHER_get_rfc_name which asserts that default-hash ciphers only ever use SHA-1 or MD5 for the bulk cipher MAC.) Change-Id: Iaec2fd4aa97df29883094d3c2ae60f0ba003bf07
2015-02-05 21:49:47 +00:00
}
}
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
return true;
Add SSL_CIPHER_get_rfc_name. OpenSSL's internal names for the ciphers are not the standard ones and are not easy to consistently map to the standard ones. Add an API to get the real names out. (WebRTC wants an API to get the standard names out.) Also change some incorrect flags on SHA-256 TLS 1.2 ciphers; SSL_HANDSHAKE_MAC_DEFAULT and SSL_HANDSHAKE_MAC_SHA256 are the same after TLS 1.2. A TLS 1.2 cipher should be tagged explicitly with SHA-256. (This avoids tripping a check in SSL_CIPHER_get_rfc_name which asserts that default-hash ciphers only ever use SHA-1 or MD5 for the bulk cipher MAC.) Change-Id: Iaec2fd4aa97df29883094d3c2ae60f0ba003bf07
2015-02-05 21:49:47 +00:00
}
Add tests for the padding extension. This sort of test is more suitable for ssl_test than runner. This should stress all the various cases around padding. Use tickets rather than hostnames to inflate the ClientHello because there's a fairly tight maximum hostname length. Change-Id: Ibd43aaa7acb9bf5fa00a9d2548d2101e5bb147d3 Reviewed-on: https://boringssl-review.googlesource.com/5480 Reviewed-by: Adam Langley <agl@google.com>
2015-07-22 03:03:43 +01:00
// CreateSessionWithTicket returns a sample |SSL_SESSION| with the ticket
// replaced for one of length |ticket_len| or nullptr on failure.
static ScopedSSL_SESSION CreateSessionWithTicket(size_t ticket_len) {
std::vector<uint8_t> der;
if (!DecodeBase64(&der, kOpenSSLSession)) {
return nullptr;
}
Remove stl_compat.h. Chromium's toolchains may now assume C++11 library support, so we may freely use C++11 features. (Chromium's still in the process of deciding what to allow, but we use Google's style guide directly, toolchain limitations aside.) Change-Id: I1c7feb92b7f5f51d9091a4c686649fb574ac138d Reviewed-on: https://boringssl-review.googlesource.com/6465 Reviewed-by: Adam Langley <agl@google.com>
2015-11-11 22:01:27 +00:00
ScopedSSL_SESSION session(SSL_SESSION_from_bytes(der.data(), der.size()));
Add tests for the padding extension. This sort of test is more suitable for ssl_test than runner. This should stress all the various cases around padding. Use tickets rather than hostnames to inflate the ClientHello because there's a fairly tight maximum hostname length. Change-Id: Ibd43aaa7acb9bf5fa00a9d2548d2101e5bb147d3 Reviewed-on: https://boringssl-review.googlesource.com/5480 Reviewed-by: Adam Langley <agl@google.com>
2015-07-22 03:03:43 +01:00
if (!session) {
return nullptr;
}
// Swap out the ticket for a garbage one.
OPENSSL_free(session->tlsext_tick);
session->tlsext_tick = reinterpret_cast<uint8_t*>(OPENSSL_malloc(ticket_len));
if (session->tlsext_tick == nullptr) {
return nullptr;
}
memset(session->tlsext_tick, 'a', ticket_len);
session->tlsext_ticklen = ticket_len;
Never use the internal session cache for a client. The internal session cache is keyed on session ID, so this is completely useless for clients (indeed we never look it up internally). Along the way, tidy up ssl_update_cache to be more readable. The slight behavior change is that SSL_CTX_add_session's return code no longer controls the external callback. It's not clear to me what that could have accomplished. (It can only fail on allocation error. We only call it for new sessions, so the duplicate case is impossible.) The one thing of value the internal cache might have provided is managing the timeout. The SSL_CTX_flush_sessions logic would flip the not_resumable bit and cause us not to offer expired sessions (modulo SSL_CTX_flush_sessions's delay and any discrepancies between the two caches). Instead, just check expiration when deciding whether or not to offer a session. This way clients that set SSL_SESS_CACHE_CLIENT blindly don't accidentally consume gobs of memory. BUG=531194 Change-Id: If97485beab21874f37737edc44df24e61ce23705 Reviewed-on: https://boringssl-review.googlesource.com/6321 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-18 20:18:55 +01:00
// Fix up the timeout.
session->time = time(NULL);
Add tests for the padding extension. This sort of test is more suitable for ssl_test than runner. This should stress all the various cases around padding. Use tickets rather than hostnames to inflate the ClientHello because there's a fairly tight maximum hostname length. Change-Id: Ibd43aaa7acb9bf5fa00a9d2548d2101e5bb147d3 Reviewed-on: https://boringssl-review.googlesource.com/5480 Reviewed-by: Adam Langley <agl@google.com>
2015-07-22 03:03:43 +01:00
return session;
}
// GetClientHelloLen creates a client SSL connection with a ticket of length
// |ticket_len| and records the ClientHello. It returns the length of the
// ClientHello, not including the record header, on success and zero on error.
static size_t GetClientHelloLen(size_t ticket_len) {
ScopedSSL_CTX ctx(SSL_CTX_new(TLS_method()));
ScopedSSL_SESSION session = CreateSessionWithTicket(ticket_len);
if (!ctx || !session) {
return 0;
}
ScopedSSL ssl(SSL_new(ctx.get()));
ScopedBIO bio(BIO_new(BIO_s_mem()));
if (!ssl || !bio || !SSL_set_session(ssl.get(), session.get())) {
return 0;
}
// Do not configure a reading BIO, but record what's written to a memory BIO.
SSL_set_bio(ssl.get(), nullptr /* rbio */, BIO_up_ref(bio.get()));
int ret = SSL_connect(ssl.get());
if (ret > 0) {
// SSL_connect should fail without a BIO to write to.
return 0;
}
ERR_clear_error();
const uint8_t *unused;
size_t client_hello_len;
if (!BIO_mem_contents(bio.get(), &unused, &client_hello_len) ||
client_hello_len <= SSL3_RT_HEADER_LENGTH) {
return 0;
}
return client_hello_len - SSL3_RT_HEADER_LENGTH;
}
struct PaddingTest {
size_t input_len, padded_len;
};
static const PaddingTest kPaddingTests[] = {
// ClientHellos of length below 0x100 do not require padding.
{0xfe, 0xfe},
{0xff, 0xff},
// ClientHellos of length 0x100 through 0x1fb are padded up to 0x200.
{0x100, 0x200},
{0x123, 0x200},
{0x1fb, 0x200},
// ClientHellos of length 0x1fc through 0x1ff get padded beyond 0x200. The
// padding extension takes a minimum of four bytes plus one required content
// byte. (To work around yet more server bugs, we avoid empty final
// extensions.)
{0x1fc, 0x201},
{0x1fd, 0x202},
{0x1fe, 0x203},
{0x1ff, 0x204},
// Finally, larger ClientHellos need no padding.
{0x200, 0x200},
{0x201, 0x201},
};
static bool TestPaddingExtension() {
// Sample a baseline length.
size_t base_len = GetClientHelloLen(1);
if (base_len == 0) {
return false;
}
for (const PaddingTest &test : kPaddingTests) {
if (base_len > test.input_len) {
fprintf(stderr, "Baseline ClientHello too long.\n");
return false;
}
size_t padded_len = GetClientHelloLen(1 + test.input_len - base_len);
if (padded_len != test.padded_len) {
fprintf(stderr, "%u-byte ClientHello padded to %u bytes, not %u.\n",
static_cast<unsigned>(test.input_len),
static_cast<unsigned>(padded_len),
static_cast<unsigned>(test.padded_len));
return false;
}
}
return true;
}
Make SSL_get_client_CA_list slightly more OpenSSL-compatible. SSL_get_client_CA_list is one of those dreaded functions which may query either configuration state or handshake state. Moreover, it does so based on |ssl->server|, which may not be configured until later. Also check |ssl->handshake_func| to make sure |ssl| is not in an indeterminate state. This also fixes a bug where SSL_get_client_CA_list wouldn't work in DTLS due to the incorrect |ssl->version| check. Change-Id: Ie564dbfeecd2c8257fd6bcb148bc5db827390c77 Reviewed-on: https://boringssl-review.googlesource.com/5827 Reviewed-by: Adam Langley <agl@google.com>
2015-09-08 22:41:40 +01:00
// Test that |SSL_get_client_CA_list| echoes back the configured parameter even
// before configuring as a server.
static bool TestClientCAList() {
ScopedSSL_CTX ctx(SSL_CTX_new(TLS_method()));
if (!ctx) {
return false;
}
ScopedSSL ssl(SSL_new(ctx.get()));
if (!ssl) {
return false;
}
STACK_OF(X509_NAME) *stack = sk_X509_NAME_new_null();
if (stack == nullptr) {
return false;
}
// |SSL_set_client_CA_list| takes ownership.
SSL_set_client_CA_list(ssl.get(), stack);
return SSL_get_client_CA_list(ssl.get()) == stack;
}
Add tests for the internal session cache behavior. In doing so, fix the documentation for SSL_CTX_add_session and SSL_CTX_remove_session. I misread the code and documented the behavior on session ID collision wrong. Change-Id: I6f364305e1f092b9eb0b1402962fd04577269d30 Reviewed-on: https://boringssl-review.googlesource.com/6319 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-18 19:28:01 +01:00
static void AppendSession(SSL_SESSION *session, void *arg) {
std::vector<SSL_SESSION*> *out =
reinterpret_cast<std::vector<SSL_SESSION*>*>(arg);
out->push_back(session);
}
// ExpectCache returns true if |ctx|'s session cache consists of |expected|, in
// order.
static bool ExpectCache(SSL_CTX *ctx,
const std::vector<SSL_SESSION*> &expected) {
// Check the linked list.
SSL_SESSION *ptr = ctx->session_cache_head;
for (SSL_SESSION *session : expected) {
if (ptr != session) {
return false;
}
// TODO(davidben): This is an absurd way to denote the end of the list.
if (ptr->next ==
reinterpret_cast<SSL_SESSION *>(&ctx->session_cache_tail)) {
ptr = nullptr;
} else {
ptr = ptr->next;
}
}
if (ptr != nullptr) {
return false;
}
// Check the hash table.
std::vector<SSL_SESSION*> actual, expected_copy;
lh_SSL_SESSION_doall_arg(SSL_CTX_sessions(ctx), AppendSession, &actual);
expected_copy = expected;
std::sort(actual.begin(), actual.end());
std::sort(expected_copy.begin(), expected_copy.end());
return actual == expected_copy;
}
static ScopedSSL_SESSION CreateTestSession(uint32_t number) {
ScopedSSL_SESSION ret(SSL_SESSION_new());
if (!ret) {
return nullptr;
}
ret->session_id_length = SSL3_SSL_SESSION_ID_LENGTH;
memset(ret->session_id, 0, ret->session_id_length);
memcpy(ret->session_id, &number, sizeof(number));
return ret;
}
// TODO(davidben): Switch this to a |std::vector<ScopedSSL_SESSION>| once we can
// rely on a move-aware |std::vector|.
Correctly free SSL_SESSIONs in ssl_test. That was silly. Change-Id: I375c04f725cbb75f9e04fce386e20c4de5e7ae0c Reviewed-on: https://boringssl-review.googlesource.com/6352 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-26 19:45:39 +00:00
class ScopedSessionVector {
Add tests for the internal session cache behavior. In doing so, fix the documentation for SSL_CTX_add_session and SSL_CTX_remove_session. I misread the code and documented the behavior on session ID collision wrong. Change-Id: I6f364305e1f092b9eb0b1402962fd04577269d30 Reviewed-on: https://boringssl-review.googlesource.com/6319 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-18 19:28:01 +01:00
public:
Correctly free SSL_SESSIONs in ssl_test. That was silly. Change-Id: I375c04f725cbb75f9e04fce386e20c4de5e7ae0c Reviewed-on: https://boringssl-review.googlesource.com/6352 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-26 19:45:39 +00:00
explicit ScopedSessionVector(std::vector<SSL_SESSION*> *sessions)
: sessions_(sessions) {}
Add tests for the internal session cache behavior. In doing so, fix the documentation for SSL_CTX_add_session and SSL_CTX_remove_session. I misread the code and documented the behavior on session ID collision wrong. Change-Id: I6f364305e1f092b9eb0b1402962fd04577269d30 Reviewed-on: https://boringssl-review.googlesource.com/6319 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-18 19:28:01 +01:00
Correctly free SSL_SESSIONs in ssl_test. That was silly. Change-Id: I375c04f725cbb75f9e04fce386e20c4de5e7ae0c Reviewed-on: https://boringssl-review.googlesource.com/6352 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-26 19:45:39 +00:00
~ScopedSessionVector() {
for (SSL_SESSION *session : *sessions_) {
SSL_SESSION_free(session);
Add tests for the internal session cache behavior. In doing so, fix the documentation for SSL_CTX_add_session and SSL_CTX_remove_session. I misread the code and documented the behavior on session ID collision wrong. Change-Id: I6f364305e1f092b9eb0b1402962fd04577269d30 Reviewed-on: https://boringssl-review.googlesource.com/6319 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-18 19:28:01 +01:00
}
}
private:
Correctly free SSL_SESSIONs in ssl_test. That was silly. Change-Id: I375c04f725cbb75f9e04fce386e20c4de5e7ae0c Reviewed-on: https://boringssl-review.googlesource.com/6352 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-26 19:45:39 +00:00
std::vector<SSL_SESSION*> *const sessions_;
Add tests for the internal session cache behavior. In doing so, fix the documentation for SSL_CTX_add_session and SSL_CTX_remove_session. I misread the code and documented the behavior on session ID collision wrong. Change-Id: I6f364305e1f092b9eb0b1402962fd04577269d30 Reviewed-on: https://boringssl-review.googlesource.com/6319 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-18 19:28:01 +01:00
};
// Test that the internal session cache behaves as expected.
static bool TestInternalSessionCache() {
ScopedSSL_CTX ctx(SSL_CTX_new(TLS_method()));
if (!ctx) {
return false;
}
// Prepare 10 test sessions.
std::vector<SSL_SESSION*> sessions;
Correctly free SSL_SESSIONs in ssl_test. That was silly. Change-Id: I375c04f725cbb75f9e04fce386e20c4de5e7ae0c Reviewed-on: https://boringssl-review.googlesource.com/6352 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-26 19:45:39 +00:00
ScopedSessionVector cleanup(&sessions);
Add tests for the internal session cache behavior. In doing so, fix the documentation for SSL_CTX_add_session and SSL_CTX_remove_session. I misread the code and documented the behavior on session ID collision wrong. Change-Id: I6f364305e1f092b9eb0b1402962fd04577269d30 Reviewed-on: https://boringssl-review.googlesource.com/6319 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-18 19:28:01 +01:00
for (int i = 0; i < 10; i++) {
ScopedSSL_SESSION session = CreateTestSession(i);
if (!session) {
return false;
}
sessions.push_back(session.release());
}
SSL_CTX_sess_set_cache_size(ctx.get(), 5);
// Insert all the test sessions.
for (SSL_SESSION *session : sessions) {
if (!SSL_CTX_add_session(ctx.get(), session)) {
return false;
}
}
// Only the last five should be in the list.
std::vector<SSL_SESSION*> expected;
expected.push_back(sessions[9]);
expected.push_back(sessions[8]);
expected.push_back(sessions[7]);
expected.push_back(sessions[6]);
expected.push_back(sessions[5]);
if (!ExpectCache(ctx.get(), expected)) {
return false;
}
// Inserting an element already in the cache should fail.
if (SSL_CTX_add_session(ctx.get(), sessions[7]) ||
!ExpectCache(ctx.get(), expected)) {
return false;
}
// Although collisions should be impossible (256-bit session IDs), the cache
// must handle them gracefully.
ScopedSSL_SESSION collision(CreateTestSession(7));
if (!collision || !SSL_CTX_add_session(ctx.get(), collision.get())) {
return false;
}
expected.clear();
expected.push_back(collision.get());
expected.push_back(sessions[9]);
expected.push_back(sessions[8]);
expected.push_back(sessions[6]);
expected.push_back(sessions[5]);
if (!ExpectCache(ctx.get(), expected)) {
return false;
}
// Removing sessions behaves correctly.
if (!SSL_CTX_remove_session(ctx.get(), sessions[6])) {
return false;
}
expected.clear();
expected.push_back(collision.get());
expected.push_back(sessions[9]);
expected.push_back(sessions[8]);
expected.push_back(sessions[5]);
if (!ExpectCache(ctx.get(), expected)) {
return false;
}
// Removing sessions requires an exact match.
if (SSL_CTX_remove_session(ctx.get(), sessions[0]) ||
SSL_CTX_remove_session(ctx.get(), sessions[7]) ||
!ExpectCache(ctx.get(), expected)) {
return false;
}
return true;
}
Make SSL_get_client_CA_list slightly more OpenSSL-compatible. SSL_get_client_CA_list is one of those dreaded functions which may query either configuration state or handshake state. Moreover, it does so based on |ssl->server|, which may not be configured until later. Also check |ssl->handshake_func| to make sure |ssl| is not in an indeterminate state. This also fixes a bug where SSL_get_client_CA_list wouldn't work in DTLS due to the incorrect |ssl->version| check. Change-Id: Ie564dbfeecd2c8257fd6bcb148bc5db827390c77 Reviewed-on: https://boringssl-review.googlesource.com/5827 Reviewed-by: Adam Langley <agl@google.com>
2015-09-08 22:41:40 +01:00
int main() {
Deprecate SSL_library_init. It just calls CRYPTO_library_init and doesn't do anything else. If anything, I'd like to make CRYPTO_library_init completely go away too. We have CRYPTO_once now, so I think it's safe to assume that, if ssl/ ever grows initialization needs beyond that of crypto/, we can hide it behind a CRYPTO_once and not burden callers. Change-Id: I63dc362e0e9e98deec5516f4620d1672151a91b6 Reviewed-on: https://boringssl-review.googlesource.com/6311 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-18 04:39:22 +01:00
CRYPTO_library_init();
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
if (!TestCipherRules() ||
!TestSSL_SESSIONEncoding(kOpenSSLSession) ||
!TestSSL_SESSIONEncoding(kCustomSession) ||
Remove the last of SESS_CERT. Move cert_chain to the SSL_SESSION. Now everything on an SSL_SESSION is properly serialized. The cert_chain field is, unfortunately, messed up since it means different things between client and server. There exists code which calls SSL_get_peer_cert_chain as both client and server and assumes the existing semantics for each. Since that function doesn't return a newly-allocated STACK_OF(X509), normalizing between the two formats is a nuisance (we'd either need to store both cert_chain and cert_chain_full on the SSL_SESSION or create one of the two variants on-demand and stash it into the SSL). This CL does not resolve this and retains the client/server difference in SSL_SESSION. The SSL_SESSION serialization is a little inefficient (two copies of the leaf certificate) for a client, but clients don't typically serialize sessions. Should we wish to resolve it in the future, we can use a different tag number. Because this was historically unserialized, existing code must already allow for cert_chain not being preserved across i2d/d2i. In keeping with the semantics of retain_only_sha256_of_client_certs, cert_chain is not retained when that flag is set. Change-Id: Ieb72fc62c3076dd59750219e550902f1ad039651 Reviewed-on: https://boringssl-review.googlesource.com/5759 Reviewed-by: Adam Langley <agl@google.com>
2015-08-22 21:04:17 +01:00
!TestSSL_SESSIONEncoding(kBoringSSLSession) ||
Reject unknown fields in d2i_SSL_SESSION. The original OpenSSL implementation did the same. M_ASN1_D2I_Finish checks this. Forwards compatibility with future sessions with unknown fields is probably not desirable. Change-Id: I116a8c482cbcc47c3fcc31515c4a3718f66cf268 Reviewed-on: https://boringssl-review.googlesource.com/4941 Reviewed-by: Adam Langley <agl@google.com>
2015-05-29 00:55:29 +01:00
!TestBadSSL_SESSIONEncoding(kBadSessionExtraField) ||
Reject sessions with the wrong structure version. The old upstream logic actually didn't do this, but 1.1.0's new code does. Given that the version has never changed and even unknown fields were rejected by the old code, this seems a safe and prudent thing to do. Change-Id: I09071585e5183993b358c10ad36fc206f8bceeda Reviewed-on: https://boringssl-review.googlesource.com/4942 Reviewed-by: Adam Langley <agl@google.com>
2015-05-29 01:00:08 +01:00
!TestBadSSL_SESSIONEncoding(kBadSessionVersion) ||
Add SSL_SESSION_from_bytes. Mirrors SSL_SESSION_to_bytes. It avoids having to deal with object-reuse, the non-size_t length parameter, and trailing data. Both it and the object-reuse variant back onto an unexposed SSL_SESSION_parse which reads a CBS. Note that this changes the object reuse story slightly. It's now merely an optional output pointer that frees its old contents. No d2i_SSL_SESSION consumer in Google that's built does reuse, much less reuse with the assumption that the top-level object won't be overridden. Change-Id: I5cb8522f96909bb222cab0f342423f2dd7814282 Reviewed-on: https://boringssl-review.googlesource.com/5121 Reviewed-by: Adam Langley <agl@google.com>
2015-06-16 00:41:48 +01:00
!TestBadSSL_SESSIONEncoding(kBadSessionTrailingData) ||
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
!TestDefaultVersion(0, &TLS_method) ||
!TestDefaultVersion(SSL3_VERSION, &SSLv3_method) ||
!TestDefaultVersion(TLS1_VERSION, &TLSv1_method) ||
!TestDefaultVersion(TLS1_1_VERSION, &TLSv1_1_method) ||
Revert "Temporarily break a handful of tests." This reverts commit a921d550d03361353468f5d91d552d09ae92a60f.
2015-05-05 01:20:48 +01:00
!TestDefaultVersion(TLS1_2_VERSION, &TLSv1_2_method) ||
Convert ssl_test to C++. Change-Id: Ic8f3cd5c6a89e07bbae43b1599a01fedf119b081 Reviewed-on: https://boringssl-review.googlesource.com/4121 Reviewed-by: Adam Langley <agl@google.com>
2015-03-22 21:22:08 +00:00
!TestDefaultVersion(0, &DTLS_method) ||
!TestDefaultVersion(DTLS1_VERSION, &DTLSv1_method) ||
!TestDefaultVersion(DTLS1_2_VERSION, &DTLSv1_2_method) ||
Add tests for the padding extension. This sort of test is more suitable for ssl_test than runner. This should stress all the various cases around padding. Use tickets rather than hostnames to inflate the ClientHello because there's a fairly tight maximum hostname length. Change-Id: Ibd43aaa7acb9bf5fa00a9d2548d2101e5bb147d3 Reviewed-on: https://boringssl-review.googlesource.com/5480 Reviewed-by: Adam Langley <agl@google.com>
2015-07-22 03:03:43 +01:00
!TestCipherGetRFCName() ||
Make SSL_get_client_CA_list slightly more OpenSSL-compatible. SSL_get_client_CA_list is one of those dreaded functions which may query either configuration state or handshake state. Moreover, it does so based on |ssl->server|, which may not be configured until later. Also check |ssl->handshake_func| to make sure |ssl| is not in an indeterminate state. This also fixes a bug where SSL_get_client_CA_list wouldn't work in DTLS due to the incorrect |ssl->version| check. Change-Id: Ie564dbfeecd2c8257fd6bcb148bc5db827390c77 Reviewed-on: https://boringssl-review.googlesource.com/5827 Reviewed-by: Adam Langley <agl@google.com>
2015-09-08 22:41:40 +01:00
!TestPaddingExtension() ||
Add tests for the internal session cache behavior. In doing so, fix the documentation for SSL_CTX_add_session and SSL_CTX_remove_session. I misread the code and documented the behavior on session ID collision wrong. Change-Id: I6f364305e1f092b9eb0b1402962fd04577269d30 Reviewed-on: https://boringssl-review.googlesource.com/6319 Reviewed-by: Adam Langley <alangley@gmail.com>
2015-10-18 19:28:01 +01:00
!TestClientCAList() ||
!TestInternalSessionCache()) {
Rename BIO_print_errors_fp back to ERR_print_errors_fp & refactor it. A previous change in BoringSSL renamed ERR_print_errors_fp to BIO_print_errors_fp as part of refactoring the code to improve the layering of modules within BoringSSL. Rename it back for better compatibility with code that was using the function under the original name. Move its definition back to crypto/err using an implementation that avoids depending on crypto/bio. Change-Id: Iee7703bb1eb4a3d640aff6485712bea71d7c1052 Reviewed-on: https://boringssl-review.googlesource.com/4310 Reviewed-by: Adam Langley <agl@google.com>
2015-04-10 03:21:10 +01:00
ERR_print_errors_fp(stderr);
Add a set of tests for cipher string parsing. Change-Id: I4f9cdfa443bc5916f1899a7fc90aca2bf3c6027c Reviewed-on: https://boringssl-review.googlesource.com/1801 Reviewed-by: Adam Langley <agl@google.com>
2014-09-20 20:35:39 +01:00
return 1;
}
Fix magic SSL reason codes. SSL reason codes corresponding to alerts have special values. Teach make_errors.go that values above 1000 are reserved (otherwise it will assign new values in that namespace). Also fix all the existing reason codes which corresponded to alerts. Change-Id: Ieabdf8fd59f4802938616934e1d84e659227cf84 Reviewed-on: https://boringssl-review.googlesource.com/1212 Reviewed-by: Adam Langley <agl@google.com>
2014-07-16 19:37:51 +01:00
printf("PASS\n");
return 0;
}
Reference in New Issue Copy Permalink