urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-22 10:21:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

making the bodies of the cbc functions call helpers to be more boring

Browse Source
This commit is contained in:
Paul Driver 2020-08-07 13:06:44 -07:00
parent e863afd30e
commit a1c1f3b9ee
2 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/urbit/jets/e/aes_cbc.c
View File

@ -17,9 +17,9 @@
u3_atom iv, u3_atom iv,
u3_atom msg) u3_atom msg)
{ {
c3_y key_y[16], iv_y[16], *msg_y, *out_y;
c3_w met_w;
size_t len; size_t len;
c3_w met_w;
c3_y key_y[16], iv_y[16], *msg_y, *out_y;
u3r_bytes(0, 16, key_y, key); u3r_bytes(0, 16, key_y, key);
u3r_bytes(0, 16, iv_y, iv); u3r_bytes(0, 16, iv_y, iv);

75
pkg/urcrypt/urcrypt.c
View File

@ -242,7 +242,7 @@ urcrypt_ed_veri(const uint8_t *message,
} }
static void static void
reverse_copy(size_t size, const uint8_t *in, uint8_t *out) { _urcrypt_reverse_copy(size_t size, const uint8_t *in, uint8_t *out) {
size_t i, j; size_t i, j;
for ( i = 0, j = size - 1; i < size; i++, j-- ) { for ( i = 0, j = size - 1; i < size; i++, j-- ) {
out[i] = in[j]; out[i] = in[j];
@ -250,7 +250,7 @@ reverse_copy(size_t size, const uint8_t *in, uint8_t *out) {
} }
static void static void
reverse_inplace(size_t size, uint8_t *ptr) { _urcrypt_reverse_inplace(size_t size, uint8_t *ptr) {
size_t i, j; size_t i, j;
uint8_t tmp; uint8_t tmp;
for ( i = 0, j = size - 1; i < j; i++, j-- ) { for ( i = 0, j = size - 1; i < j; i++, j-- ) {
@ -268,15 +268,15 @@ urcrypt_aes_ecba_en(const uint8_t key[16],
AES_KEY aes_key; AES_KEY aes_key;
uint8_t rkey[16], rblock[16]; uint8_t rkey[16], rblock[16];
reverse_copy(16, key, rkey); _urcrypt_reverse_copy(16, key, rkey);
reverse_copy(16, block, rblock); _urcrypt_reverse_copy(16, block, rblock);
if ( 0 != AES_set_encrypt_key(rkey, 128, &aes_key) ) { if ( 0 != AES_set_encrypt_key(rkey, 128, &aes_key) ) {
return -1; return -1;
} }
else { else {
AES_ecb_encrypt(rblock, out, &aes_key, AES_ENCRYPT); AES_ecb_encrypt(rblock, out, &aes_key, AES_ENCRYPT);
reverse_inplace(16, out); _urcrypt_reverse_inplace(16, out);
return 0; return 0;
} }
} }
@ -289,15 +289,15 @@ urcrypt_aes_ecba_de(const uint8_t key[16],
AES_KEY aes_key; AES_KEY aes_key;
uint8_t rkey[16], rblock[16]; uint8_t rkey[16], rblock[16];
reverse_copy(16, key, rkey); _urcrypt_reverse_copy(16, key, rkey);
reverse_copy(16, block, rblock); _urcrypt_reverse_copy(16, block, rblock);
if ( 0 != AES_set_decrypt_key(rkey, 128, &aes_key) ) { if ( 0 != AES_set_decrypt_key(rkey, 128, &aes_key) ) {
return -1; return -1;
} }
else { else {
AES_ecb_encrypt(rblock, out, &aes_key, AES_DECRYPT); AES_ecb_encrypt(rblock, out, &aes_key, AES_DECRYPT);
reverse_inplace(16, out); _urcrypt_reverse_inplace(16, out);
return 0; return 0;
} }
} }
@ -310,15 +310,15 @@ urcrypt_aes_ecbb_en(const uint8_t key[24],
AES_KEY aes_key; AES_KEY aes_key;
uint8_t rkey[24], rblock[16]; uint8_t rkey[24], rblock[16];
reverse_copy(24, key, rkey); _urcrypt_reverse_copy(24, key, rkey);
reverse_copy(16, block, rblock); _urcrypt_reverse_copy(16, block, rblock);
if ( 0 != AES_set_encrypt_key(rkey, 192, &aes_key) ) { if ( 0 != AES_set_encrypt_key(rkey, 192, &aes_key) ) {
return -1; return -1;
} }
else { else {
AES_ecb_encrypt(rblock, out, &aes_key, AES_ENCRYPT); AES_ecb_encrypt(rblock, out, &aes_key, AES_ENCRYPT);
reverse_inplace(16, out); _urcrypt_reverse_inplace(16, out);
return 0; return 0;
} }
} }
@ -331,15 +331,15 @@ urcrypt_aes_ecbb_de(const uint8_t key[24],
AES_KEY aes_key; AES_KEY aes_key;
uint8_t rkey[24], rblock[16]; uint8_t rkey[24], rblock[16];
reverse_copy(24, key, rkey); _urcrypt_reverse_copy(24, key, rkey);
reverse_copy(16, block, rblock); _urcrypt_reverse_copy(16, block, rblock);
if ( 0 != AES_set_decrypt_key(rkey, 192, &aes_key) ) { if ( 0 != AES_set_decrypt_key(rkey, 192, &aes_key) ) {
return -1; return -1;
} }
else { else {
AES_ecb_encrypt(rblock, out, &aes_key, AES_DECRYPT); AES_ecb_encrypt(rblock, out, &aes_key, AES_DECRYPT);
reverse_inplace(16, out); _urcrypt_reverse_inplace(16, out);
return 0; return 0;
} }
} }
@ -352,15 +352,15 @@ urcrypt_aes_ecbc_en(const uint8_t key[32],
AES_KEY aes_key; AES_KEY aes_key;
uint8_t rkey[32], rblock[16]; uint8_t rkey[32], rblock[16];
reverse_copy(32, key, rkey); _urcrypt_reverse_copy(32, key, rkey);
reverse_copy(16, block, rblock); _urcrypt_reverse_copy(16, block, rblock);
if ( 0 != AES_set_encrypt_key(rkey, 256, &aes_key) ) { if ( 0 != AES_set_encrypt_key(rkey, 256, &aes_key) ) {
return -1; return -1;
} }
else { else {
AES_ecb_encrypt(rblock, out, &aes_key, AES_ENCRYPT); AES_ecb_encrypt(rblock, out, &aes_key, AES_ENCRYPT);
reverse_inplace(16, out); _urcrypt_reverse_inplace(16, out);
return 0; return 0;
} }
} }
@ -373,19 +373,34 @@ urcrypt_aes_ecbc_de(const uint8_t key[32],
AES_KEY aes_key; AES_KEY aes_key;
uint8_t rkey[32], rblock[16]; uint8_t rkey[32], rblock[16];
reverse_copy(32, key, rkey); _urcrypt_reverse_copy(32, key, rkey);
reverse_copy(16, block, rblock); _urcrypt_reverse_copy(16, block, rblock);
if ( 0 != AES_set_decrypt_key(rkey, 256, &aes_key) ) { if ( 0 != AES_set_decrypt_key(rkey, 256, &aes_key) ) {
return -1; return -1;
} }
else { else {
AES_ecb_encrypt(rblock, out, &aes_key, AES_DECRYPT); AES_ecb_encrypt(rblock, out, &aes_key, AES_DECRYPT);
reverse_inplace(16, out); _urcrypt_reverse_inplace(16, out);
return 0; return 0;
} }
} }
static uint8_t*
_urcrypt_cbc_pad(size_t *length_ptr, const uint8_t *message)
{
size_t length = *length_ptr,
padding = 16 - (length % 16),
padded = length + padding;
uint8_t *buf = urcrypt_malloc(padded);
memset(buf, 0, padding);
_urcrypt_reverse_copy(length, message, buf + padding);
*length_ptr = padded;
return buf;
}
uint8_t* uint8_t*
urcrypt_aes_cbca_en(const uint8_t *message, urcrypt_aes_cbca_en(const uint8_t *message,
size_t length, size_t length,
@ -396,28 +411,22 @@ urcrypt_aes_cbca_en(const uint8_t *message,
AES_KEY aes_key; AES_KEY aes_key;
uint8_t rkey[16]; uint8_t rkey[16];
reverse_copy(16, key, rkey); _urcrypt_reverse_copy(16, key, rkey);
if ( 0 != AES_set_encrypt_key(rkey, 128, &aes_key) ) { if ( 0 != AES_set_encrypt_key(rkey, 128, &aes_key) ) {
return NULL; return NULL;
} }
else { else {
uint8_t riv[16], *in, *out; uint8_t riv[16], *in, *out;
size_t padding = 16 - (length % 16),
padded = length + padding;
reverse_copy(16, ivec, riv); _urcrypt_reverse_copy(16, ivec, riv);
in = _urcrypt_cbc_pad(&length, message);
in = urcrypt_malloc(padded); out = urcrypt_malloc(length);
memset(in, 0, padding); AES_cbc_encrypt(in, out, length, &aes_key, riv, AES_ENCRYPT);
reverse_copy(length, message, in + padding);
out = urcrypt_malloc(padded);
AES_cbc_encrypt(in, out, padded, &aes_key, riv, AES_ENCRYPT);
urcrypt_free(in); urcrypt_free(in);
reverse_inplace(padded, out); _urcrypt_reverse_inplace(length, out);
*out_length = padded; *out_length = length;
return out; return out;
} }
} }