diff options
author | Ben Laurie <ben@links.org> | 2013-10-04 12:59:03 +0100 |
---|---|---|
committer | Ben Laurie <ben@links.org> | 2013-10-04 12:59:03 +0100 |
commit | 2d5dd00f9e82fa695540c267e8df9a93baea894c (patch) | |
tree | 7c70091851998b095d648003ea868d06b41c48b4 | |
parent | cb52183836c8463aa8708cbd6f973d33e7ffa2ca (diff) | |
parent | 4dfac659ff2ca311f860aab1b4878a5868fd83a0 (diff) | |
download | openssl-new-2d5dd00f9e82fa695540c267e8df9a93baea894c.tar.gz |
Merge branch 'OpenSSL_1_0_2-stable' into agl-1.0.2aead
-rw-r--r-- | crypto/evp/e_des3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c index 157d0d515e..fa3b05cf14 100644 --- a/crypto/evp/e_des3.c +++ b/crypto/evp/e_des3.c @@ -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, 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, @@ -158,7 +158,7 @@ static int des_ede_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, return 1; } - if (inl>=EVP_MAXCHUNK) + while (inl>=EVP_MAXCHUNK) { DES_ede3_cbc_encrypt(in, out, (long)EVP_MAXCHUNK, &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, 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, |