diff options
| author | Pavol Rusnak | 2016-07-18 18:35:33 +0200 |
|---|---|---|
| committer | Pavol Rusnak | 2016-08-24 10:42:46 +0200 |
| commit | 39799f7564d28737fa815a3a5d370c91414998ef (patch) | |
| tree | 1caae7b61bc2cc8030db9b8bf2c490de2cb6efbe | |
| parent | 656207645485295477411224fdf41cfd4d598a88 (diff) | |
extmod/modubinascii: implement binascii.crc32
| -rw-r--r-- | extmod/modubinascii.c | 11 | ||||
| -rw-r--r-- | extmod/modubinascii.h | 2 | ||||
| -rw-r--r-- | tests/extmod/ubinascii_crc32.py | 14 |
3 files changed, 27 insertions, 0 deletions
diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c index 3cceb991f..dc41d1dc9 100644 --- a/extmod/modubinascii.c +++ b/extmod/modubinascii.c @@ -33,6 +33,7 @@ #include "py/binary.h" #include "extmod/modubinascii.h" +#include "uzlib/tinf.h" mp_obj_t mod_binascii_hexlify(size_t n_args, const mp_obj_t *args) { // Second argument is for an extension to allow a separator to be used @@ -203,6 +204,15 @@ mp_obj_t mod_binascii_b2a_base64(mp_obj_t data) { } MP_DEFINE_CONST_FUN_OBJ_1(mod_binascii_b2a_base64_obj, mod_binascii_b2a_base64); +mp_obj_t mod_binascii_crc32(size_t n_args, const mp_obj_t *args) { + mp_buffer_info_t bufinfo; + mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ); + uint32_t crc = (n_args > 1) ? mp_obj_get_int(args[1]) : 0; + crc = uzlib_crc32(bufinfo.buf, bufinfo.len, crc ^ 0xffffffff); + return MP_OBJ_NEW_SMALL_INT(crc ^ 0xffffffff); +} +MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_binascii_crc32_obj, 1, 2, mod_binascii_crc32); + #if MICROPY_PY_UBINASCII STATIC const mp_rom_map_elem_t mp_module_binascii_globals_table[] = { @@ -211,6 +221,7 @@ STATIC const mp_rom_map_elem_t mp_module_binascii_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_unhexlify), MP_ROM_PTR(&mod_binascii_unhexlify_obj) }, { MP_ROM_QSTR(MP_QSTR_a2b_base64), MP_ROM_PTR(&mod_binascii_a2b_base64_obj) }, { MP_ROM_QSTR(MP_QSTR_b2a_base64), MP_ROM_PTR(&mod_binascii_b2a_base64_obj) }, + { MP_ROM_QSTR(MP_QSTR_crc32), MP_ROM_PTR(&mod_binascii_crc32_obj) }, }; STATIC MP_DEFINE_CONST_DICT(mp_module_binascii_globals, mp_module_binascii_globals_table); diff --git a/extmod/modubinascii.h b/extmod/modubinascii.h index 0f9b82c1c..71dd8a693 100644 --- a/extmod/modubinascii.h +++ b/extmod/modubinascii.h @@ -31,10 +31,12 @@ extern mp_obj_t mod_binascii_hexlify(size_t n_args, const mp_obj_t *args); extern mp_obj_t mod_binascii_unhexlify(mp_obj_t data); extern mp_obj_t mod_binascii_a2b_base64(mp_obj_t data); extern mp_obj_t mod_binascii_b2a_base64(mp_obj_t data); +extern mp_obj_t mod_binascii_crc32(size_t n_args, const mp_obj_t *args); MP_DECLARE_CONST_FUN_OBJ(mod_binascii_hexlify_obj); MP_DECLARE_CONST_FUN_OBJ(mod_binascii_unhexlify_obj); MP_DECLARE_CONST_FUN_OBJ(mod_binascii_a2b_base64_obj); MP_DECLARE_CONST_FUN_OBJ(mod_binascii_b2a_base64_obj); +MP_DECLARE_CONST_FUN_OBJ(mod_binascii_crc32_obj); #endif /* MICROPY_EXTMOD_MODUBINASCII */ diff --git a/tests/extmod/ubinascii_crc32.py b/tests/extmod/ubinascii_crc32.py new file mode 100644 index 000000000..cb86603d5 --- /dev/null +++ b/tests/extmod/ubinascii_crc32.py @@ -0,0 +1,14 @@ +try: + import ubinascii as binascii +except ImportError: + import binascii + +print(hex(binascii.crc32(b'The quick brown fox jumps over the lazy dog'))) +print(hex(binascii.crc32(b'\x00' * 32))) +print(hex(binascii.crc32(b'\xff' * 32))) +print(hex(binascii.crc32(bytes(range(32))))) + +print(hex(binascii.crc32(b' over the lazy dog', binascii.crc32(b'The quick brown fox jumps')))) +print(hex(binascii.crc32(b'\x00' * 16, binascii.crc32(b'\x00' * 16)))) +print(hex(binascii.crc32(b'\xff' * 16, binascii.crc32(b'\xff' * 16)))) +print(hex(binascii.crc32(bytes(range(16, 32)), binascii.crc32(bytes(range(16)))))) |