X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Faes%2Fao_aes.c;h=ce87e3a80bf491c09cd6f11bd760e30988c99dd2;hb=HEAD;hp=52463f5d3b2f202be30b49b19d35f7601b3518c5;hpb=44249a9262a16ed103aedf30a300003fc2a17579;p=fw%2Faltos diff --git a/src/aes/ao_aes.c b/src/aes/ao_aes.c index 52463f5d..ce87e3a8 100644 --- a/src/aes/ao_aes.c +++ b/src/aes/ao_aes.c @@ -359,19 +359,20 @@ void xrijndaelDecrypt(word32 block[], roundkey *rkk) #endif uint8_t ao_aes_mutex; -static uint8_t key[16]; +static word32 key[16/4]; static roundkey rkk; -static uint8_t iv[16]; +static word32 iv[32/4]; void ao_aes_set_mode(enum ao_aes_mode mode) { + (void) mode; /* we only do CBC_MAC anyways... */ } void -ao_aes_set_key(__xdata uint8_t *in) +ao_aes_set_key(uint8_t *in) { memcpy(key, in, 16); xrijndaelKeySched((word32 *) key, 128, 128, &rkk); @@ -384,14 +385,15 @@ ao_aes_zero_iv(void) } void -ao_aes_run(__xdata uint8_t *in, - __xdata uint8_t *out) +ao_aes_run(uint8_t *in, + uint8_t *out) { uint8_t i; + uint8_t *_iv = (uint8_t *) iv; for (i = 0; i < 16; i++) - iv[i] ^= in[i]; - xrijndaelEncrypt((word32 *) iv, &rkk); + _iv[i] ^= in[i]; + xrijndaelEncrypt(iv, &rkk); if (out) memcpy(out, iv, 16); }