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
+9 -2
View File
@@ -140,7 +140,11 @@ METHOD(simaka_crypto_t, derive_keys_full, bool,
k_auth = chunk_create(str.ptr + KENCR_LEN, KAUTH_LEN);
DBG3(DBG_LIB, "K_encr %B\nK_auth %B\nMSK %B", &k_encr, &k_auth, &msk);
this->signer->set_key(this->signer, k_auth);
if (!this->signer->set_key(this->signer, k_auth))
{
chunk_clear(mk);
return FALSE;
}
this->crypter->set_key(this->crypter, k_encr);
*msk = chunk_create(str.ptr + KENCR_LEN + KAUTH_LEN, MSK_LEN);
@@ -168,7 +172,10 @@ METHOD(simaka_crypto_t, derive_keys_reauth, bool,
k_auth = chunk_create(str.ptr + KENCR_LEN, KAUTH_LEN);
DBG3(DBG_LIB, "K_encr %B\nK_auth %B", &k_encr, &k_auth);
this->signer->set_key(this->signer, k_auth);
if (!this->signer->set_key(this->signer, k_auth))
{
return FALSE;
}
this->crypter->set_key(this->crypter, k_encr);
call_hook(this, k_encr, k_auth);