Skip to content

Commit b045ebd

Browse files
Jongydpgeorge
Jongy
authored and
dpgeorge
committed
extmod/moduhashlib: Prefix all Python methods and objects with uhashlib.
For consistency with other modules, and to help avoid clashes with the actual underlying functions that do the hashing (eg crypto-algorithms/sha256.c:sha256_update).
1 parent c901cc6 commit b045ebd

1 file changed

Lines changed: 37 additions & 37 deletions

File tree

‎extmod/moduhashlib.c‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -50,64 +50,64 @@ typedef struct _mp_obj_hash_t {
5050
char state[0];
5151
} mp_obj_hash_t;
5252

53-
STATIC mp_obj_t hash_update(mp_obj_t self_in, mp_obj_t arg);
53+
STATIC mp_obj_t uhashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg);
5454

55-
STATIC mp_obj_t hash_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
55+
STATIC mp_obj_t uhashlib_sha256_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
5656
mp_arg_check_num(n_args, n_kw, 0, 1, false);
5757
mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(CRYAL_SHA256_CTX));
5858
o->base.type = type;
5959
sha256_init((CRYAL_SHA256_CTX*)o->state);
6060
if (n_args == 1) {
61-
hash_update(MP_OBJ_FROM_PTR(o), args[0]);
61+
uhashlib_sha256_update(MP_OBJ_FROM_PTR(o), args[0]);
6262
}
6363
return MP_OBJ_FROM_PTR(o);
6464
}
6565

6666
#if MICROPY_PY_UHASHLIB_SHA1
67-
STATIC mp_obj_t sha1_update(mp_obj_t self_in, mp_obj_t arg);
67+
STATIC mp_obj_t uhashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg);
6868

6969
#if MICROPY_SSL_AXTLS
70-
STATIC mp_obj_t sha1_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
70+
STATIC mp_obj_t uhashlib_sha1_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
7171
mp_arg_check_num(n_args, n_kw, 0, 1, false);
7272
mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(SHA1_CTX));
7373
o->base.type = type;
7474
SHA1_Init((SHA1_CTX*)o->state);
7575
if (n_args == 1) {
76-
sha1_update(MP_OBJ_FROM_PTR(o), args[0]);
76+
uhashlib_sha1_update(MP_OBJ_FROM_PTR(o), args[0]);
7777
}
7878
return MP_OBJ_FROM_PTR(o);
7979
}
8080
#endif
8181

8282
#if MICROPY_SSL_MBEDTLS
83-
STATIC mp_obj_t sha1_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
83+
STATIC mp_obj_t uhashlib_sha1_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
8484
mp_arg_check_num(n_args, n_kw, 0, 1, false);
8585
mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(mbedtls_sha1_context));
8686
o->base.type = type;
8787
mbedtls_sha1_init((mbedtls_sha1_context*)o->state);
8888
mbedtls_sha1_starts((mbedtls_sha1_context*)o->state);
8989
if (n_args == 1) {
90-
sha1_update(MP_OBJ_FROM_PTR(o), args[0]);
90+
uhashlib_sha1_update(MP_OBJ_FROM_PTR(o), args[0]);
9191
}
9292
return MP_OBJ_FROM_PTR(o);
9393
}
9494
#endif
9595

9696
#endif
9797

98-
STATIC mp_obj_t hash_update(mp_obj_t self_in, mp_obj_t arg) {
98+
STATIC mp_obj_t uhashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg) {
9999
mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
100100
mp_buffer_info_t bufinfo;
101101
mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
102102
sha256_update((CRYAL_SHA256_CTX*)self->state, bufinfo.buf, bufinfo.len);
103103
return mp_const_none;
104104
}
105-
MP_DEFINE_CONST_FUN_OBJ_2(hash_update_obj, hash_update);
105+
MP_DEFINE_CONST_FUN_OBJ_2(uhashlib_sha256_update_obj, uhashlib_sha256_update);
106106

107107
#if MICROPY_PY_UHASHLIB_SHA1
108108

109109
#if MICROPY_SSL_AXTLS
110-
STATIC mp_obj_t sha1_update(mp_obj_t self_in, mp_obj_t arg) {
110+
STATIC mp_obj_t uhashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg) {
111111
mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
112112
mp_buffer_info_t bufinfo;
113113
mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
@@ -117,7 +117,7 @@ STATIC mp_obj_t sha1_update(mp_obj_t self_in, mp_obj_t arg) {
117117
#endif
118118

119119
#if MICROPY_SSL_MBEDTLS
120-
STATIC mp_obj_t sha1_update(mp_obj_t self_in, mp_obj_t arg) {
120+
STATIC mp_obj_t uhashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg) {
121121
mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
122122
mp_buffer_info_t bufinfo;
123123
mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
@@ -126,22 +126,22 @@ STATIC mp_obj_t sha1_update(mp_obj_t self_in, mp_obj_t arg) {
126126
}
127127
#endif
128128

129-
MP_DEFINE_CONST_FUN_OBJ_2(sha1_update_obj, sha1_update);
129+
MP_DEFINE_CONST_FUN_OBJ_2(uhashlib_sha1_update_obj, uhashlib_sha1_update);
130130
#endif
131131

132-
STATIC mp_obj_t hash_digest(mp_obj_t self_in) {
132+
STATIC mp_obj_t uhashlib_sha256_digest(mp_obj_t self_in) {
133133
mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
134134
vstr_t vstr;
135135
vstr_init_len(&vstr, SHA256_BLOCK_SIZE);
136136
sha256_final((CRYAL_SHA256_CTX*)self->state, (byte*)vstr.buf);
137137
return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
138138
}
139-
MP_DEFINE_CONST_FUN_OBJ_1(hash_digest_obj, hash_digest);
139+
MP_DEFINE_CONST_FUN_OBJ_1(uhashlib_sha256_digest_obj, uhashlib_sha256_digest);
140140

141141
#if MICROPY_PY_UHASHLIB_SHA1
142142

143143
#if MICROPY_SSL_AXTLS
144-
STATIC mp_obj_t sha1_digest(mp_obj_t self_in) {
144+
STATIC mp_obj_t uhashlib_sha1_digest(mp_obj_t self_in) {
145145
mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
146146
vstr_t vstr;
147147
vstr_init_len(&vstr, SHA1_SIZE);
@@ -151,7 +151,7 @@ STATIC mp_obj_t sha1_digest(mp_obj_t self_in) {
151151
#endif
152152

153153
#if MICROPY_SSL_MBEDTLS
154-
STATIC mp_obj_t sha1_digest(mp_obj_t self_in) {
154+
STATIC mp_obj_t uhashlib_sha1_digest(mp_obj_t self_in) {
155155
mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
156156
vstr_t vstr;
157157
vstr_init_len(&vstr, 20);
@@ -161,51 +161,51 @@ STATIC mp_obj_t sha1_digest(mp_obj_t self_in) {
161161
}
162162
#endif
163163

164-
MP_DEFINE_CONST_FUN_OBJ_1(sha1_digest_obj, sha1_digest);
164+
MP_DEFINE_CONST_FUN_OBJ_1(uhashlib_sha1_digest_obj, uhashlib_sha1_digest);
165165
#endif
166166

167-
STATIC const mp_rom_map_elem_t hash_locals_dict_table[] = {
168-
{ MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&hash_update_obj) },
169-
{ MP_ROM_QSTR(MP_QSTR_digest), MP_ROM_PTR(&hash_digest_obj) },
167+
STATIC const mp_rom_map_elem_t uhashlib_sha256_locals_dict_table[] = {
168+
{ MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&uhashlib_sha256_update_obj) },
169+
{ MP_ROM_QSTR(MP_QSTR_digest), MP_ROM_PTR(&uhashlib_sha256_digest_obj) },
170170
};
171171

172-
STATIC MP_DEFINE_CONST_DICT(hash_locals_dict, hash_locals_dict_table);
172+
STATIC MP_DEFINE_CONST_DICT(uhashlib_sha256_locals_dict, uhashlib_sha256_locals_dict_table);
173173

174-
STATIC const mp_obj_type_t sha256_type = {
174+
STATIC const mp_obj_type_t uhashlib_sha256_type = {
175175
{ &mp_type_type },
176176
.name = MP_QSTR_sha256,
177-
.make_new = hash_make_new,
178-
.locals_dict = (void*)&hash_locals_dict,
177+
.make_new = uhashlib_sha256_make_new,
178+
.locals_dict = (void*)&uhashlib_sha256_locals_dict,
179179
};
180180

181181
#if MICROPY_PY_UHASHLIB_SHA1
182-
STATIC const mp_rom_map_elem_t sha1_locals_dict_table[] = {
183-
{ MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&sha1_update_obj) },
184-
{ MP_ROM_QSTR(MP_QSTR_digest), MP_ROM_PTR(&sha1_digest_obj) },
182+
STATIC const mp_rom_map_elem_t uhashlib_sha1_locals_dict_table[] = {
183+
{ MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&uhashlib_sha1_update_obj) },
184+
{ MP_ROM_QSTR(MP_QSTR_digest), MP_ROM_PTR(&uhashlib_sha1_digest_obj) },
185185
};
186-
STATIC MP_DEFINE_CONST_DICT(sha1_locals_dict, sha1_locals_dict_table);
186+
STATIC MP_DEFINE_CONST_DICT(uhashlib_sha1_locals_dict, uhashlib_sha1_locals_dict_table);
187187

188-
STATIC const mp_obj_type_t sha1_type = {
188+
STATIC const mp_obj_type_t uhashlib_sha1_type = {
189189
{ &mp_type_type },
190190
.name = MP_QSTR_sha1,
191-
.make_new = sha1_make_new,
192-
.locals_dict = (void*)&sha1_locals_dict,
191+
.make_new = uhashlib_sha1_make_new,
192+
.locals_dict = (void*)&uhashlib_sha1_locals_dict,
193193
};
194194
#endif
195195

196-
STATIC const mp_rom_map_elem_t mp_module_hashlib_globals_table[] = {
196+
STATIC const mp_rom_map_elem_t mp_module_uhashlib_globals_table[] = {
197197
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uhashlib) },
198-
{ MP_ROM_QSTR(MP_QSTR_sha256), MP_ROM_PTR(&sha256_type) },
198+
{ MP_ROM_QSTR(MP_QSTR_sha256), MP_ROM_PTR(&uhashlib_sha256_type) },
199199
#if MICROPY_PY_UHASHLIB_SHA1
200-
{ MP_ROM_QSTR(MP_QSTR_sha1), MP_ROM_PTR(&sha1_type) },
200+
{ MP_ROM_QSTR(MP_QSTR_sha1), MP_ROM_PTR(&uhashlib_sha1_type) },
201201
#endif
202202
};
203203

204-
STATIC MP_DEFINE_CONST_DICT(mp_module_hashlib_globals, mp_module_hashlib_globals_table);
204+
STATIC MP_DEFINE_CONST_DICT(mp_module_uhashlib_globals, mp_module_uhashlib_globals_table);
205205

206206
const mp_obj_module_t mp_module_uhashlib = {
207207
.base = { &mp_type_module },
208-
.globals = (mp_obj_dict_t*)&mp_module_hashlib_globals,
208+
.globals = (mp_obj_dict_t*)&mp_module_uhashlib_globals,
209209
};
210210

211211
#include "crypto-algorithms/sha256.c"

0 commit comments

Comments
 (0)