Add a return value to signer_t.set_key()

This commit is contained in:
Martin Willi
2012-07-16 14:53:33 +02:00
parent 9020f7d0b9
commit 2d56575d52
10 changed files with 56 additions and 20 deletions
+10 -4
View File
@@ -1522,13 +1522,19 @@ static bool expand_keys(private_tls_crypto_t *this,
block = chunk_skip(block, mks);
if (this->tls->is_server(this->tls))
{
this->signer_in->set_key(this->signer_in, client_write);
this->signer_out->set_key(this->signer_out, server_write);
if (!this->signer_in->set_key(this->signer_in, client_write) ||
!this->signer_out->set_key(this->signer_out, server_write))
{
return FALSE;
}
}
else
{
this->signer_out->set_key(this->signer_out, client_write);
this->signer_in->set_key(this->signer_in, server_write);
if (!this->signer_out->set_key(this->signer_out, client_write) ||
!this->signer_in->set_key(this->signer_in, server_write))
{
return FALSE;
}
}
/* crypter keys, and IVs if < TLSv1.2 */