diff options
author | Brendan Le Foll <brendan.le.foll@intel.com> | 2015-03-24 18:14:58 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-25 15:05:42 +0000 |
commit | 159f66aea7860b1008b7dcd60d81dfa12d7546d9 (patch) | |
tree | 91f0391425433d648057baef974c1b9c80f7359f /meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch | |
parent | 6b8f7999c3e86d6e834af95ffe4c33d0d53db34a (diff) | |
download | poky-159f66aea7860b1008b7dcd60d81dfa12d7546d9.tar.gz |
openssl: Upgrade to 1.0.1m
Security update, some patches modified to apply correctly mostly due to
upstream changing indentation/styling
* configure-targets.patch updated
* fix-cipher-des-ede3-cfb1.patch updated
* openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch updated
* openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch removed as no
merged with 3942e7d9ebc262fa5c5c42aba0167e06d981f004 in upstream
(From OE-Core rev: 248dec5e550cfcaaaa479a5bff9b79ba5cd0765d)
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch b/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch index f0e177840f..2412a3b7ab 100644 --- a/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch +++ b/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch | |||
@@ -6,17 +6,20 @@ 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 | ported the patch to the 1.0.0m version | ||
10 | Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com> 2015/03/24 | ||
11 | |||
9 | diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c | 12 | diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c |
10 | index 3232cfe..df84922 100644 | 13 | index 3232cfe..df84922 100644 |
11 | =================================================================== | 14 | =================================================================== |
12 | --- a/crypto/evp/e_des3.c | 15 | --- a/crypto/evp/e_des3.c |
13 | +++ b/crypto/evp/e_des3.c | 16 | +++ b/crypto/evp/e_des3.c |
14 | @@ -173,7 +173,7 @@ static int des_ede3_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, | 17 | @@ -181,7 +181,7 @@ static int des_ede3_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, |
15 | size_t n; | 18 | size_t n; |
16 | unsigned char c[1],d[1]; | 19 | unsigned char c[1], d[1]; |
17 | 20 | ||
18 | - for(n=0 ; n < inl ; ++n) | 21 | - for (n = 0; n < inl; ++n) { |
19 | + for(n=0 ; n < inl*8 ; ++n) | 22 | + for (n = 0; n < inl * 8; ++n) { |
20 | { | 23 | c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0; |
21 | c[0]=(in[n/8]&(1 << (7-n%8))) ? 0x80 : 0; | 24 | DES_ede3_cfb_encrypt(c, d, 1, 1, |
22 | DES_ede3_cfb_encrypt(c,d,1,1, | 25 | &data(ctx)->ks1, &data(ctx)->ks2, |