summaryrefslogtreecommitdiff
path: root/cesar/cp/secu/src/secu.c
diff options
context:
space:
mode:
Diffstat (limited to 'cesar/cp/secu/src/secu.c')
-rw-r--r--cesar/cp/secu/src/secu.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/cesar/cp/secu/src/secu.c b/cesar/cp/secu/src/secu.c
index 0e0004d3d0..0a04a96a3f 100644
--- a/cesar/cp/secu/src/secu.c
+++ b/cesar/cp/secu/src/secu.c
@@ -100,7 +100,7 @@ cp_secu_protocol_next (cp_secu_protocol_run_t *prun, bool last)
}
void
-cp_secu_aes_generate_key (const uint num, cp_key_t *output)
+cp_secu_generate_nek (const uint num, cp_key_t *output)
{
u8 input[4];
u8 buffer[sizeof(cp_key_t)];
@@ -112,7 +112,8 @@ cp_secu_aes_generate_key (const uint num, cp_key_t *output)
/* Call the real function to generate an AES key. */
cp_secu_pbkdf1 (input, sizeof (input),
buffer , sizeof(buffer),
- CP_SECU_SALT_SPIDCOM);
+ CP_SECU_SALT_SPIDCOM,
+ CP_SECU_PBKDF1_ITERATION_NEK);
GET_UINT32 (output->key[0], buffer, 0);
GET_UINT32 (output->key[1], buffer, 4);
@@ -141,7 +142,7 @@ cp_secu_nmk2nid(const cp_key_t nmk, const u8 security_level)
PUT_UINT32(nmk.key[3], input, 12);
cp_secu_pbkdf1 (input, sizeof (cp_key_t), output, CP_NID_SIZE,
- CP_SECU_SALT_KEY_NID);
+ CP_SECU_SALT_NONE, CP_SECU_PBKDF1_ITERATION_NID);
output[CP_NID_SIZE-1] = output[CP_NID_SIZE-1] >> 4;
uint w1, w2;
@@ -197,7 +198,7 @@ cp_secu_generate_hash (const u32 seed, u8 *hash, const uint hash_length)
cp_secu_pbkdf1 ((u8 *) &seed, sizeof (seed),
&hash[compt * CP_SECU_OUTPUT_KEY_SIZE],
CP_SECU_OUTPUT_KEY_SIZE,
- CP_SECU_SALT_SPIDCOM);
+ CP_SECU_SALT_SPIDCOM, CP_SECU_PBKDF1_ITERATION);
}
/* Check if last part is not enought for CP_SECU_OUTPUT_KEY_SIZE. */
uint modulo = hash_length % CP_SECU_OUTPUT_KEY_SIZE;
@@ -206,7 +207,7 @@ cp_secu_generate_hash (const u32 seed, u8 *hash, const uint hash_length)
cp_secu_pbkdf1 ((u8 *) &seed, sizeof (seed),
&hash[iteration * CP_SECU_OUTPUT_KEY_SIZE],
modulo,
- CP_SECU_SALT_SPIDCOM);
+ CP_SECU_SALT_SPIDCOM, CP_SECU_PBKDF1_ITERATION);
}
}