diff options
| author | Muhammad Shakeel <muhammad_shakeel@mentor.com> | 2013-06-13 16:41:20 +0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-17 16:44:36 +0100 |
| commit | ed61c28b9af2f11f46488332b80752b734a3cdeb (patch) | |
| tree | 481499ad05202746dfced4c66df7a6b63b9b17e9 | |
| parent | de1238a589ade1220d51cb4b9277cc17479f6f17 (diff) | |
| download | openembedded-core-ed61c28b9af2f11f46488332b80752b734a3cdeb.tar.gz openembedded-core-ed61c28b9af2f11f46488332b80752b734a3cdeb.tar.bz2 openembedded-core-ed61c28b9af2f11f46488332b80752b734a3cdeb.zip | |
openssl: Add fix for cipher des-ede3-cfb1
Add patch file for one of the ciphers used in openssl, namely the cipher
des-ede3-cfb1. Details of the bug, without this patch, can be found here.
http://rt.openssl.org/Ticket/Display.html?id=2867
Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.1e/fix-cipher-des-ede3-cfb1.patch | 22 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.0.1e.bb | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.1e/fix-cipher-des-ede3-cfb1.patch b/meta/recipes-connectivity/openssl/openssl-1.0.1e/fix-cipher-des-ede3-cfb1.patch new file mode 100644 index 0000000000..f0e177840f --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.1e/fix-cipher-des-ede3-cfb1.patch @@ -0,0 +1,22 @@ +Upstream-Status: Submitted + +This patch adds the fix for one of the ciphers used in openssl, namely +the cipher des-ede3-cfb1. Complete bug log and patch is present here: +http://rt.openssl.org/Ticket/Display.html?id=2867 + +Signed-Off-By: Muhammad Shakeel <muhammad_shakeel@mentor.com> + +diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c +index 3232cfe..df84922 100644 +=================================================================== +--- a/crypto/evp/e_des3.c ++++ b/crypto/evp/e_des3.c +@@ -173,7 +173,7 @@ static int des_ede3_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, + size_t n; + unsigned char c[1],d[1]; + +- for(n=0 ; n < inl ; ++n) ++ for(n=0 ; n < inl*8 ; ++n) + { + c[0]=(in[n/8]&(1 << (7-n%8))) ? 0x80 : 0; + DES_ede3_cfb_encrypt(c,d,1,1, diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb index 61de3a694c..bd6fd046a3 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb @@ -30,6 +30,7 @@ SRC_URI += "file://configure-targets.patch \ file://debian/debian-targets.patch \ file://openssl_fix_for_x32.patch \ file://openssl-fix-doc.patch \ + file://fix-cipher-des-ede3-cfb1.patch \ file://find.pl \ " |