xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

unrolling loops in aesCCMencrypt() and aesCCMdecrypt()

Browse source 
do the xoring word wise for 16-byte block instead
of doing it bytewise in a loop.
This commit is contained in:
cinap_lenrek 2013-03-23 20:52:54 +01:00
parent f079c71966
commit 66a3ffe248
1 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
sys/src/9/pc/wifi.c
View file

@ -1161,11 +1161,18 @@ aesCCMencrypt(int L, int M, uchar *N /* N[15-L] */,
xblock(L, M, N, a, la, lm, t, s);
for(i = 1; lm >= 16; i++, lm -= 16){
for(p = sblock(L, N, i, b, s), x = t; p < &b[16]; x++, m++, p++){
*x ^= *m;
*m ^= *p;
}
for(i = 1; lm >= 16; i++, m += 16, lm -= 16){
sblock(L, N, i, b, s);
*((u32int*)&t[0]) ^= *((u32int*)&m[0]);
*((u32int*)&m[0]) ^= *((u32int*)&b[0]);
*((u32int*)&t[4]) ^= *((u32int*)&m[4]);
*((u32int*)&m[4]) ^= *((u32int*)&b[4]);
*((u32int*)&t[8]) ^= *((u32int*)&m[8]);
*((u32int*)&m[8]) ^= *((u32int*)&b[8]);
*((u32int*)&t[12]) ^= *((u32int*)&m[12]);
*((u32int*)&m[12]) ^= *((u32int*)&b[12]);
aes_encrypt(s->ekey, s->rounds, t, t);
}
if(lm > 0){
@ -1193,11 +1200,18 @@ aesCCMdecrypt(int L, int M, uchar *N /* N[15-L] */,
xblock(L, M, N, a, la, lm, t, s);
for(i = 1; lm >= 16; i++, lm -= 16){
for(p = sblock(L, N, i, b, s), x = t; p < &b[16]; x++, m++, p++){
*m ^= *p;
*x ^= *m;
}
for(i = 1; lm >= 16; i++, m += 16, lm -= 16){
sblock(L, N, i, b, s);
*((u32int*)&m[0]) ^= *((u32int*)&b[0]);
*((u32int*)&t[0]) ^= *((u32int*)&m[0]);
*((u32int*)&m[4]) ^= *((u32int*)&b[4]);
*((u32int*)&t[4]) ^= *((u32int*)&m[4]);
*((u32int*)&m[8]) ^= *((u32int*)&b[8]);
*((u32int*)&t[8]) ^= *((u32int*)&m[8]);
*((u32int*)&m[12]) ^= *((u32int*)&b[12]);
*((u32int*)&t[12]) ^= *((u32int*)&m[12]);
aes_encrypt(s->ekey, s->rounds, t, t);
}
if(lm > 0){