diff options
| author | Cristian Stoica <cristian.stoica@nxp.com> | 2016-01-25 13:33:46 +0200 |
|---|---|---|
| committer | Zhenhua Luo <zhenhua.luo@nxp.com> | 2016-06-23 10:58:51 +0800 |
| commit | 84cb2cc407cf85459fb463be2aabedd4f12ade77 (patch) | |
| tree | 5bcdd8c2673052d6c3670b7ef9a48767a8f685b6 /recipes-connectivity/openssl/openssl-qoriq/fix-cipher-des-ede3-cfb1.patch | |
| parent | 4cc0cf8255a3726fe3f6cbbe1a877fe2fab7edc6 (diff) | |
| download | meta-fsl-ppc-84cb2cc407cf85459fb463be2aabedd4f12ade77.tar.gz | |
openssl-qoriq: upgrade to 1.0.2h plus fsl patches
upstream recipe extended with patches from fsl and CIOCHASH feature.
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 | 21 |
1 files changed, 10 insertions, 11 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 f0e1778..06d1ea6 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 | |||
| @@ -6,17 +6,16 @@ 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, |