summaryrefslogtreecommitdiff
path: root/cesar/cp/secu
diff options
context:
space:
mode:
authorlaranjeiro2009-01-29 14:24:01 +0000
committerlaranjeiro2009-01-29 14:24:01 +0000
commit34c92b0e279dd982cdde0b0aef275c9d82195354 (patch)
tree35a619b6222b0941d62390dbf9eef12230f0d144 /cesar/cp/secu
parentb78b1b44894833cc755d7ee1f737ac885ed31fd2 (diff)
cp/secu: Changed the CP_SECU_SHA256_OUTPUT_SIZE define to CP_SECU_SHA256_SIZE
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@3896 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/cp/secu')
-rw-r--r--cesar/cp/secu/defs.h4
-rw-r--r--cesar/cp/secu/src/pbkdf1.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/cesar/cp/secu/defs.h b/cesar/cp/secu/defs.h
index d17a68aadb..9a7a9173d5 100644
--- a/cesar/cp/secu/defs.h
+++ b/cesar/cp/secu/defs.h
@@ -20,8 +20,8 @@
/** Salt size. */
#define CP_SECU_SALT_SIZE 8
-/** SHA 256 output size. */
-#define CP_SECU_SHA256_OUTPUT_SIZE 32
+/** SHA 256 size. */
+#define CP_SECU_SHA256_SIZE 32
/** pbkdf1 generated key size */
#define CP_SECU_OUTPUT_KEY_SIZE 16
diff --git a/cesar/cp/secu/src/pbkdf1.c b/cesar/cp/secu/src/pbkdf1.c
index 0c1c7a65e9..abce6674bd 100644
--- a/cesar/cp/secu/src/pbkdf1.c
+++ b/cesar/cp/secu/src/pbkdf1.c
@@ -27,7 +27,7 @@ secu_pbkdf1 (const u8 input[], uint input_len, u8 salt[],
{
u8 dk[68] = "";
- u8 sha_output[CP_SECU_SHA256_OUTPUT_SIZE];
+ u8 sha_output[CP_SECU_SHA256_SIZE];
uint dp_size, i;
dbg_assert (input);
@@ -60,8 +60,8 @@ secu_pbkdf1 (const u8 input[], uint input_len, u8 salt[],
*/
for(i=1 ; i < it_count ; i++)
{
- memcpy (dk, sha_output, CP_SECU_SHA256_OUTPUT_SIZE);
- cp_secu_sha256 (dk, CP_SECU_SHA256_OUTPUT_SIZE, sha_output);
+ memcpy (dk, sha_output, CP_SECU_SHA256_SIZE);
+ cp_secu_sha256 (dk, CP_SECU_SHA256_SIZE, sha_output);
}
/*
* we keep only the OutputKeySize leftmost bytes