aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/charon/config/proposal.c10
-rw-r--r--src/charon/sa/keymat.c2
2 files changed, 2 insertions, 10 deletions
diff --git a/src/charon/config/proposal.c b/src/charon/config/proposal.c
index 1421d5e97..11143a4a6 100644
--- a/src/charon/config/proposal.c
+++ b/src/charon/config/proposal.c
@@ -210,21 +210,13 @@ static bool get_algorithm(private_proposal_t *this, transform_type_t type,
u_int16_t *alg, u_int16_t *key_size)
{
enumerator_t *enumerator;
- bool found;
+ bool found = FALSE;
enumerator = create_enumerator(this, type);
if (enumerator->enumerate(enumerator, alg, key_size))
{
found = TRUE;
}
- else
- {
- if (key_size)
- {
- *key_size = 0;
- }
- found = FALSE;
- }
enumerator->destroy(enumerator);
return found;
}
diff --git a/src/charon/sa/keymat.c b/src/charon/sa/keymat.c
index c2a899d0d..c65bfc3b7 100644
--- a/src/charon/sa/keymat.c
+++ b/src/charon/sa/keymat.c
@@ -357,7 +357,7 @@ static bool derive_child_keys(private_keymat_t *this,
chunk_t *encr_i, chunk_t *integ_i,
chunk_t *encr_r, chunk_t *integ_r)
{
- u_int16_t enc_alg, int_alg, enc_size, int_size;
+ u_int16_t enc_alg, int_alg, enc_size = 0, int_size = 0;
chunk_t seed, secret = chunk_empty;
prf_plus_t *prf_plus;