generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AES-CFB[18] 2x optimization. Well, I bet nobody cares about AES-CFB1

Browse Source 
performance, but anyway...
This commit is contained in:
Andy Polyakov 2004-12-30 10:43:33 +00:00
parent e90faddaf8
commit 2e4a99f38b
1 changed files with 21 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
crypto/aes/aes_cfb.c
View File

@ -158,61 +158,35 @@ void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,
/* This expects a single block of size nbits for both in and out. Note that /* This expects a single block of size nbits for both in and out. Note that
it corrupts any extra bits in the last byte of out */ it corrupts any extra bits in the last byte of out */
/* Untested, once it is working, it will be optimised */
void AES_cfbr_encrypt_block(const unsigned char *in,unsigned char *out, void AES_cfbr_encrypt_block(const unsigned char *in,unsigned char *out,
const int nbits,const AES_KEY *key, const int nbits,const AES_KEY *key,
unsigned char *ivec,const int enc) unsigned char *ivec,const int enc)
{ {
int n; int n,rem,num;
unsigned char ovec[AES_BLOCK_SIZE*2]; unsigned char ovec[AES_BLOCK_SIZE*2];
assert(in && out && key && ivec); if (nbits<=0 || nbits>128) return;
if(enc)
{ /* fill in the first half of the new IV with the current IV */
memcpy(ovec,ivec,AES_BLOCK_SIZE);
/* construct the new IV */ /* construct the new IV */
AES_encrypt(ivec,ovec,key); AES_encrypt(ivec,ivec,key);
/* encrypt the input */ num = (nbits+7)/8;
for(n=0 ; n < (nbits+7)/8 ; ++n) if (enc) /* encrypt the input */
out[n]=in[n]^ovec[n]; for(n=0 ; n < num ; ++n)
/* fill in the first half of the new IV with the current IV */ out[n] = (ovec[AES_BLOCK_SIZE+n] = in[n] ^ ivec[n]);
memcpy(ovec,ivec,AES_BLOCK_SIZE); else /* decrypt the input */
/* and put the ciphertext in the second half */ for(n=0 ; n < num ; ++n)
memcpy(ovec+AES_BLOCK_SIZE,out,(nbits+7)/8); out[n] = (ovec[AES_BLOCK_SIZE+n] = in[n]) ^ ivec[n];
/* shift ovec left most of the bits... */ /* shift ovec left... */
memmove(ovec,ovec+nbits/8,AES_BLOCK_SIZE+(nbits%8 ? 1 : 0)); rem = nbits%8;
/* now the remaining bits */ num = nbits/8;
if(nbits%8 != 0) if(rem==0)
memcpy(ivec,ovec+num,AES_BLOCK_SIZE);
else
for(n=0 ; n < AES_BLOCK_SIZE ; ++n) for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
{ ivec[n] = ovec[n+num]<<rem | ovec[n+num+1]>>(8-rem);
ovec[n]<<=nbits%8;
ovec[n]|=ovec[n+1]>>(8-nbits%8);
}
/* finally, move it back into place */
memcpy(ivec,ovec,AES_BLOCK_SIZE);
}
else
{
/* construct the new IV in the first half of ovec */
AES_encrypt(ivec,ovec,key);
/* decrypt the input */
for(n=0 ; n < (nbits+7)/8 ; ++n)
out[n]=in[n]^ovec[n];
/* fill in the first half of the new IV with the current IV */
memcpy(ovec,ivec,AES_BLOCK_SIZE);
/* append the ciphertext */
memcpy(ovec+AES_BLOCK_SIZE,in,(nbits+7)/8);
/* shift ovec left most of the bits... */
memmove(ovec,ovec+nbits/8,AES_BLOCK_SIZE+(nbits%8 ? 1 : 0));
/* now the remaining bits */
if(nbits%8 != 0)
for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
{
ovec[n]<<=nbits%8;
ovec[n]|=ovec[n+1]>>(8-nbits%8);
}
/* finally, move it back into place */
memcpy(ivec,ovec,AES_BLOCK_SIZE);
}
/* it is not necessary to cleanse ovec, since the IV is not secret */ /* it is not necessary to cleanse ovec, since the IV is not secret */
} }