diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c new file mode 100644 index 0000000000..bdc2529c19 --- /dev/null +++ b/extmod/moduhashlib.c @@ -0,0 +1,108 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2014 Paul Sokolovsky + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include +#include + +#include "mpconfig.h" +#include "nlr.h" +#include "misc.h" +#include "qstr.h" +#include "obj.h" +#include "runtime.h" + +#if MICROPY_PY_UHASHLIB + +typedef struct _mp_obj_hash_t { + mp_obj_base_t base; + char state[0]; +} mp_obj_hash_t; + +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, 0); + o->base.type = type_in; + if (n_args == 1) { + hash_update(o, args[0]); + } + return o; +} + +STATIC mp_obj_t hash_update(mp_obj_t self_in, mp_obj_t arg) { + return mp_const_none; +} +MP_DEFINE_CONST_FUN_OBJ_2(hash_update_obj, hash_update); + +STATIC mp_obj_t hash_digest(mp_obj_t self_in) { + return mp_obj_new_bytes((const byte*)"\0\0\0\0", 4); +} +MP_DEFINE_CONST_FUN_OBJ_1(hash_digest_obj, hash_digest); + +STATIC mp_obj_t hash_hexdigest(mp_obj_t self_in) { + return mp_obj_new_str("00000000", 8, false); +} +MP_DEFINE_CONST_FUN_OBJ_1(hash_hexdigest_obj, hash_hexdigest); + +STATIC const mp_map_elem_t hash_locals_dict_table[] = { + { MP_OBJ_NEW_QSTR(MP_QSTR_update), (mp_obj_t) &hash_update_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_digest), (mp_obj_t) &hash_digest_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_hexdigest), (mp_obj_t) &hash_hexdigest_obj }, +}; + +STATIC MP_DEFINE_CONST_DICT(hash_locals_dict, hash_locals_dict_table); + +STATIC const mp_obj_type_t sha256_type = { + { &mp_type_type }, + .name = MP_QSTR_sha256, + .make_new = hash_make_new, + .locals_dict = (mp_obj_t)&hash_locals_dict, +}; + +STATIC const mp_map_elem_t mp_module_hashlib_globals_table[] = { + { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_uhashlib) }, + { MP_OBJ_NEW_QSTR(MP_QSTR_sha256), (mp_obj_t)&sha256_type }, +}; + +STATIC const mp_obj_dict_t mp_module_hashlib_globals = { + .base = {&mp_type_dict}, + .map = { + .all_keys_are_qstrs = 1, + .table_is_fixed_array = 1, + .used = MP_ARRAY_SIZE(mp_module_hashlib_globals_table), + .alloc = MP_ARRAY_SIZE(mp_module_hashlib_globals_table), + .table = (mp_map_elem_t*)mp_module_hashlib_globals_table, + }, +}; + +const mp_obj_module_t mp_module_uhashlib = { + .base = { &mp_type_module }, + .name = MP_QSTR_uhashlib, + .globals = (mp_obj_dict_t*)&mp_module_hashlib_globals, +}; + +#endif //MICROPY_PY_UHASHLIB diff --git a/py/builtin.h b/py/builtin.h index e102dab8e1..a6736152c5 100644 --- a/py/builtin.h +++ b/py/builtin.h @@ -94,3 +94,4 @@ extern const mp_obj_module_t mp_module_uzlib; extern const mp_obj_module_t mp_module_ujson; extern const mp_obj_module_t mp_module_ure; extern const mp_obj_module_t mp_module_uheapq; +extern const mp_obj_module_t mp_module_uhashlib; diff --git a/py/builtintables.c b/py/builtintables.c index b0d20417e5..1777838e0b 100644 --- a/py/builtintables.c +++ b/py/builtintables.c @@ -221,6 +221,9 @@ STATIC const mp_map_elem_t mp_builtin_module_table[] = { #if MICROPY_PY_UHEAPQ { MP_OBJ_NEW_QSTR(MP_QSTR_uheapq), (mp_obj_t)&mp_module_uheapq }, #endif +#if MICROPY_PY_UHASHLIB + { MP_OBJ_NEW_QSTR(MP_QSTR_uhashlib), (mp_obj_t)&mp_module_uhashlib }, +#endif // extra builtin modules as defined by a port MICROPY_PORT_BUILTIN_MODULES diff --git a/py/mpconfig.h b/py/mpconfig.h index 0c214bb5b6..f4f9986e4d 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -435,6 +435,10 @@ typedef double mp_float_t; #define MICROPY_PY_UHEAPQ (0) #endif +#ifndef MICROPY_PY_UHASHLIB +#define MICROPY_PY_UHASHLIB (0) +#endif + /*****************************************************************************/ /* Hooks for a port to add builtins */ diff --git a/py/py.mk b/py/py.mk index fe6220bac6..dd52687c70 100644 --- a/py/py.mk +++ b/py/py.mk @@ -115,6 +115,7 @@ PY_O_BASENAME = \ ../extmod/modure.o \ ../extmod/moduzlib.o \ ../extmod/moduheapq.o \ + ../extmod/moduhashlib.o \ # prepend the build destination prefix to the py object files PY_O = $(addprefix $(PY_BUILD)/, $(PY_O_BASENAME)) diff --git a/py/qstrdefs.h b/py/qstrdefs.h index 7f1b3c417a..ccf6a8c28b 100644 --- a/py/qstrdefs.h +++ b/py/qstrdefs.h @@ -510,3 +510,11 @@ Q(heappush) Q(heappop) Q(heapify) #endif + +#if MICROPY_PY_UHASHLIB +Q(uhashlib) +Q(update) +Q(digest) +Q(hexdigest) +Q(sha256) +#endif diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h index 1baf56a11b..3e99a5c56b 100644 --- a/unix/mpconfigport.h +++ b/unix/mpconfigport.h @@ -61,6 +61,7 @@ #define MICROPY_PY_UJSON (1) #define MICROPY_PY_URE (1) #define MICROPY_PY_UHEAPQ (1) +#define MICROPY_PY_UHASHLIB (1) // Define to MICROPY_ERROR_REPORTING_DETAILED to get function, etc. // names in exception messages (may require more RAM).