| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Submitted |
| 2 | |
| 3 | This patch adds the fix for one of the ciphers used in openssl, namely |
| 4 | the cipher des-ede3-cfb1. Complete bug log and patch is present here: |
| 5 | http://rt.openssl.org/Ticket/Display.html?id=2867 |
| 6 | |
| 7 | Signed-Off-By: Muhammad Shakeel <muhammad_shakeel@mentor.com> |
| 8 | |
| 9 | Index: openssl-1.0.2/crypto/evp/e_des3.c |
| 10 | =================================================================== |
| 11 | --- openssl-1.0.2.orig/crypto/evp/e_des3.c |
| 12 | +++ openssl-1.0.2/crypto/evp/e_des3.c |
| 13 | @@ -211,7 +211,7 @@ static int des_ede3_cfb1_cipher(EVP_CIPH |
| 14 | size_t n; |
| 15 | unsigned char c[1], d[1]; |
| 16 | |
| 17 | - for (n = 0; n < inl; ++n) { |
| 18 | + for (n = 0; n * 8 < inl; ++n) { |
| 19 | c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0; |
| 20 | DES_ede3_cfb_encrypt(c, d, 1, 1, |
| 21 | &data(ctx)->ks1, &data(ctx)->ks2, |