summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2018-08-19 11:58:22 +0300
committerDamien George <damien.p.george@gmail.com>2018-09-11 14:51:52 +1000
commit5fe3730a3036e20c9e7050c88c535750b7ddbfed (patch)
treef497c005deda125becd17a16179585b24bac169a
parent89516b2b62faa1a75f4f6ff0fa1ab362aa193013 (diff)
extmod/moduhashlib: Add md5 implementation, using axTLS.
MD5 is still widely used, and may be important in some cases for networking interoperability, e.g. HTTP Digest authentication.
-rw-r--r--extmod/moduhashlib.c54
-rw-r--r--py/mpconfig.h4
2 files changed, 57 insertions, 1 deletions
diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index b3feb23bc..60cde940d 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@@ -41,7 +41,7 @@
#endif
-#if MICROPY_PY_UHASHLIB_SHA1
+#if MICROPY_PY_UHASHLIB_SHA1 || MICROPY_PY_UHASHLIB_MD5
#if MICROPY_SSL_AXTLS
#include "lib/axtls/crypto/crypto.h"
@@ -219,6 +219,55 @@ STATIC const mp_obj_type_t uhashlib_sha1_type = {
};
#endif
+#if MICROPY_PY_UHASHLIB_MD5
+STATIC mp_obj_t uhashlib_md5_update(mp_obj_t self_in, mp_obj_t arg);
+
+#if MICROPY_SSL_AXTLS
+STATIC mp_obj_t uhashlib_md5_make_new(const mp_obj_type_t *type, size_t n_args, size_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(MD5_CTX));
+ o->base.type = type;
+ MD5_Init((MD5_CTX*)o->state);
+ if (n_args == 1) {
+ uhashlib_md5_update(MP_OBJ_FROM_PTR(o), args[0]);
+ }
+ return MP_OBJ_FROM_PTR(o);
+}
+
+STATIC mp_obj_t uhashlib_md5_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);
+ MD5_Update((MD5_CTX*)self->state, bufinfo.buf, bufinfo.len);
+ return mp_const_none;
+}
+
+STATIC mp_obj_t uhashlib_md5_digest(mp_obj_t self_in) {
+ mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+ vstr_t vstr;
+ vstr_init_len(&vstr, MD5_SIZE);
+ MD5_Final((byte*)vstr.buf, (MD5_CTX*)self->state);
+ return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+}
+#endif // MICROPY_SSL_AXTLS
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(uhashlib_md5_update_obj, uhashlib_md5_update);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(uhashlib_md5_digest_obj, uhashlib_md5_digest);
+
+STATIC const mp_rom_map_elem_t uhashlib_md5_locals_dict_table[] = {
+ { MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&uhashlib_md5_update_obj) },
+ { MP_ROM_QSTR(MP_QSTR_digest), MP_ROM_PTR(&uhashlib_md5_digest_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(uhashlib_md5_locals_dict, uhashlib_md5_locals_dict_table);
+
+STATIC const mp_obj_type_t uhashlib_md5_type = {
+ { &mp_type_type },
+ .name = MP_QSTR_md5,
+ .make_new = uhashlib_md5_make_new,
+ .locals_dict = (void*)&uhashlib_md5_locals_dict,
+};
+#endif // MICROPY_PY_UHASHLIB_MD5
+
STATIC const mp_rom_map_elem_t mp_module_uhashlib_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uhashlib) },
#if MICROPY_PY_UHASHLIB_SHA256
@@ -227,6 +276,9 @@ STATIC const mp_rom_map_elem_t mp_module_uhashlib_globals_table[] = {
#if MICROPY_PY_UHASHLIB_SHA1
{ MP_ROM_QSTR(MP_QSTR_sha1), MP_ROM_PTR(&uhashlib_sha1_type) },
#endif
+ #if MICROPY_PY_UHASHLIB_MD5
+ { MP_ROM_QSTR(MP_QSTR_md5), MP_ROM_PTR(&uhashlib_md5_type) },
+ #endif
};
STATIC MP_DEFINE_CONST_DICT(mp_module_uhashlib_globals, mp_module_uhashlib_globals_table);
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 6396850b3..e0a0f0d5a 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1172,6 +1172,10 @@ typedef double mp_float_t;
#define MICROPY_PY_UHASHLIB (0)
#endif
+#ifndef MICROPY_PY_UHASHLIB_MD5
+#define MICROPY_PY_UHASHLIB_MD5 (0)
+#endif
+
#ifndef MICROPY_PY_UHASHLIB_SHA1
#define MICROPY_PY_UHASHLIB_SHA1 (0)
#endif