diff options
| author | David Benjamin <davidben@chromium.org> | 2015-11-26 10:16:49 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-12-16 21:36:57 +0300 |
| commit | a41280d8cb60fdc519ea79dcc072009d07d1a4ed (patch) | |
| tree | 494c8a76a8a0fa72663683079ff27832543b6b6b /ssl/test | |
| parent | 8fd5c23218e38d728dd13e6fddd065d68fea2a00 (diff) | |
Pull ChangeCipherSpec into the handshake state machine.
This uses ssl3_read_bytes for now. We still need to dismantle that
function and then invert the handshake state machine, but this gets
things closer to the right shape as an intermediate step and is a large
chunk in itself. It simplifies a lot of the CCS/handshake
synchronization as a lot of the invariants much more clearly follow from
the handshake itself.
Tests need to be adjusted since this changes some error codes. Now all
the CCS/Handshake checks fall through to the usual
SSL_R_UNEXPECTED_RECORD codepath. Most of what used to be a special-case
falls out naturally. (If half of Finished was in the same record as the
pre-CCS message, that part of the handshake record would have been left
unconsumed, so read_change_cipher_spec would have noticed, just like
read_app_data would have noticed.)
Change-Id: I15c7501afe523d5062f0e24a3b65f053008d87be
Reviewed-on: https://boringssl-review.googlesource.com/6642
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'ssl/test')
| -rw-r--r-- | ssl/test/runner/runner.go | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ssl/test/runner/runner.go b/ssl/test/runner/runner.go index 5af93df6..4748dd51 100644 --- a/ssl/test/runner/runner.go +++ b/ssl/test/runner/runner.go @@ -994,7 +994,7 @@ func addBasicTests() { }, }, shouldFail: true, - expectedError: ":HANDSHAKE_RECORD_BEFORE_CCS:", + expectedError: ":UNEXPECTED_RECORD:", }, { testType: serverTest, @@ -1005,7 +1005,7 @@ func addBasicTests() { }, }, shouldFail: true, - expectedError: ":HANDSHAKE_RECORD_BEFORE_CCS:", + expectedError: ":UNEXPECTED_RECORD:", }, { testType: serverTest, @@ -1020,7 +1020,7 @@ func addBasicTests() { "-advertise-npn", "\x03foo\x03bar\x03baz", }, shouldFail: true, - expectedError: ":HANDSHAKE_RECORD_BEFORE_CCS:", + expectedError: ":UNEXPECTED_RECORD:", }, { name: "FragmentAcrossChangeCipherSpec-Client", @@ -1030,7 +1030,7 @@ func addBasicTests() { }, }, shouldFail: true, - expectedError: ":HANDSHAKE_RECORD_BEFORE_CCS:", + expectedError: ":UNEXPECTED_RECORD:", }, { testType: serverTest, @@ -1041,7 +1041,7 @@ func addBasicTests() { }, }, shouldFail: true, - expectedError: ":HANDSHAKE_RECORD_BEFORE_CCS:", + expectedError: ":UNEXPECTED_RECORD:", }, { testType: serverTest, @@ -1056,7 +1056,7 @@ func addBasicTests() { "-advertise-npn", "\x03foo\x03bar\x03baz", }, shouldFail: true, - expectedError: ":HANDSHAKE_RECORD_BEFORE_CCS:", + expectedError: ":UNEXPECTED_RECORD:", }, { testType: serverTest, @@ -1115,7 +1115,7 @@ func addBasicTests() { }, }, shouldFail: true, - expectedError: ":CCS_RECEIVED_EARLY:", + expectedError: ":UNEXPECTED_RECORD:", }, { testType: serverTest, @@ -1126,7 +1126,7 @@ func addBasicTests() { }, }, shouldFail: true, - expectedError: ":CCS_RECEIVED_EARLY:", + expectedError: ":UNEXPECTED_RECORD:", }, { name: "SkipNewSessionTicket", @@ -1136,7 +1136,7 @@ func addBasicTests() { }, }, shouldFail: true, - expectedError: ":CCS_RECEIVED_EARLY:", + expectedError: ":UNEXPECTED_RECORD:", }, { testType: serverTest, @@ -1413,7 +1413,7 @@ func addBasicTests() { }, }, shouldFail: true, - expectedError: ":DATA_BETWEEN_CCS_AND_FINISHED:", + expectedError: ":UNEXPECTED_RECORD:", }, { name: "AppDataAfterChangeCipherSpec-Empty", @@ -1423,7 +1423,7 @@ func addBasicTests() { }, }, shouldFail: true, - expectedError: ":DATA_BETWEEN_CCS_AND_FINISHED:", + expectedError: ":UNEXPECTED_RECORD:", }, { protocol: dtls, |