djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extmod/moducryptolib: Shorten exception messages to reduce code size.

Browse Source
This commit is contained in:
Yonatan Goldschmidt 2018-06-23 17:52:54 +03:00 committed by Damien George
parent d0507c084c
commit 31f2f1e967
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extmod/moducryptolib.c
View File

@ -173,7 +173,7 @@ STATIC mp_obj_t ucryptolib_aes_make_new(const mp_obj_type_t *type, size_t n_args
mp_buffer_info_t keyinfo;
mp_get_buffer_raise(args[0], &keyinfo, MP_BUFFER_READ);
if (32 != keyinfo.len && 16 != keyinfo.len) {
mp_raise_ValueError("bad key length");
mp_raise_ValueError("key");
}
mp_buffer_info_t ivinfo;
@ -182,10 +182,10 @@ STATIC mp_obj_t ucryptolib_aes_make_new(const mp_obj_type_t *type, size_t n_args
mp_get_buffer_raise(args[2], &ivinfo, MP_BUFFER_READ);
if (16 != ivinfo.len) {
mp_raise_ValueError("bad iv length");
mp_raise_ValueError("IV");
}
} else if (o->block_mode == UCRYPTOLIB_MODE_CBC) {
mp_raise_ValueError("iv required for MODE_CBC");
mp_raise_ValueError("IV");
}
aes_initial_set_key_impl(&o->ctx, keyinfo.buf, keyinfo.len, ivinfo.buf);
@ -216,7 +216,7 @@ STATIC mp_obj_t aes_process(size_t n_args, const mp_obj_t *args, bool encrypt) {
if (out_buf != MP_OBJ_NULL) {
mp_get_buffer_raise(out_buf, &out_bufinfo, MP_BUFFER_WRITE);
if (out_bufinfo.len < in_bufinfo.len) {
mp_raise_ValueError("output buffer too small");
mp_raise_ValueError("output too small");
}
out_buf_ptr = out_bufinfo.buf;
} else {
@ -231,7 +231,7 @@ STATIC mp_obj_t aes_process(size_t n_args, const mp_obj_t *args, bool encrypt) {
if ((encrypt && self->key_type == AES_KEYTYPE_DEC) ||
(!encrypt && self->key_type == AES_KEYTYPE_ENC)) {
mp_raise_ValueError("can't use same aes object for encrypt & decrypt");
mp_raise_ValueError("can't encrypt & decrypt");
}
}