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

Add a return value to mac_t.set_key()

Browse Source
This commit is contained in:
Martin Willi
2012-07-16 14:53:37 +02:00
parent 27e1eabbb5
commit 6ac8d861d9
7 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/xcbc/xcbc.c
+8 -3
View File
@@ -198,7 +198,7 @@ METHOD(mac_t, get_mac_size, size_t,
return this->b;
}
METHOD(mac_t, set_key, void,
METHOD(mac_t, set_key, bool,
private_mac_t *this, chunk_t key)
{
chunk_t iv, k1, lengthened;
@@ -218,8 +218,11 @@ METHOD(mac_t, set_key, void,
{ /* shorten key using xcbc */
lengthened = chunk_alloca(this->b);
memset(lengthened.ptr, 0, lengthened.len);
set_key(this, lengthened);
get_mac(this, key, lengthened.ptr);
if (!set_key(this, lengthened) ||
!get_mac(this, key, lengthened.ptr))
{
return FALSE;
}
}
k1 = chunk_alloca(this->b);
@@ -243,6 +246,8 @@ METHOD(mac_t, set_key, void,
this->k1->set_key(this->k1, k1);
memwipe(k1.ptr, k1.len);
return TRUE;
}
METHOD(mac_t, destroy, void,