summaryrefslogtreecommitdiff
path: root/cesar/cp2/secu/src/sha256.c
diff options
context:
space:
mode:
authorlaranjeiro2008-06-18 08:25:22 +0000
committerlaranjeiro2008-06-18 08:25:22 +0000
commiteb60ad32988c4e7bb2b76f0c306e53117f83cfcf (patch)
treeb1f4ab56948cd53ef8c107175cc2393b976e9970 /cesar/cp2/secu/src/sha256.c
parent0fd2d8f0155f05edbb056988d5d0152298f01e21 (diff)
cp2/secu : SHA256 tested on x86.
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@2371 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/cp2/secu/src/sha256.c')
-rw-r--r--cesar/cp2/secu/src/sha256.c33
1 files changed, 6 insertions, 27 deletions
diff --git a/cesar/cp2/secu/src/sha256.c b/cesar/cp2/secu/src/sha256.c
index 77f4886c87..93a0414c2d 100644
--- a/cesar/cp2/secu/src/sha256.c
+++ b/cesar/cp2/secu/src/sha256.c
@@ -23,27 +23,12 @@
#include "cp2/secu/inc/sha256.h"
-//#define GET_UINT32(n,b,i) \
-//{ \
-// (n) = ( (uint32) (b)[(i) ] << 24 ) \
-// | ( (uint32) (b)[(i) + 1] << 16 ) \
-// | ( (uint32) (b)[(i) + 2] << 8 ) \
-// | ( (uint32) (b)[(i) + 3] ); \
-//}
-//
-//#define PUT_UINT32(n,b,i) \
-//{ \
-// (b)[(i) ] = (uint8) ( (n) >> 24 ); \
-// (b)[(i) + 1] = (uint8) ( (n) >> 16 ); \
-// (b)[(i) + 2] = (uint8) ( (n) >> 8 ); \
-// (b)[(i) + 3] = (uint8) ( (n) ); \
-//}
-
#define GET_UINT32(n,b,i) \
{ \
- uint _tmp = b[i + 3] << 24 | b[i + 2] << 16 \
- | b[i + 1] << 8 | b[i]; \
- (n) = swap32(_tmp); \
+ (n) = ( (uint32) (b)[(i) ] << 24 ) \
+ | ( (uint32) (b)[(i) + 1] << 16 ) \
+ | ( (uint32) (b)[(i) + 2] << 8 ) \
+ | ( (uint32) (b)[(i) + 3] ); \
}
#define PUT_UINT32(n,b,i) \
@@ -281,18 +266,12 @@ void sha256_finish( sha256_context *ctx, uint8 digest[32] )
void
cp_secu_sha256 (u8 *buffer)
{
- uint sha256sum[8];
- uint i;
+ u8 sha256sum[32];
sha256_context ctx;
sha256_starts(&ctx);
sha256_update(&ctx, (u8 *) buffer, strlen((char *)buffer));
sha256_finish(&ctx, (u8*) sha256sum);
- for (i = 0; i < 8; i++)
- {
- sha256sum[i] = swap32(sha256sum[i]);
- }
-
- memcpy (buffer, sha256sum, 64);
+ memcpy (buffer, sha256sum, 32);
}