1 files changed, 36 insertions, 40 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 ab1434a0e7..59a4b7ce9a 100644
--- a/meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch
+++ b/meta/recipes-connectivity/openssl/openssl/openssl_fix_for_x32.patch
@@ -9,22 +9,24 @@ Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01
 
 ported the patch to the 1.0.0m version
 Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com> 2015/03/24
-Index: openssl-1.0.1e/Configure
-===================================================================
---- openssl-1.0.1e.orig/Configure
-+++ openssl-1.0.1e/Configure
-@@ -402,6 +402,7 @@ my %table=(
+
+Ported the patch to 1.0.1t version.
+Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> 2016/05/09
+---
+diff -ruN a/Configure b/Configure
+--- a/Configure 2016-05-04 08:24:51.630028856 +0200
++++ b/Configure 2016-05-04 09:09:14.987332751 +0200
+@@ -417,6 +417,7 @@
  "linux-ia64-ecc","ecc:-DL_ENDIAN -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)",
  "linux-ia64-icc","icc:-DL_ENDIAN -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)",
  "linux-x86_64",        "gcc:-m64 -DL_ENDIAN -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",
 +"linux-x32", "gcc:-mx32 -DL_ENDIAN -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",
+ "linux-x86_64-clang","clang: -m64 -DL_ENDIAN -O3 -Wall -Qunused-arguments::-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",
  "linux64-s390x",       "gcc:-m64 -DB_ENDIAN -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",
  #### So called "highgprs" target for z/Architecture CPUs
- # "Highgprs" is kernel feature first implemented in Linux 2.6.32, see
-Index: openssl-1.0.1e/crypto/bn/asm/x86_64-gcc.c
-===================================================================
---- openssl-1.0.1e.orig/crypto/bn/asm/x86_64-gcc.c
-+++ openssl-1.0.1e/crypto/bn/asm/x86_64-gcc.c
+diff -ruN a/crypto/bn/asm/x86_64-gcc.c b/crypto/bn/asm/x86_64-gcc.c
+--- a/crypto/bn/asm/x86_64-gcc.c        2016-05-03 15:49:00.000000000 +0200
++++ b/crypto/bn/asm/x86_64-gcc.c        2016-05-04 09:07:52.974863300 +0200
 @@ -55,7 +55,7 @@
   *    machine.
   */
@@ -34,30 +36,8 @@ Index: openssl-1.0.1e/crypto/bn/asm/x86_64-gcc.c
  #  define BN_ULONG unsigned long long
  # else
  #  define BN_ULONG unsigned long
-Index: openssl-1.0.1e/crypto/bn/bn.h
-===================================================================
---- openssl-1.0.1e.orig/crypto/bn/bn.h
-+++ openssl-1.0.1e/crypto/bn/bn.h
-@@ -173,6 +173,13 @@ extern "C" {
- #  endif
- # endif
- 
-+/* Address type.  */
-+# ifdef _WIN64
-+#   define BN_ADDR unsigned long long
-+# else
-+#   define BN_ADDR unsigned long
-+# endif
-+
- /*
-  * assuming long is 64bit - this is the DEC Alpha unsigned long long is only
-  * 64 bits :-(, don't define BN_LLONG for the DEC Alpha
-Index: openssl-1.0.1e/crypto/bn/asm/x86_64-gcc.c
-===================================================================
---- openssl-1.0.1m/crypto/bn/asm/x86_64-gcc.c   2015-03-19 13:37:10.000000000 +0000
-+++ openssl-1.0.1m-modif/crypto/bn/asm/x86_64-gcc.c     2015-04-14 17:09:11.876533194 +0100
 @@ -211,9 +211,9 @@
-
+ 
      asm volatile ("       subq    %2,%2           \n"
                    ".p2align 4                     \n"
 -                  "1:     movq    (%4,%2,8),%0    \n"
@@ -70,7 +50,7 @@ Index: openssl-1.0.1e/crypto/bn/asm/x86_64-gcc.c
                    "       loop    1b              \n"
                    "       sbbq    %0,%0           \n":"=&a" (ret), "+c"(n),
 @@ -235,9 +235,9 @@
-
+ 
      asm volatile ("       subq    %2,%2           \n"
                    ".p2align 4                     \n"
 -                  "1:     movq    (%4,%2,8),%0    \n"
@@ -81,12 +61,11 @@ Index: openssl-1.0.1e/crypto/bn/asm/x86_64-gcc.c
 +                  "       movq    %0,(%q3,%2,8)   \n"
                    "       leaq    1(%2),%2        \n"
                    "       loop    1b              \n"
-                   "       sbbq    %0,%0           \n":"=&a" (ret), "+c"(n)
-Index: openssl-1.0.1e/crypto/bn/bn_exp.c
-===================================================================
---- openssl-1.0.1e.orig/crypto/bn/bn_exp.c
-+++ openssl-1.0.1e/crypto/bn/bn_exp.c
-@@ -572,7 +572,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top,
+                   "       sbbq    %0,%0           \n":"=&a" (ret), "+c"(n),
+diff -ruN a/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c
+--- a/crypto/bn/bn_exp.c        2016-05-03 15:49:00.000000000 +0200
++++ b/crypto/bn/bn_exp.c        2016-05-04 09:07:52.974863300 +0200
+@@ -622,7 +622,7 @@
   * multiple.
   */
  #define MOD_EXP_CTIME_ALIGN(x_) \
@@ -95,3 +74,20 @@ Index: openssl-1.0.1e/crypto/bn/bn_exp.c
  
  /*
   * This variant of BN_mod_exp_mont() uses fixed windows and the special
+diff -ruN a/crypto/bn/bn.h b/crypto/bn/bn.h
+--- a/crypto/bn/bn.h    2016-05-03 15:49:00.000000000 +0200
++++ b/crypto/bn/bn.h    2016-05-04 09:07:52.974863300 +0200
+@@ -174,6 +174,13 @@
+ #  endif
+ # endif
+ 
++/* Address type.  */
++# ifdef _WIN64
++#   define BN_ADDR unsigned long long
++# else
++#   define BN_ADDR unsigned long
++# endif
++
+ /*
+  * assuming long is 64bit - this is the DEC Alpha unsigned long long is only
+  * 64 bits :-(, don't define BN_LLONG for the DEC Alpha