Skip to content

Commit c03ca6c

Browse files
renaming sha256 functions to avoid clashing with esp8266:esp8266:huzzah
1 parent 0d100c3 commit c03ca6c

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

src/sha256/SHA256.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
namespace arduino { namespace sha256 {
1616

1717
inline void begin(sha256_ctx * ctx) {
18-
return sha256_init(ctx);
18+
return acu_sha256_init(ctx);
1919
}
2020
inline void update(sha256_ctx *ctx, const uint8_t *input, uint32_t length) {
21-
return sha256_update(ctx, input, length);
21+
return acu_sha256_update(ctx, input, length);
2222
}
2323
inline void finalize(sha256_ctx * ctx, uint8_t digest[SHA256_DIGEST_SIZE]) {
24-
return sha256_final(ctx, digest);
24+
return acu_sha256_final(ctx, digest);
2525
}
2626
inline void sha256(const unsigned char *input, unsigned int ilen, unsigned char *output) {
2727
::sha256(input, ilen, output);

src/sha256/sha2.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -245,16 +245,16 @@ static void sha256_transf(sha256_ctx *ctx, const uint8_t *message,
245245

246246
/* SHA-256 functions */
247247

248-
void sha256(const uint8_t *message, uint64_t len, uint8_t *digest)
248+
void acu_sha256(const uint8_t *message, uint64_t len, uint8_t *digest)
249249
{
250250
sha256_ctx ctx;
251251

252-
sha256_init(&ctx);
253-
sha256_update(&ctx, message, len);
254-
sha256_final(&ctx, digest);
252+
acu_sha256_init(&ctx);
253+
acu_sha256_update(&ctx, message, len);
254+
acu_sha256_final(&ctx, digest);
255255
}
256256

257-
void sha256_init(sha256_ctx *ctx)
257+
void acu_sha256_init(sha256_ctx *ctx)
258258
{
259259
#ifndef UNROLL_LOOPS
260260
int i;
@@ -272,7 +272,7 @@ void sha256_init(sha256_ctx *ctx)
272272
ctx->tot_len = 0;
273273
}
274274

275-
void sha256_update(sha256_ctx *ctx, const uint8_t *message, uint64_t len)
275+
void acu_sha256_update(sha256_ctx *ctx, const uint8_t *message, uint64_t len)
276276
{
277277
uint64_t block_nb;
278278
uint64_t new_len, rem_len, tmp_len;
@@ -304,7 +304,7 @@ void sha256_update(sha256_ctx *ctx, const uint8_t *message, uint64_t len)
304304
ctx->tot_len += (block_nb + 1) << 6;
305305
}
306306

307-
void sha256_final(sha256_ctx *ctx, uint8_t *digest)
307+
void acu_sha256_final(sha256_ctx *ctx, uint8_t *digest)
308308
{
309309
uint64_t block_nb;
310310
uint64_t pm_len;

src/sha256/sha2.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ typedef struct {
5151
uint32_t h[8];
5252
} sha256_ctx;
5353

54-
void sha256_init(sha256_ctx * ctx);
55-
void sha256_update(sha256_ctx *ctx, const uint8_t *message, uint64_t len);
56-
void sha256_final(sha256_ctx *ctx, uint8_t *digest);
57-
void sha256(const uint8_t *message, uint64_t len, uint8_t *digest);
54+
void acu_sha256_init(sha256_ctx * ctx);
55+
void acu_sha256_update(sha256_ctx *ctx, const uint8_t *message, uint64_t len);
56+
void acu_sha256_final(sha256_ctx *ctx, uint8_t *digest);
57+
void acu_sha256(const uint8_t *message, uint64_t len, uint8_t *digest);
5858

5959
#ifdef __cplusplus
6060
}

0 commit comments

Comments
 (0)