diff options
author | Martin Willi <martin@revosec.ch> | 2012-07-06 09:28:25 +0200 |
---|---|---|
committer | Martin Willi <martin@revosec.ch> | 2012-07-16 14:53:33 +0200 |
commit | 9020f7d0b953a66f5da976ed25163746afa519d3 (patch) | |
tree | 8367f124bcc9f6f2ad6494ed788541960cb0748e /src/libtls/tls_server.c | |
parent | 86d2cdc1edd26598ddc990b4e081db0ab828d461 (diff) | |
download | strongswan-9020f7d0b953a66f5da976ed25163746afa519d3.tar.bz2 strongswan-9020f7d0b953a66f5da976ed25163746afa519d3.tar.xz |
Add a return value to tls_crypto_t.derive_secrets()
Diffstat (limited to 'src/libtls/tls_server.c')
-rw-r--r-- | src/libtls/tls_server.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/libtls/tls_server.c b/src/libtls/tls_server.c index e3617dc9a..8d6a9336d 100644 --- a/src/libtls/tls_server.c +++ b/src/libtls/tls_server.c @@ -436,10 +436,14 @@ static status_t process_key_exchange_encrypted(private_tls_server_t *this, DBG1(DBG_TLS, "decrypting Client Key Exchange failed"); } - this->crypto->derive_secrets(this->crypto, chunk_from_thing(premaster), - this->session, this->peer, - chunk_from_thing(this->client_random), - chunk_from_thing(this->server_random)); + if (!this->crypto->derive_secrets(this->crypto, chunk_from_thing(premaster), + this->session, this->peer, + chunk_from_thing(this->client_random), + chunk_from_thing(this->server_random))) + { + this->alert->add(this->alert, TLS_FATAL, TLS_INTERNAL_ERROR); + return NEED_MORE; + } this->state = STATE_KEY_EXCHANGE_RECEIVED; return NEED_MORE; @@ -485,10 +489,15 @@ static status_t process_key_exchange_dhe(private_tls_server_t *this, return NEED_MORE; } - this->crypto->derive_secrets(this->crypto, premaster, - this->session, this->peer, - chunk_from_thing(this->client_random), - chunk_from_thing(this->server_random)); + if (!this->crypto->derive_secrets(this->crypto, premaster, + this->session, this->peer, + chunk_from_thing(this->client_random), + chunk_from_thing(this->server_random))) + { + this->alert->add(this->alert, TLS_FATAL, TLS_INTERNAL_ERROR); + chunk_clear(&premaster); + return NEED_MORE; + } chunk_clear(&premaster); this->state = STATE_KEY_EXCHANGE_RECEIVED; |