diff options
Diffstat (limited to 'src/libstrongswan')
| -rw-r--r-- | src/libstrongswan/crypto/crypto_tester.c | 9 | ||||
| -rw-r--r-- | src/libstrongswan/crypto/prfs/mac_prf.c | 3 | ||||
| -rw-r--r-- | src/libstrongswan/crypto/prfs/prf.h | 4 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/af_alg/af_alg_prf.c | 9 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/fips_prf/fips_prf.c | 4 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/openssl/openssl_sha1_prf.c | 9 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/sha1/sha1_prf.c | 4 |
7 files changed, 21 insertions, 21 deletions
diff --git a/src/libstrongswan/crypto/crypto_tester.c b/src/libstrongswan/crypto/crypto_tester.c index 469059371..8398bc80b 100644 --- a/src/libstrongswan/crypto/crypto_tester.c +++ b/src/libstrongswan/crypto/crypto_tester.c @@ -847,7 +847,10 @@ METHOD(crypto_tester_t, test_prf, bool, /* allocated bytes */ seed = chunk_create(vector->seed, vector->len); - prf->allocate_bytes(prf, seed, &out); + if (!prf->allocate_bytes(prf, seed, &out)) + { + failed = TRUE; + } if (out.len != prf->get_block_size(prf)) { failed = TRUE; @@ -878,8 +881,8 @@ METHOD(crypto_tester_t, test_prf, bool, { prf->set_key(prf, key); } - prf->allocate_bytes(prf, chunk_create(seed.ptr, 1), NULL); - if (!prf->get_bytes(prf, chunk_create(seed.ptr + 1, 1), NULL) || + if (!prf->allocate_bytes(prf, chunk_create(seed.ptr, 1), NULL) || + !prf->get_bytes(prf, chunk_create(seed.ptr + 1, 1), NULL) || !prf->get_bytes(prf, chunk_skip(seed, 2), out.ptr)) { failed = TRUE; diff --git a/src/libstrongswan/crypto/prfs/mac_prf.c b/src/libstrongswan/crypto/prfs/mac_prf.c index 489797fb7..cd39586af 100644 --- a/src/libstrongswan/crypto/prfs/mac_prf.c +++ b/src/libstrongswan/crypto/prfs/mac_prf.c @@ -42,7 +42,7 @@ METHOD(prf_t, get_bytes, bool, return TRUE; } -METHOD(prf_t, allocate_bytes, void, +METHOD(prf_t, allocate_bytes, bool, private_prf_t *this, chunk_t seed, chunk_t *chunk) { if (!chunk) @@ -54,6 +54,7 @@ METHOD(prf_t, allocate_bytes, void, *chunk = chunk_alloc(this->mac->get_mac_size(this->mac)); this->mac->get_mac(this->mac, seed, chunk->ptr); } + return TRUE; } METHOD(prf_t, get_block_size, size_t, diff --git a/src/libstrongswan/crypto/prfs/prf.h b/src/libstrongswan/crypto/prfs/prf.h index 8b98b41aa..05380b5f2 100644 --- a/src/libstrongswan/crypto/prfs/prf.h +++ b/src/libstrongswan/crypto/prfs/prf.h @@ -87,8 +87,10 @@ struct prf_t { * * @param seed a chunk containing the seed for the next bytes * @param chunk chunk which will hold generated bytes + * @return TRUE if bytes allocated and generated successfully */ - void (*allocate_bytes) (prf_t *this, chunk_t seed, chunk_t *chunk); + __attribute__((warn_unused_result)) + bool (*allocate_bytes) (prf_t *this, chunk_t seed, chunk_t *chunk); /** * Get the block size of this prf_t object. diff --git a/src/libstrongswan/plugins/af_alg/af_alg_prf.c b/src/libstrongswan/plugins/af_alg/af_alg_prf.c index 5b12adfc2..14df57307 100644 --- a/src/libstrongswan/plugins/af_alg/af_alg_prf.c +++ b/src/libstrongswan/plugins/af_alg/af_alg_prf.c @@ -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, diff --git a/src/libstrongswan/plugins/fips_prf/fips_prf.c b/src/libstrongswan/plugins/fips_prf/fips_prf.c index ae5ed98f2..8c4dc9e14 100644 --- a/src/libstrongswan/plugins/fips_prf/fips_prf.c +++ b/src/libstrongswan/plugins/fips_prf/fips_prf.c @@ -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, diff --git a/src/libstrongswan/plugins/openssl/openssl_sha1_prf.c b/src/libstrongswan/plugins/openssl/openssl_sha1_prf.c index 03b7fa08b..1c6dbd821 100644 --- a/src/libstrongswan/plugins/openssl/openssl_sha1_prf.c +++ b/src/libstrongswan/plugins/openssl/openssl_sha1_prf.c @@ -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, diff --git a/src/libstrongswan/plugins/sha1/sha1_prf.c b/src/libstrongswan/plugins/sha1/sha1_prf.c index f3e44ed65..1ce375087 100644 --- a/src/libstrongswan/plugins/sha1/sha1_prf.c +++ b/src/libstrongswan/plugins/sha1/sha1_prf.c @@ -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, |