mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extmod/moduhashlib: Add namespace prefix for crypto-algorithms/sha256.h. 

Everyone loves to names similar things the same, then there're conflicts
between different libraries. The namespace prefix used is "CRYAL_", which
is weird, and that's good, as that minimizes chance of another conflict.
This commit is contained in:
Paul Sokolovsky 2015-12-20 16:57:57 +02:00
parent 664bc44f30
commit 1b7f622410
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extmod/crypto-algorithms/sha256.c
View File

@ -41,7 +41,7 @@ static const WORD k[64] = {
}; };
/*********************** FUNCTION DEFINITIONS ***********************/ /*********************** FUNCTION DEFINITIONS ***********************/
static void sha256_transform(SHA256_CTX *ctx, const BYTE data[]) static void sha256_transform(CRYAL_SHA256_CTX *ctx, const BYTE data[])
{ {
WORD a, b, c, d, e, f, g, h, i, j, t1, t2, m[64]; WORD a, b, c, d, e, f, g, h, i, j, t1, t2, m[64];
@ -82,7 +82,7 @@ static void sha256_transform(SHA256_CTX *ctx, const BYTE data[])
ctx->state[7] += h; ctx->state[7] += h;
} }
void sha256_init(SHA256_CTX *ctx) void sha256_init(CRYAL_SHA256_CTX *ctx)
{ {
ctx->datalen = 0; ctx->datalen = 0;
ctx->bitlen = 0; ctx->bitlen = 0;
@ -96,7 +96,7 @@ void sha256_init(SHA256_CTX *ctx)
ctx->state[7] = 0x5be0cd19; ctx->state[7] = 0x5be0cd19;
} }
void sha256_update(SHA256_CTX *ctx, const BYTE data[], size_t len) void sha256_update(CRYAL_SHA256_CTX *ctx, const BYTE data[], size_t len)
{ {
WORD i; WORD i;
@ -111,7 +111,7 @@ void sha256_update(SHA256_CTX *ctx, const BYTE data[], size_t len)
} }
} }
void sha256_final(SHA256_CTX *ctx, BYTE hash[]) void sha256_final(CRYAL_SHA256_CTX *ctx, BYTE hash[])
{ {
WORD i; WORD i;

8
extmod/crypto-algorithms/sha256.h
View File

@ -24,11 +24,11 @@ typedef struct {
WORD datalen; WORD datalen;
unsigned long long bitlen; unsigned long long bitlen;
WORD state[8]; WORD state[8];
} SHA256_CTX; } CRYAL_SHA256_CTX;
/*********************** FUNCTION DECLARATIONS **********************/ /*********************** FUNCTION DECLARATIONS **********************/
void sha256_init(SHA256_CTX *ctx); void sha256_init(CRYAL_SHA256_CTX *ctx);
void sha256_update(SHA256_CTX *ctx, const BYTE data[], size_t len); void sha256_update(CRYAL_SHA256_CTX *ctx, const BYTE data[], size_t len);
void sha256_final(SHA256_CTX *ctx, BYTE hash[]); void sha256_final(CRYAL_SHA256_CTX *ctx, BYTE hash[]);
#endif // SHA256_H #endif // SHA256_H

8
extmod/moduhashlib.c
View File

@ -43,9 +43,9 @@ STATIC mp_obj_t hash_update(mp_obj_t self_in, mp_obj_t arg);
STATIC mp_obj_t hash_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) { STATIC mp_obj_t hash_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 0, 1, false); mp_arg_check_num(n_args, n_kw, 0, 1, false);
mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(SHA256_CTX)); mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(CRYAL_SHA256_CTX));
o->base.type = MP_OBJ_TO_PTR(type_in); o->base.type = MP_OBJ_TO_PTR(type_in);
sha256_init((SHA256_CTX*)o->state); sha256_init((CRYAL_SHA256_CTX*)o->state);
if (n_args == 1) { if (n_args == 1) {
hash_update(MP_OBJ_FROM_PTR(o), args[0]); hash_update(MP_OBJ_FROM_PTR(o), args[0]);
} }
@ -56,7 +56,7 @@ STATIC mp_obj_t hash_update(mp_obj_t self_in, mp_obj_t arg) {
mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in); mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
mp_buffer_info_t bufinfo; mp_buffer_info_t bufinfo;
mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ); mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
sha256_update((SHA256_CTX*)self->state, bufinfo.buf, bufinfo.len); sha256_update((CRYAL_SHA256_CTX*)self->state, bufinfo.buf, bufinfo.len);
return mp_const_none; return mp_const_none;
} }
MP_DEFINE_CONST_FUN_OBJ_2(hash_update_obj, hash_update); MP_DEFINE_CONST_FUN_OBJ_2(hash_update_obj, hash_update);
@ -65,7 +65,7 @@ STATIC mp_obj_t hash_digest(mp_obj_t self_in) {
mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in); mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
vstr_t vstr; vstr_t vstr;
vstr_init_len(&vstr, SHA256_BLOCK_SIZE); vstr_init_len(&vstr, SHA256_BLOCK_SIZE);
sha256_final((SHA256_CTX*)self->state, (byte*)vstr.buf); sha256_final((CRYAL_SHA256_CTX*)self->state, (byte*)vstr.buf);
return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
} }
MP_DEFINE_CONST_FUN_OBJ_1(hash_digest_obj, hash_digest); MP_DEFINE_CONST_FUN_OBJ_1(hash_digest_obj, hash_digest);