X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fmodes%2Fofb128.c;h=c732e2ec58e3a138cdcd40842cc64f592f899ed0;hb=6a1823b371129848fa402d19a2cae6a1adf1d874;hp=ae264c832c5fefba52f611d2fe265917a383dc24;hpb=85b2c0ce7fdf597d60d8c366e8f7de24f674fc5a;p=oweals%2Fopenssl.git diff --git a/crypto/modes/ofb128.c b/crypto/modes/ofb128.c index ae264c832c..c732e2ec58 100644 --- a/crypto/modes/ofb128.c +++ b/crypto/modes/ofb128.c @@ -48,7 +48,7 @@ * */ -#include +#include "modes.h" #include #ifndef MODES_DEBUG @@ -58,8 +58,6 @@ #endif #include -#include "modes.h" - #define STRICT_ALIGNMENT #if defined(__i386) || defined(__i386__) || \ defined(__x86_64) || defined(__x86_64__) || \ @@ -75,7 +73,7 @@ void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out, size_t len, const void *key, unsigned char ivec[16], int *num, - block_f block) + block128_f block) { unsigned int n; size_t l=0; @@ -97,14 +95,14 @@ void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out, #endif while (len>=16) { (*block)(ivec, ivec, key); - for (n=0; n<16; n+=sizeof(size_t)) + for (; n<16; n+=sizeof(size_t)) *(size_t*)(out+n) = *(size_t*)(in+n) ^ *(size_t*)(ivec+n); len -= 16; out += 16; in += 16; + n = 0; } - n = 0; if (len) { (*block)(ivec, ivec, key); while (len--) {