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

Merge branch 'OpenSSL_1_0_2-stable' into agl-1.0.2aead

Browse Source
This commit is contained in:
Ben Laurie 2013-10-04 12:59:03 +01:00
commit 2d5dd00f9e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/evp/e_des3.c
View File

@ -119,7 +119,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, static int des_ede_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t inl) const unsigned char *in, size_t inl)
{ {
if (inl>=EVP_MAXCHUNK) while (inl>=EVP_MAXCHUNK)
{ {
DES_ede3_ofb64_encrypt(in, out, (long)EVP_MAXCHUNK, DES_ede3_ofb64_encrypt(in, out, (long)EVP_MAXCHUNK,
&data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3, &data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3,
@ -158,7 +158,7 @@ static int des_ede_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return 1; return 1;
} }
if (inl>=EVP_MAXCHUNK) while (inl>=EVP_MAXCHUNK)
{ {
DES_ede3_cbc_encrypt(in, out, (long)EVP_MAXCHUNK, DES_ede3_cbc_encrypt(in, out, (long)EVP_MAXCHUNK,
&dat->ks1, &dat->ks2, &dat->ks3, &dat->ks1, &dat->ks2, &dat->ks3,
@ -177,7 +177,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, static int des_ede_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t inl) const unsigned char *in, size_t inl)
{ {
if (inl>=EVP_MAXCHUNK) while (inl>=EVP_MAXCHUNK)
{ {
DES_ede3_cfb64_encrypt(in, out, (long)EVP_MAXCHUNK, DES_ede3_cfb64_encrypt(in, out, (long)EVP_MAXCHUNK,
&data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3, &data(ctx)->ks1, &data(ctx)->ks2, &data(ctx)->ks3,