summaryrefslogtreecommitdiffstatshomepage
path: root/py
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-11-22 01:19:13 +0200
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-11-22 14:47:46 +0200
commitf4b19c873f2b026aa3d0d5c880d0605c9a40f38f (patch)
tree4b8f9a72faf267fcef94142ac85abb91aa85a172 /py
parentdf242facdcd0702bb7ae8c005eb8e8bcac5255f9 (diff)
downloadmicropython-f4b19c873f2b026aa3d0d5c880d0605c9a40f38f.tar.gz
micropython-f4b19c873f2b026aa3d0d5c880d0605c9a40f38f.zip
moduhashlib: Initial module skeleton.
Diffstat (limited to 'py')
-rw-r--r--py/builtin.h1
-rw-r--r--py/builtintables.c3
-rw-r--r--py/mpconfig.h4
-rw-r--r--py/py.mk1
-rw-r--r--py/qstrdefs.h8
5 files changed, 17 insertions, 0 deletions
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