Commit 6a1823b3 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

[co]fb128.c: fix "n=0" bug.

parent 45106caa

crypto/modes/cfb128.c

+4 −4
Original line number Diff line number Diff line
@@ -96,15 +96,15 @@ void CRYPTO_cfb128_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*)(ivec+n) ^= *(size_t*)(in+n);

			}

			len -= 16;

			out += 16;

			in  += 16;

		}

			n = 0;

		}

		if (len) {

			(*block)(ivec, ivec, key);

			while (len--) {
@@ -141,7 +141,7 @@ void CRYPTO_cfb128_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 t = *(size_t*)(in+n);

				*(size_t*)(out+n) = *(size_t*)(ivec+n) ^ t;

				*(size_t*)(ivec+n) = t;
@@ -149,8 +149,8 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out, 
			len -= 16;

			out += 16;

			in  += 16;

		}

			n = 0;

		}

		if (len) {

			(*block)(ivec, ivec, key);

			while (len--) {

crypto/modes/ofb128.c

+2 −2
Original line number Diff line number Diff line
@@ -95,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;

		}

		if (len) {

			(*block)(ivec, ivec, key);

			while (len--) {