Add a return value to prf_t.allocate_bytes()

This commit is contained in:
Martin Willi
2012-07-16 14:53:34 +02:00
parent a7e6539135
commit ecc080b393
9 changed files with 92 additions and 43 deletions
@@ -112,18 +112,15 @@ METHOD(prf_t, get_bytes, bool,
return TRUE;
}
METHOD(prf_t, allocate_bytes, void,
METHOD(prf_t, allocate_bytes, bool,
private_af_alg_prf_t *this, chunk_t seed, chunk_t *chunk)
{
if (chunk)
{
*chunk = chunk_alloc(this->block_size);
get_bytes(this, seed, chunk->ptr);
}
else
{
get_bytes(this, seed, NULL);
return get_bytes(this, seed, chunk->ptr);
}
return get_bytes(this, seed, NULL);
}
METHOD(prf_t, get_block_size, size_t,
@@ -147,11 +147,11 @@ METHOD(prf_t, get_block_size, size_t,
{
return 2 * this->b;
}
METHOD(prf_t, allocate_bytes, void,
METHOD(prf_t, allocate_bytes, bool,
private_fips_prf_t *this, chunk_t seed, chunk_t *chunk)
{
*chunk = chunk_alloc(get_block_size(this));
get_bytes(this, seed, chunk->ptr);
return get_bytes(this, seed, chunk->ptr);
}
METHOD(prf_t, get_key_size, size_t,
@@ -60,18 +60,15 @@ METHOD(prf_t, get_block_size, size_t,
return HASH_SIZE_SHA1;
}
METHOD(prf_t, allocate_bytes, void,
METHOD(prf_t, allocate_bytes, bool,
private_openssl_sha1_prf_t *this, chunk_t seed, chunk_t *chunk)
{
if (chunk)
{
*chunk = chunk_alloc(HASH_SIZE_SHA1);
get_bytes(this, seed, chunk->ptr);
}
else
{
get_bytes(this, seed, NULL);
return get_bytes(this, seed, chunk->ptr);
}
return get_bytes(this, seed, NULL);
}
METHOD(prf_t, get_key_size, size_t,
+2 -2
View File
@@ -81,11 +81,11 @@ METHOD(prf_t, get_block_size, size_t,
return HASH_SIZE_SHA1;
}
METHOD(prf_t, allocate_bytes, void,
METHOD(prf_t, allocate_bytes, bool,
private_sha1_prf_t *this, chunk_t seed, chunk_t *chunk)
{
*chunk = chunk_alloc(HASH_SIZE_SHA1);
get_bytes(this, seed, chunk->ptr);
return get_bytes(this, seed, chunk->ptr);
}
METHOD(prf_t, get_key_size, size_t,