Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 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 |