diff options
author | Cristian Stoica <cristian.stoica@nxp.com> | 2016-01-25 13:33:46 +0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-08-12 11:41:02 -0300 |
commit | 0579a92e1ff03656e1c6089714a3be4244622ef0 (patch) | |
tree | 125a6912e920cd54ac31f2e2e44a57f227f048e6 /recipes-connectivity/openssl/openssl-qoriq/fix-cipher-des-ede3-cfb1.patch | |
parent | b8e3085e4e9608b301121c7065c84a3e51b94c74 (diff) | |
download | meta-freescale-0579a92e1ff03656e1c6089714a3be4244622ef0.tar.gz |
openssl-qoriq: upgrade to 1.0.2h plus fsl patches
Based on oe-core openssl-1.0.2h, revision:
e49d337 meta: update patch metadata
extended with patches from fsl to enable more features.
Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
Diffstat (limited to 'recipes-connectivity/openssl/openssl-qoriq/fix-cipher-des-ede3-cfb1.patch')
-rw-r--r-- | recipes-connectivity/openssl/openssl-qoriq/fix-cipher-des-ede3-cfb1.patch | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/recipes-connectivity/openssl/openssl-qoriq/fix-cipher-des-ede3-cfb1.patch b/recipes-connectivity/openssl/openssl-qoriq/fix-cipher-des-ede3-cfb1.patch index f0e17784..2a318a45 100644 --- a/recipes-connectivity/openssl/openssl-qoriq/fix-cipher-des-ede3-cfb1.patch +++ b/recipes-connectivity/openssl/openssl-qoriq/fix-cipher-des-ede3-cfb1.patch | |||
@@ -4,19 +4,18 @@ 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: | 4 | the cipher des-ede3-cfb1. Complete bug log and patch is present here: |
5 | http://rt.openssl.org/Ticket/Display.html?id=2867 | 5 | http://rt.openssl.org/Ticket/Display.html?id=2867 |
6 | 6 | ||
7 | Signed-Off-By: Muhammad Shakeel <muhammad_shakeel@mentor.com> | 7 | Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com> |
8 | 8 | ||
9 | diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c | 9 | Index: openssl-1.0.2/crypto/evp/e_des3.c |
10 | index 3232cfe..df84922 100644 | ||
11 | =================================================================== | 10 | =================================================================== |
12 | --- a/crypto/evp/e_des3.c | 11 | --- openssl-1.0.2.orig/crypto/evp/e_des3.c |
13 | +++ b/crypto/evp/e_des3.c | 12 | +++ openssl-1.0.2/crypto/evp/e_des3.c |
14 | @@ -173,7 +173,7 @@ static int des_ede3_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, | 13 | @@ -211,7 +211,7 @@ static int des_ede3_cfb1_cipher(EVP_CIPH |
15 | size_t n; | 14 | size_t n; |
16 | unsigned char c[1],d[1]; | 15 | unsigned char c[1], d[1]; |
17 | 16 | ||
18 | - for(n=0 ; n < inl ; ++n) | 17 | - for (n = 0; n < inl; ++n) { |
19 | + for(n=0 ; n < inl*8 ; ++n) | 18 | + for (n = 0; n * 8 < inl; ++n) { |
20 | { | 19 | c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0; |
21 | c[0]=(in[n/8]&(1 << (7-n%8))) ? 0x80 : 0; | 20 | DES_ede3_cfb_encrypt(c, d, 1, 1, |
22 | DES_ede3_cfb_encrypt(c,d,1,1, | 21 | &data(ctx)->ks1, &data(ctx)->ks2, |