Skip to content

Commit 39799f7

Browse files
prusnakprusnak
committed
extmod/modubinascii: implement binascii.crc32
1 parent 6562076 commit 39799f7

3 files changed

Lines changed: 27 additions & 0 deletions

File tree

‎extmod/modubinascii.c‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include "py/binary.h"
3434
#include "extmod/modubinascii.h"
3535

36+
#include "uzlib/tinf.h"
3637

3738
mp_obj_t mod_binascii_hexlify(size_t n_args, const mp_obj_t *args) {
3839
// 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) {
203204
}
204205
MP_DEFINE_CONST_FUN_OBJ_1(mod_binascii_b2a_base64_obj, mod_binascii_b2a_base64);
205206

207+
mp_obj_t mod_binascii_crc32(size_t n_args, const mp_obj_t *args) {
208+
mp_buffer_info_t bufinfo;
209+
mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ);
210+
uint32_t crc = (n_args > 1) ? mp_obj_get_int(args[1]) : 0;
211+
crc = uzlib_crc32(bufinfo.buf, bufinfo.len, crc ^ 0xffffffff);
212+
return MP_OBJ_NEW_SMALL_INT(crc ^ 0xffffffff);
213+
}
214+
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_binascii_crc32_obj, 1, 2, mod_binascii_crc32);
215+
206216
#if MICROPY_PY_UBINASCII
207217

208218
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[] = {
211221
{ MP_ROM_QSTR(MP_QSTR_unhexlify), MP_ROM_PTR(&mod_binascii_unhexlify_obj) },
212222
{ MP_ROM_QSTR(MP_QSTR_a2b_base64), MP_ROM_PTR(&mod_binascii_a2b_base64_obj) },
213223
{ MP_ROM_QSTR(MP_QSTR_b2a_base64), MP_ROM_PTR(&mod_binascii_b2a_base64_obj) },
224+
{ MP_ROM_QSTR(MP_QSTR_crc32), MP_ROM_PTR(&mod_binascii_crc32_obj) },
214225
};
215226

216227
STATIC MP_DEFINE_CONST_DICT(mp_module_binascii_globals, mp_module_binascii_globals_table);

‎extmod/modubinascii.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@ extern mp_obj_t mod_binascii_hexlify(size_t n_args, const mp_obj_t *args);
3131
extern mp_obj_t mod_binascii_unhexlify(mp_obj_t data);
3232
extern mp_obj_t mod_binascii_a2b_base64(mp_obj_t data);
3333
extern mp_obj_t mod_binascii_b2a_base64(mp_obj_t data);
34+
extern mp_obj_t mod_binascii_crc32(size_t n_args, const mp_obj_t *args);
3435

3536
MP_DECLARE_CONST_FUN_OBJ(mod_binascii_hexlify_obj);
3637
MP_DECLARE_CONST_FUN_OBJ(mod_binascii_unhexlify_obj);
3738
MP_DECLARE_CONST_FUN_OBJ(mod_binascii_a2b_base64_obj);
3839
MP_DECLARE_CONST_FUN_OBJ(mod_binascii_b2a_base64_obj);
40+
MP_DECLARE_CONST_FUN_OBJ(mod_binascii_crc32_obj);
3941

4042
#endif /* MICROPY_EXTMOD_MODUBINASCII */

‎tests/extmod/ubinascii_crc32.py‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
try:
2+
import ubinascii as binascii
3+
except ImportError:
4+
import binascii
5+
6+
print(hex(binascii.crc32(b'The quick brown fox jumps over the lazy dog')))
7+
print(hex(binascii.crc32(b'\x00' * 32)))
8+
print(hex(binascii.crc32(b'\xff' * 32)))
9+
print(hex(binascii.crc32(bytes(range(32)))))
10+
11+
print(hex(binascii.crc32(b' over the lazy dog', binascii.crc32(b'The quick brown fox jumps'))))
12+
print(hex(binascii.crc32(b'\x00' * 16, binascii.crc32(b'\x00' * 16))))
13+
print(hex(binascii.crc32(b'\xff' * 16, binascii.crc32(b'\xff' * 16))))
14+
print(hex(binascii.crc32(bytes(range(16, 32)), binascii.crc32(bytes(range(16))))))

0 commit comments

Comments
 (0)