diff options
| author | Pawel Kowalski <p.kowalski2@partner.samsung.com> | 2017-11-24 11:45:40 +0100 |
|---|---|---|
| committer | Pawel Kowalski <p.kowalski2@partner.samsung.com> | 2017-11-24 11:54:29 +0100 |
| commit | 53fdd1d886c8daf5e80d06a25ee87bf49b6b35ab (patch) | |
| tree | 8b4068e30a33d61ab6a737ed54fec5e6e8d56cd3 /crypto/evp/e_des3.c | |
| parent | 2a125e21ef6079bd6da6d1e1c763c6ed068ca3f8 (diff) | |
| parent | 16a871c1cbcffb9c2ba93e253f496a3254354653 (diff) | |
| download | openssl-tizen_4.0_tv.tar.gz openssl-tizen_4.0_tv.tar.bz2 openssl-tizen_4.0_tv.zip | |
Merge tag 'upstream/1.0.2m' into tizen_4.0_basetizen_4.0.IoT.p2_releasesubmit/tizen_base/20171124.114303submit/tizen_4.0_base/20171124.114356accepted/tizen/base/20171208.204006accepted/tizen/4.0/base/20171208.204033tizen_4.0_tv
Upstream version 1.0.2m
Change-Id: I0324687ff87ce098888b7b6918c2f8c2bb4a5e73
Diffstat (limited to 'crypto/evp/e_des3.c')
| -rw-r--r-- | crypto/evp/e_des3.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c index 0e910d6..ab8126e 100644 --- a/crypto/evp/e_des3.c +++ b/crypto/evp/e_des3.c @@ -212,6 +212,8 @@ static int des_ede3_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, size_t n; unsigned char c[1], d[1]; + if (!EVP_CIPHER_CTX_test_flags(ctx, EVP_CIPH_FLAG_LENGTH_BITS)) + inl *= 8; for (n = 0; n < inl; ++n) { c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0; DES_ede3_cfb_encrypt(c, d, 1, 1, |