diff options
author | Saul Wold <sgw@linux.intel.com> | 2015-03-04 09:46:48 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-10 10:47:46 +0000 |
commit | f5e4349011bd00aa47d142022dcdd1d1706a9655 (patch) | |
tree | 31b2c535de004b08968cfdb57ce085ca3b70eb83 /meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch | |
parent | 7c504b44ef593f97f5311d0d27f667e85a2eddbb (diff) | |
download | poky-f5e4349011bd00aa47d142022dcdd1d1706a9655.tar.gz |
openssl: Upgrade to 1.0.2
Rebased numerous patches
removed aarch64 initial work since it's part of upstream now
Imported a few additional patches from Debian to support the version-script
and blacklist additional bad certificates.
(From OE-Core rev: 10b689033551c37d6cafa284d82bdccd43f6113e)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch | 85 |
1 files changed, 17 insertions, 68 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch b/meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch index 93ce0343cc..cbce32c89b 100644 --- a/meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch +++ b/meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch | |||
@@ -6,64 +6,13 @@ Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/07/13 | |||
6 | 6 | ||
7 | ported the patch to the 1.0.0e version | 7 | ported the patch to the 1.0.0e version |
8 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01 | 8 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01 |
9 | Index: openssl-1.0.1e/Configure | 9 | Index: openssl-1.0.2/crypto/bn/bn.h |
10 | =================================================================== | 10 | =================================================================== |
11 | --- openssl-1.0.1e.orig/Configure | 11 | --- openssl-1.0.2.orig/crypto/bn/bn.h |
12 | +++ openssl-1.0.1e/Configure | 12 | +++ openssl-1.0.2/crypto/bn/bn.h |
13 | @@ -402,6 +402,7 @@ my %table=( | 13 | @@ -173,6 +173,13 @@ extern "C" { |
14 | "linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | 14 | # endif |
15 | "linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | ||
16 | "linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", | ||
17 | +"linux-x32", "gcc:-mx32 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32", | ||
18 | "linux64-s390x", "gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", | ||
19 | #### So called "highgprs" target for z/Architecture CPUs | ||
20 | # "Highgprs" is kernel feature first implemented in Linux 2.6.32, see | ||
21 | Index: openssl-1.0.1e/crypto/bn/asm/x86_64-gcc.c | ||
22 | =================================================================== | ||
23 | --- openssl-1.0.1e.orig/crypto/bn/asm/x86_64-gcc.c | ||
24 | +++ openssl-1.0.1e/crypto/bn/asm/x86_64-gcc.c | ||
25 | @@ -55,7 +55,7 @@ | ||
26 | * machine. | ||
27 | */ | ||
28 | |||
29 | -#ifdef _WIN64 | ||
30 | +#if defined _WIN64 || !defined __LP64__ | ||
31 | #define BN_ULONG unsigned long long | ||
32 | #else | ||
33 | #define BN_ULONG unsigned long | ||
34 | @@ -192,9 +192,9 @@ BN_ULONG bn_add_words (BN_ULONG *rp, con | ||
35 | asm ( | ||
36 | " subq %2,%2 \n" | ||
37 | ".p2align 4 \n" | ||
38 | - "1: movq (%4,%2,8),%0 \n" | ||
39 | - " adcq (%5,%2,8),%0 \n" | ||
40 | - " movq %0,(%3,%2,8) \n" | ||
41 | + "1: movq (%q4,%2,8),%0 \n" | ||
42 | + " adcq (%q5,%2,8),%0 \n" | ||
43 | + " movq %0,(%q3,%2,8) \n" | ||
44 | " leaq 1(%2),%2 \n" | ||
45 | " loop 1b \n" | ||
46 | " sbbq %0,%0 \n" | ||
47 | @@ -215,9 +215,9 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, con | ||
48 | asm ( | ||
49 | " subq %2,%2 \n" | ||
50 | ".p2align 4 \n" | ||
51 | - "1: movq (%4,%2,8),%0 \n" | ||
52 | - " sbbq (%5,%2,8),%0 \n" | ||
53 | - " movq %0,(%3,%2,8) \n" | ||
54 | + "1: movq (%q4,%2,8),%0 \n" | ||
55 | + " sbbq (%q5,%2,8),%0 \n" | ||
56 | + " movq %0,(%q3,%2,8) \n" | ||
57 | " leaq 1(%2),%2 \n" | ||
58 | " loop 1b \n" | ||
59 | " sbbq %0,%0 \n" | ||
60 | Index: openssl-1.0.1e/crypto/bn/bn.h | ||
61 | =================================================================== | ||
62 | --- openssl-1.0.1e.orig/crypto/bn/bn.h | ||
63 | +++ openssl-1.0.1e/crypto/bn/bn.h | ||
64 | @@ -172,6 +172,13 @@ extern "C" { | ||
65 | # endif | 15 | # endif |
66 | #endif | ||
67 | 16 | ||
68 | +/* Address type. */ | 17 | +/* Address type. */ |
69 | +#ifdef _WIN64 | 18 | +#ifdef _WIN64 |
@@ -72,19 +21,19 @@ Index: openssl-1.0.1e/crypto/bn/bn.h | |||
72 | +#define BN_ADDR unsigned long | 21 | +#define BN_ADDR unsigned long |
73 | +#endif | 22 | +#endif |
74 | + | 23 | + |
75 | /* assuming long is 64bit - this is the DEC Alpha | 24 | /* |
76 | * unsigned long long is only 64 bits :-(, don't define | 25 | * assuming long is 64bit - this is the DEC Alpha unsigned long long is only |
77 | * BN_LLONG for the DEC Alpha */ | 26 | * 64 bits :-(, don't define BN_LLONG for the DEC Alpha |
78 | Index: openssl-1.0.1e/crypto/bn/bn_exp.c | 27 | Index: openssl-1.0.2/crypto/bn/bn_exp.c |
79 | =================================================================== | 28 | =================================================================== |
80 | --- openssl-1.0.1e.orig/crypto/bn/bn_exp.c | 29 | --- openssl-1.0.2.orig/crypto/bn/bn_exp.c |
81 | +++ openssl-1.0.1e/crypto/bn/bn_exp.c | 30 | +++ openssl-1.0.2/crypto/bn/bn_exp.c |
82 | @@ -567,7 +567,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBU | 31 | @@ -638,7 +638,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBU |
83 | 32 | * multiple. | |
84 | /* Given a pointer value, compute the next address that is a cache line multiple. */ | 33 | */ |
85 | #define MOD_EXP_CTIME_ALIGN(x_) \ | 34 | #define MOD_EXP_CTIME_ALIGN(x_) \ |
86 | - ((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((size_t)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK)))) | 35 | - ((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((size_t)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK)))) |
87 | + ((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((BN_ADDR)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK)))) | 36 | + ((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((BN_ADDR)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK)))) |
88 | 37 | ||
89 | /* This variant of BN_mod_exp_mont() uses fixed windows and the special | 38 | /* |
90 | * precomputation memory layout to limit data-dependency to a minimum | 39 | * This variant of BN_mod_exp_mont() uses fixed windows and the special |