diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2015-12-20 16:57:57 +0200 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2015-12-20 23:14:47 +0200 |
| commit | 1b7f62241023fdd000ee011824679a34d615c722 (patch) | |
| tree | a68d1ee99adca06d4aec138887ba8de507c85fd2 /extmod/moduhashlib.c | |
| parent | 664bc44f302ca9cbed02788fea4414b815b1ac65 (diff) | |
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.
Diffstat (limited to 'extmod/moduhashlib.c')
| -rw-r--r-- | extmod/moduhashlib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c index 7b0d25e80..a824bd0eb 100644 --- a/extmod/moduhashlib.c +++ b/extmod/moduhashlib.c @@ -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) { 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); - sha256_init((SHA256_CTX*)o->state); + sha256_init((CRYAL_SHA256_CTX*)o->state); if (n_args == 1) { 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_buffer_info_t bufinfo; 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; } 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); vstr_t vstr; 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); } MP_DEFINE_CONST_FUN_OBJ_1(hash_digest_obj, hash_digest); |