diff options
Diffstat (limited to 'lib/crypto/aes.c')
-rw-r--r-- | lib/crypto/aes.c | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/lib/crypto/aes.c b/lib/crypto/aes.c index a47a4565933..f7f96889c12 100644 --- a/lib/crypto/aes.c +++ b/lib/crypto/aes.c @@ -113,24 +113,25 @@ AES_cbc_encrypt(const unsigned char *in, unsigned char *out, } } -void aes_cfb8_encrypt(const uint8_t *in, uint8_t *out, - size_t length, const AES_KEY *key, - uint8_t *iv, int forward) +void +AES_cfb8_encrypt(const unsigned char *in, unsigned char *out, + unsigned long size, const AES_KEY *key, + unsigned char *iv, int forward_encrypt) { - size_t i; + int i; - for (i=0; i < length; i++) { - uint8_t tiv[AES_BLOCK_SIZE*2]; + for (i = 0; i < size; i++) { + unsigned char tmp[AES_BLOCK_SIZE + 1]; - memcpy(tiv, iv, AES_BLOCK_SIZE); - AES_encrypt(iv, iv, key); - if (!forward) { - tiv[AES_BLOCK_SIZE] = in[i]; - } - out[i] = in[i] ^ iv[0]; - if (forward) { - tiv[AES_BLOCK_SIZE] = out[i]; - } - memcpy(iv, tiv+1, AES_BLOCK_SIZE); - } + memcpy(tmp, iv, AES_BLOCK_SIZE); + AES_encrypt(iv, iv, key); + if (!forward_encrypt) { + tmp[AES_BLOCK_SIZE] = in[i]; + } + out[i] = in[i] ^ iv[0]; + if (forward_encrypt) { + tmp[AES_BLOCK_SIZE] = out[i]; + } + memcpy(iv, &tmp[1], AES_BLOCK_SIZE); + } } |