sha1: moved wrapper SHA1() to sha1.c

This commit is contained in:
Dmitry Podgorny
2014-09-08 15:04:29 +03:00
parent 109aaa71a5
commit 75b1a633d6
3 changed files with 12 additions and 12 deletions

View File

@@ -33,15 +33,6 @@
static const uint8_t ipad = 0x36; static const uint8_t ipad = 0x36;
static const uint8_t opad = 0x5C; static const uint8_t opad = 0x5C;
static void SHA1(const uint8_t* data, size_t len,
uint8_t * digest)
{
SHA1_CTX ctx;
SHA1_Init(&ctx);
SHA1_Update(&ctx, data, len);
SHA1_Final(&ctx, digest);
}
static void HMAC_SHA1(const uint8_t *key, size_t key_len, static void HMAC_SHA1(const uint8_t *key, size_t key_len,
const uint8_t *text, size_t len, const uint8_t *text, size_t len,
uint8_t *digest) uint8_t *digest)

View File

@@ -244,7 +244,7 @@ void SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len)
/* Add padding and return the message digest. */ /* Add padding and return the message digest. */
void SHA1_Final(SHA1_CTX* context, uint8_t *digest) void SHA1_Final(SHA1_CTX* context, uint8_t* digest)
{ {
uint32_t i; uint32_t i;
uint8_t finalcount[8]; uint8_t finalcount[8];
@@ -275,6 +275,14 @@ void SHA1_Final(SHA1_CTX* context, uint8_t *digest)
#endif #endif
} }
void SHA1(const uint8_t* data, size_t len, uint8_t* digest)
{
SHA1_CTX ctx;
SHA1_Init(&ctx);
SHA1_Update(&ctx, data, len);
SHA1_Final(&ctx, digest);
}
/*************************************************************/ /*************************************************************/
#if 0 #if 0

View File

@@ -25,7 +25,8 @@ typedef struct {
void SHA1_Init(SHA1_CTX* context); void SHA1_Init(SHA1_CTX* context);
void SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len); void SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len);
void SHA1_Final(SHA1_CTX* context, uint8_t *digest); void SHA1_Final(SHA1_CTX* context, uint8_t* digest);
void SHA1(const uint8_t* data, size_t len, uint8_t* digest);
#ifdef __cplusplus #ifdef __cplusplus
} }