diff --git a/src/scram.c b/src/scram.c index d1850ad..5066d60 100644 --- a/src/scram.c +++ b/src/scram.c @@ -33,15 +33,6 @@ static const uint8_t ipad = 0x36; 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, const uint8_t *text, size_t len, uint8_t *digest) diff --git a/src/sha1.c b/src/sha1.c index cc84df8..0dd3d76 100644 --- a/src/sha1.c +++ b/src/sha1.c @@ -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. */ -void SHA1_Final(SHA1_CTX* context, uint8_t *digest) +void SHA1_Final(SHA1_CTX* context, uint8_t* digest) { uint32_t i; uint8_t finalcount[8]; @@ -274,7 +274,15 @@ void SHA1_Final(SHA1_CTX* context, uint8_t *digest) SHA1_Transform(context->state, context->buffer); #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 diff --git a/src/sha1.h b/src/sha1.h index d0391ae..fc6fcbf 100644 --- a/src/sha1.h +++ b/src/sha1.h @@ -25,7 +25,8 @@ typedef struct { void SHA1_Init(SHA1_CTX* context); 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 }