denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tls-peer: Fix parsing of encrypted extensions

Browse Source
This commit is contained in:
Tobias Brunner
2021-02-12 11:45:44 +01:00
parent 4c40a3d3f0
commit f0ed5f9125
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libtls/tls_peer.c
+1 -4
View File
@@ -289,7 +289,6 @@ static status_t process_server_hello(private_tls_peer_t *this,
static status_t process_encrypted_extensions(private_tls_peer_t *this, static status_t process_encrypted_extensions(private_tls_peer_t *this,
bio_reader_t *reader) bio_reader_t *reader)
{ {
uint16_t length;
chunk_t ext = chunk_empty; chunk_t ext = chunk_empty;
int offset = 0; int offset = 0;
uint16_t extension_type, extension_length; uint16_t extension_type, extension_length;
@@ -297,9 +296,7 @@ static status_t process_encrypted_extensions(private_tls_peer_t *this,
this->crypto->append_handshake(this->crypto, this->crypto->append_handshake(this->crypto,
TLS_ENCRYPTED_EXTENSIONS, reader->peek(reader)); TLS_ENCRYPTED_EXTENSIONS, reader->peek(reader));
if (!reader->read_data16(reader, &ext))
if (!reader->read_uint16(reader, &length) ||
(reader->remaining(reader) && !reader->read_data16(reader, &ext)))
{ {
DBG1(DBG_TLS, "received invalid EncryptedExtensions"); DBG1(DBG_TLS, "received invalid EncryptedExtensions");
this->alert->add(this->alert, TLS_FATAL, TLS_DECODE_ERROR); this->alert->add(this->alert, TLS_FATAL, TLS_DECODE_ERROR);