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

Add a return value to mac_t.get_bytes()

Browse Source
This commit is contained in:
Martin Willi
2012-07-16 14:53:37 +02:00
parent 76a98ee2a1
commit 27e1eabbb5
7 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/crypto/signers/mac_signer.c
+16 -17
View File
@@ -43,37 +43,36 @@ struct private_signer_t {
METHOD(signer_t, get_signature, bool,
private_signer_t *this, chunk_t data, u_int8_t *buffer)
{
if (buffer == NULL)
{
this->mac->get_mac(this->mac, data, NULL);
}
else
if (buffer)
{
u_int8_t mac[this->mac->get_mac_size(this->mac)];
this->mac->get_mac(this->mac, data, mac);
if (!this->mac->get_mac(this->mac, data, mac))
{
return FALSE;
}
memcpy(buffer, mac, this->truncation);
return TRUE;
}
return TRUE;
return this->mac->get_mac(this->mac, data, NULL);
}
METHOD(signer_t, allocate_signature, bool,
private_signer_t *this, chunk_t data, chunk_t *chunk)
{
if (chunk == NULL)
{
this->mac->get_mac(this->mac, data, NULL);
}
else
if (chunk)
{
u_int8_t mac[this->mac->get_mac_size(this->mac)];
this->mac->get_mac(this->mac, data, mac);
if (!this->mac->get_mac(this->mac, data, mac))
{
return FALSE;
}
*chunk = chunk_alloc(this->truncation);
memcpy(chunk->ptr, mac, this->truncation);
return TRUE;
}
return TRUE;
return this->mac->get_mac(this->mac, data, NULL);
}
METHOD(signer_t, verify_signature, bool,
@@ -85,8 +84,8 @@ METHOD(signer_t, verify_signature, bool,
{
return FALSE;
}
this->mac->get_mac(this->mac, data, mac);
return memeq(signature.ptr, mac, this->truncation);
return this->mac->get_mac(this->mac, data, mac) &&
memeq(signature.ptr, mac, this->truncation);
}
METHOD(signer_t, get_key_size, size_t,