Commit 41468ed3 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

evp/e_des3.c: fix typo with potential integer overflow on 32-bit platforms. 

Submitted by: Yuriy Kaminskiy
(cherry picked from commit 524b00c0)

Resolved conflicts:

	crypto/evp/e_des3.c
(cherry picked from commit eb22b7ec)
parent 5f0df1f6

crypto/evp/e_des3.c

+3 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static int des_ede_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, 
static int des_ede_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,

			      const unsigned char *in, size_t inl)

{

	if (inl>=EVP_MAXCHUNK)

	while (inl>=EVP_MAXCHUNK)

		{

		DES_ede3_ofb64_encrypt(in, out, (long)EVP_MAXCHUNK,

			       &data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3,
@@ -130,7 +130,7 @@ static int des_ede_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, 
	printf("\n");

	}

#endif    /* KSSL_DEBUG */

	if (inl>=EVP_MAXCHUNK)

	while (inl>=EVP_MAXCHUNK)

		{

		DES_ede3_cbc_encrypt(in, out, (long)EVP_MAXCHUNK,

			     &data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3,
@@ -149,7 +149,7 @@ static int des_ede_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, 
static int des_ede_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,

			      const unsigned char *in, size_t inl)

{

	if (inl>=EVP_MAXCHUNK)

	while (inl>=EVP_MAXCHUNK)

		{

		DES_ede3_cfb64_encrypt(in, out, (long)EVP_MAXCHUNK, 

			       &data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3,