diff options
author | Hanno Becker <hanno.becker@arm.com> | 2019-08-30 10:42:49 +0100 |
---|---|---|
committer | Hanno Becker <hanno.becker@arm.com> | 2019-08-30 12:14:25 +0100 |
commit | 361b10d1c4e25816c4f9a16708586b3bae9c1673 (patch) | |
tree | ec9f59ac8d51844e0de016bb35ebf6a61c51419b | |
parent | 3ec504738ec6810ec57821aec90d93e2b02ecebe (diff) | |
download | mbedtls-361b10d1c4e25816c4f9a16708586b3bae9c1673.zip mbedtls-361b10d1c4e25816c4f9a16708586b3bae9c1673.tar.gz mbedtls-361b10d1c4e25816c4f9a16708586b3bae9c1673.tar.bz2 |
Fix SSL context deserialization
The SSL context maintains a set of 'out pointers' indicating the
address at which to write the header fields of the next outgoing
record. Some of these addresses have a static offset from the
beginning of the record header, while other offsets can vary
depending on the active record encryption mechanism: For example,
if an explicit IV is in use, there's an offset between the end
of the record header and the beginning of the encrypted data to
allow the explicit IV to be placed in between; also, if the DTLS
Connection ID (CID) feature is in use, the CID is part of the
record header, shifting all subsequent information (length, IV, data)
to the back.
When setting up an SSL context, the out pointers are initialized
according to the identity transform + no CID, and it is important
to keep them up to date whenever the record encryption mechanism
changes, which is done by the helper function ssl_update_out_pointers().
During context deserialization, updating the out pointers according
to the deserialized record transform went missing, leaving the out
pointers the initial state. When attemping to encrypt a record in
this state, this lead to failure if either a CID or an explicit IV
was in use. This wasn't caught in the tests by the bad luck that
they didn't use CID, _and_ used the default ciphersuite based on
ChaChaPoly, which doesn't have an explicit IV. Changing either of
this would have made the existing tests fail.
This commit fixes the bug by adding a call to ssl_update_out_pointers()
to ssl_context_load() implementing context deserialization.
Extending test coverage is left for a separate commit.
-rw-r--r-- | library/ssl_tls.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/library/ssl_tls.c b/library/ssl_tls.c index e06c06d..f4bca87 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -11950,6 +11950,10 @@ static int ssl_context_load( mbedtls_ssl_context *ssl, ssl->major_ver = MBEDTLS_SSL_MAJOR_VERSION_3; ssl->minor_ver = MBEDTLS_SSL_MINOR_VERSION_3; + /* Adjust pointers for header fields of outgoing records to + * the given transform, accounting for explicit IV and CID. */ + ssl_update_out_pointers( ssl, ssl->transform ); + #if defined(MBEDTLS_SSL_PROTO_DTLS) ssl->in_epoch = 1; #endif |