diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-03-28 15:43:07 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-03 09:53:48 +0100 |
commit | b8be402e0259fbcd639353aefe2329fb4e43f1bb (patch) | |
tree | a0d80f53952fbd974bfe3d78e6cfd95a2e9927c2 /meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl_fix_for_x32.patch | |
parent | 26f09806b8a2456719dd754a460b6bb9c8e3c211 (diff) | |
download | poky-b8be402e0259fbcd639353aefe2329fb4e43f1bb.tar.gz |
openssl: update 1.0.2n -> 1.0.2o
Please see this security advisory:
https://www.openssl.org/news/secadv/20180327.txt
License-Update: copyright years
(From OE-Core rev: 13542282e34c078296c46a98721b31ed9a69a980)
(From OE-Core rev: 9460cdd9227edcca425b919d5b9061d1da55528b)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl_fix_for_x32.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl_fix_for_x32.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl_fix_for_x32.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl_fix_for_x32.patch new file mode 100644 index 0000000000..0f08a642f6 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl_fix_for_x32.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Received from H J Liu @ Intel | ||
4 | Make the assembly syntax compatible with x32 gcc. Othewise x32 gcc throws errors. | ||
5 | Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/07/13 | ||
6 | |||
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 | ||
9 | Index: openssl-1.0.2/crypto/bn/bn.h | ||
10 | =================================================================== | ||
11 | --- openssl-1.0.2.orig/crypto/bn/bn.h | ||
12 | +++ openssl-1.0.2/crypto/bn/bn.h | ||
13 | @@ -173,6 +173,13 @@ extern "C" { | ||
14 | # endif | ||
15 | # endif | ||
16 | |||
17 | +/* Address type. */ | ||
18 | +#ifdef _WIN64 | ||
19 | +#define BN_ADDR unsigned long long | ||
20 | +#else | ||
21 | +#define BN_ADDR unsigned long | ||
22 | +#endif | ||
23 | + | ||
24 | /* | ||
25 | * assuming long is 64bit - this is the DEC Alpha unsigned long long is only | ||
26 | * 64 bits :-(, don't define BN_LLONG for the DEC Alpha | ||
27 | Index: openssl-1.0.2/crypto/bn/bn_exp.c | ||
28 | =================================================================== | ||
29 | --- openssl-1.0.2.orig/crypto/bn/bn_exp.c | ||
30 | +++ openssl-1.0.2/crypto/bn/bn_exp.c | ||
31 | @@ -638,7 +638,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBU | ||
32 | * multiple. | ||
33 | */ | ||
34 | #define MOD_EXP_CTIME_ALIGN(x_) \ | ||
35 | - ((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((size_t)(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)))) | ||
37 | |||
38 | /* | ||
39 | * This variant of BN_mod_exp_mont() uses fixed windows and the special | ||