Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

hashes/sha2{24,56}: Remove static variables from sha256 #20116

Merged
merged 2 commits into from
Jan 16, 2024
Merged

hashes/sha2{24,56}: Remove static variables from sha256 #20116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bac3f48
hashes/sha256: Remove static variables from sha256
bergzand Nov 29, 2023
434e564
hashes/sha224: Remove static variables from sha224
bergzand Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions sys/hashes/sha224.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*/

#include <string.h>
#include <assert.h>

#include "hashes/sha224.h"
#include "hashes/sha2xx_common.h"
Expand All @@ -40,18 +41,12 @@ void sha224_init(sha224_context_t *ctx)
ctx->state[7] = 0xBEFA4FA4;
}

void *sha224(const void *data, size_t len, void *digest)
void sha224(const void *data, size_t len, void *digest)
{
sha224_context_t c;
static unsigned char m[SHA224_DIGEST_LENGTH];

if (digest == NULL) {
digest = m;
}
assert(digest);

sha224_init(&c);
sha224_update(&c, data, len);
sha224_final(&c, digest);

return digest;
}
22 changes: 4 additions & 18 deletions sys/hashes/sha256.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,20 +68,14 @@
ctx->state[7] = 0x5BE0CD19;
}

void *sha256(const void *data, size_t len, void *digest)
void sha256(const void *data, size_t len, void *digest)
{
sha256_context_t c;
static unsigned char m[SHA256_DIGEST_LENGTH];

if (digest == NULL) {
digest = m;
}
assert(digest);

sha256_init(&c);
sha2xx_update(&c, data, len);
sha256_final(&c, digest);

return digest;
}

void hmac_sha256_init(hmac_context_t *ctx, const void *key, size_t key_length)
Expand Down Expand Up @@ -135,28 +129,20 @@
{
unsigned char tmp[SHA256_DIGEST_LENGTH];

static unsigned char m[SHA256_DIGEST_LENGTH];

if (digest == NULL) {
digest = m;
}

sha256_final(&ctx->c_in, tmp);
sha2xx_update(&ctx->c_out, tmp, SHA256_DIGEST_LENGTH);
sha256_final(&ctx->c_out, digest);
}

const void *hmac_sha256(const void *key, size_t key_length,
const void *data, size_t len, void *digest)
void hmac_sha256(const void *key, size_t key_length,
const void *data, size_t len, void *digest)
{

hmac_context_t ctx;

hmac_sha256_init(&ctx, key, key_length);
hmac_sha256_update(&ctx,data, len);

Check warning on line 144 in sys/hashes/sha256.c

View workflow job for this annotation

GitHub Actions / static-tests 

comma should be followed by whitespace
hmac_sha256_final(&ctx, digest);

return digest;
}

/**
Expand Down
5 changes: 2 additions & 3 deletions sys/include/hashes/sha224.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,10 @@ static inline void sha224_final(sha224_context_t *ctx, void *digest)
*
* @param[in] data pointer to the buffer to generate hash from
* @param[in] len length of the buffer
* @param[out] digest optional pointer to an array for the result, length must
* @param[out] digest Pointer to an array for the result, length must
* be SHA224_DIGEST_LENGTH
* if digest == NULL, one static buffer is used
*/
void *sha224(const void *data, size_t len, void *digest);
void sha224(const void *data, size_t len, void *digest);

#ifdef __cplusplus
}
Expand Down
14 changes: 4 additions & 10 deletions sys/include/hashes/sha256.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,10 @@ static inline void sha256_final(sha256_context_t *ctx, void *digest)
*
* @param[in] data pointer to the buffer to generate hash from
* @param[in] len length of the buffer
* @param[out] digest optional pointer to an array for the result, length must
* @param[out] digest Pointer to an array for the result, length must
* be SHA256_DIGEST_LENGTH
* if digest == NULL, one static buffer is used
*/
void *sha256(const void *data, size_t len, void *digest);
void sha256(const void *data, size_t len, void *digest);

/**
* @brief hmac_sha256_init HMAC SHA-256 calculation. Initiate calculation of a HMAC
Expand All @@ -153,9 +152,7 @@ void hmac_sha256_update(hmac_context_t *ctx, const void *data, size_t len);
/**
* @brief hmac_sha256_final HMAC SHA-256 finalization. Finish HMAC calculation and export the value
* @param[in] ctx hmac_context_t handle to use
* @param[out] digest the computed hmac-sha256,
* length MUST be SHA256_DIGEST_LENGTH
* if digest == NULL, a static buffer is used
* @param[out] digest the computed hmac-sha256, length MUST be SHA256_DIGEST_LENGTH
*/
void hmac_sha256_final(hmac_context_t *ctx, void *digest);

Expand All @@ -168,11 +165,8 @@ void hmac_sha256_final(hmac_context_t *ctx, void *digest);
* @param[in] len the length of the message in bytes
* @param[out] digest the computed hmac-sha256,
* length MUST be SHA256_DIGEST_LENGTH
* if digest == NULL, a static buffer is used
* @returns pointer to the resulting digest.
* if result == NULL the pointer points to the static buffer
*/
const void *hmac_sha256(const void *key, size_t key_length,
void hmac_sha256(const void *key, size_t key_length,
const void *data, size_t len, void *digest);

/**
Expand Down
Loading