openssl: version bump 1.0.1i -> 1.0.1j

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

17 files changed, 41 insertions, 41 deletions

diff --git a/patches/openssl-1.0.1i/0001-ca.patch b/patches/openssl-1.0.1j/0001-ca.patch
index a2e37a6f9..bcfab8037 100644
--- a/patches/openssl-1.0.1i/0001-ca.patch
+++ b/patches/openssl-1.0.1j/0001-ca.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 8 Aug 2014 10:24:47 +0200
+Date: Thu, 13 Nov 2014 11:18:27 +0100
 Subject: [PATCH] ca
 
-Imported from openssl_1.0.1i-1.debian.tar.xz
+Imported from openssl_1.0.1j-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
diff --git a/patches/openssl-1.0.1i/0002-debian-targets.patch b/patches/openssl-1.0.1j/0002-debian-targets.patch
index db65895a6..b4619d3c1 100644
--- a/patches/openssl-1.0.1i/0002-debian-targets.patch
+++ b/patches/openssl-1.0.1j/0002-debian-targets.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 8 Aug 2014 10:24:47 +0200
+Date: Thu, 13 Nov 2014 11:18:27 +0100
 Subject: [PATCH] debian-targets
 
-Imported from openssl_1.0.1i-1.debian.tar.xz
+Imported from openssl_1.0.1j-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 53 insertions(+)
 
 diff --git a/Configure b/Configure
-index 36844b7b2f7a..4c5cc040724e 100755
+index 6f0da761b666..b972f040b40c 100755
 --- a/Configure
 +++ b/Configure
 @@ -105,6 +105,10 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimenta
diff --git a/patches/openssl-1.0.1i/0003-engines-path.patch b/patches/openssl-1.0.1j/0003-engines-path.patch
index 7954954cb..30dfeb844 100644
--- a/patches/openssl-1.0.1i/0003-engines-path.patch
+++ b/patches/openssl-1.0.1j/0003-engines-path.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 8 Aug 2014 10:24:47 +0200
+Date: Thu, 13 Nov 2014 11:18:27 +0100
 Subject: [PATCH] engines-path
 
-Imported from openssl_1.0.1i-1.debian.tar.xz
+Imported from openssl_1.0.1j-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -13,10 +13,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  4 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/Configure b/Configure
-index 4c5cc040724e..c4444b9ed25b 100755
+index b972f040b40c..a3f1331d51ed 100755
 --- a/Configure
 +++ b/Configure
-@@ -1858,7 +1858,7 @@ while (<IN>)
+@@ -1861,7 +1861,7 @@ while (<IN>)
  		}
  	elsif	(/^#define\s+ENGINESDIR/)
  		{
diff --git a/patches/openssl-1.0.1i/0004-no-rpath.patch b/patches/openssl-1.0.1j/0004-no-rpath.patch
index ef2721ef2..4165f8ef2 100644
--- a/patches/openssl-1.0.1i/0004-no-rpath.patch
+++ b/patches/openssl-1.0.1j/0004-no-rpath.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 8 Aug 2014 10:24:47 +0200
+Date: Thu, 13 Nov 2014 11:18:27 +0100
 Subject: [PATCH] no-rpath
 
-Imported from openssl_1.0.1i-1.debian.tar.xz
+Imported from openssl_1.0.1j-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
diff --git a/patches/openssl-1.0.1i/0005-no-symbolic.patch b/patches/openssl-1.0.1j/0005-no-symbolic.patch
index ea267b1a7..93265593a 100644
--- a/patches/openssl-1.0.1i/0005-no-symbolic.patch
+++ b/patches/openssl-1.0.1j/0005-no-symbolic.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 8 Aug 2014 10:24:47 +0200
+Date: Thu, 13 Nov 2014 11:18:27 +0100
 Subject: [PATCH] no-symbolic
 
-Imported from openssl_1.0.1i-1.debian.tar.xz
+Imported from openssl_1.0.1j-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
diff --git a/patches/openssl-1.0.1i/0006-pic.patch b/patches/openssl-1.0.1j/0006-pic.patch
index 5e68f4675..55a5313d9 100644
--- a/patches/openssl-1.0.1i/0006-pic.patch
+++ b/patches/openssl-1.0.1j/0006-pic.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 8 Aug 2014 10:24:47 +0200
+Date: Thu, 13 Nov 2014 11:18:27 +0100
 Subject: [PATCH] pic
 
-Imported from openssl_1.0.1i-1.debian.tar.xz
+Imported from openssl_1.0.1j-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
diff --git a/patches/openssl-1.0.1i/0007-valgrind.patch b/patches/openssl-1.0.1j/0007-valgrind.patch
index 247f60da9..306ef02a8 100644
--- a/patches/openssl-1.0.1i/0007-valgrind.patch
+++ b/patches/openssl-1.0.1j/0007-valgrind.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 8 Aug 2014 10:24:47 +0200
+Date: Thu, 13 Nov 2014 11:18:27 +0100
 Subject: [PATCH] valgrind
 
-Imported from openssl_1.0.1i-1.debian.tar.xz
+Imported from openssl_1.0.1j-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
diff --git a/patches/openssl-1.0.1i/0008-rehash-crt.patch b/patches/openssl-1.0.1j/0008-rehash-crt.patch
index 16b746b94..25291221e 100644
--- a/patches/openssl-1.0.1i/0008-rehash-crt.patch
+++ b/patches/openssl-1.0.1j/0008-rehash-crt.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 8 Aug 2014 10:24:47 +0200
+Date: Thu, 13 Nov 2014 11:18:27 +0100
 Subject: [PATCH] rehash-crt
 
-Imported from openssl_1.0.1i-1.debian.tar.xz
+Imported from openssl_1.0.1j-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
diff --git a/patches/openssl-1.0.1i/0009-shared-lib-ext.patch b/patches/openssl-1.0.1j/0009-shared-lib-ext.patch
index 34c8c9f9f..348bbdd3a 100644
--- a/patches/openssl-1.0.1i/0009-shared-lib-ext.patch
+++ b/patches/openssl-1.0.1j/0009-shared-lib-ext.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 8 Aug 2014 10:24:47 +0200
+Date: Thu, 13 Nov 2014 11:18:27 +0100
 Subject: [PATCH] shared-lib-ext
 
-Imported from openssl_1.0.1i-1.debian.tar.xz
+Imported from openssl_1.0.1j-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/Configure b/Configure
-index c4444b9ed25b..d76552f4771e 100755
+index a3f1331d51ed..dc6d760a8ecc 100755
 --- a/Configure
 +++ b/Configure
 @@ -1728,7 +1728,8 @@ while (<IN>)
diff --git a/patches/openssl-1.0.1i/0010-stddef.patch b/patches/openssl-1.0.1j/0010-stddef.patch
index 5b33d6dec..1ddce0235 100644
--- a/patches/openssl-1.0.1i/0010-stddef.patch
+++ b/patches/openssl-1.0.1j/0010-stddef.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 8 Aug 2014 10:24:47 +0200
+Date: Thu, 13 Nov 2014 11:18:27 +0100
 Subject: [PATCH] stddef
 
-Imported from openssl_1.0.1i-1.debian.tar.xz
+Imported from openssl_1.0.1j-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
diff --git a/patches/openssl-1.0.1i/0011-block_diginotar.patch b/patches/openssl-1.0.1j/0011-block_diginotar.patch
index db99a5a21..4a93d3a76 100644
--- a/patches/openssl-1.0.1i/0011-block_diginotar.patch
+++ b/patches/openssl-1.0.1j/0011-block_diginotar.patch
@@ -1,11 +1,11 @@
 From: Raphael Geissert <geissert@debian.org>
-Date: Fri, 8 Aug 2014 10:24:47 +0200
+Date: Thu, 13 Nov 2014 11:18:27 +0100
 Subject: [PATCH] block_diginotar
 
 This is not meant as final patch.
 
 
-Imported from openssl_1.0.1i-1.debian.tar.xz
+Imported from openssl_1.0.1j-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
diff --git a/patches/openssl-1.0.1i/0012-block_digicert_malaysia.patch b/patches/openssl-1.0.1j/0012-block_digicert_malaysia.patch
index 81d652dce..053cda398 100644
--- a/patches/openssl-1.0.1i/0012-block_digicert_malaysia.patch
+++ b/patches/openssl-1.0.1j/0012-block_digicert_malaysia.patch
@@ -1,8 +1,8 @@
 From: Raphael Geissert <geissert@debian.org>
-Date: Fri, 8 Aug 2014 10:24:47 +0200
+Date: Thu, 13 Nov 2014 11:18:27 +0100
 Subject: [PATCH] block_digicert_malaysia
 
-Imported from openssl_1.0.1i-1.debian.tar.xz
+Imported from openssl_1.0.1j-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
diff --git a/patches/openssl-1.0.1i/0013-Change-default-bit-size-and-digest.patch b/patches/openssl-1.0.1j/0013-Change-default-bit-size-and-digest.patch
index a0f974866..7c8a6bc53 100644
--- a/patches/openssl-1.0.1i/0013-Change-default-bit-size-and-digest.patch
+++ b/patches/openssl-1.0.1j/0013-Change-default-bit-size-and-digest.patch
@@ -2,7 +2,7 @@ From: Kurt Roeckx <kurt@roeckx.be>
 Date: Fri, 1 Nov 2013 20:47:14 +0100
 Subject: [PATCH] Change default bit size and digest
 
-Imported from openssl_1.0.1i-1.debian.tar.xz
+Imported from openssl_1.0.1j-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -78,10 +78,10 @@ index 18760c6e673d..1eb86c401263 100644
  distinguished_name	= req_distinguished_name
  attributes		= req_attributes
 diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
-index 376156ec5ef3..13318d70aa6e 100644
+index 5af76eade59a..0a7520221690 100644
 --- a/crypto/dsa/dsa_ameth.c
 +++ b/crypto/dsa/dsa_ameth.c
-@@ -628,7 +628,7 @@ static int dsa_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
+@@ -634,7 +634,7 @@ static int dsa_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
  #endif
  
  		case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
@@ -91,10 +91,10 @@ index 376156ec5ef3..13318d70aa6e 100644
  
  		default:
 diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
-index f715a238a6fc..e91f8d621c8e 100644
+index 11283769b939..6b24725db608 100644
 --- a/crypto/ec/ec_ameth.c
 +++ b/crypto/ec/ec_ameth.c
-@@ -616,7 +616,7 @@ static int ec_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
+@@ -618,7 +618,7 @@ static int ec_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
  #endif
  
  		case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
diff --git a/patches/openssl-1.0.1i/0014-openssl_fix_for_x32.patch b/patches/openssl-1.0.1j/0014-openssl_fix_for_x32.patch
index 1305eb90d..d593dab72 100644
--- a/patches/openssl-1.0.1i/0014-openssl_fix_for_x32.patch
+++ b/patches/openssl-1.0.1j/0014-openssl_fix_for_x32.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 8 Aug 2014 10:24:47 +0200
+Date: Thu, 13 Nov 2014 11:18:27 +0100
 Subject: [PATCH] openssl_fix_for_x32
 
-Imported from openssl_1.0.1i-1.debian.tar.xz
+Imported from openssl_1.0.1j-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/crypto/bn/asm/x86_64-gcc.c b/crypto/bn/asm/x86_64-gcc.c
-index acb0b401181e..acd76cee2f74 100644
+index 31476abebfb7..e04d4958bdc8 100644
 --- a/crypto/bn/asm/x86_64-gcc.c
 +++ b/crypto/bn/asm/x86_64-gcc.c
 @@ -55,7 +55,7 @@
@@ -23,7 +23,7 @@ index acb0b401181e..acd76cee2f74 100644
  #else
  #define BN_ULONG unsigned long
 @@ -192,9 +192,9 @@ BN_ULONG bn_add_words (BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,int
- 	asm (
+ 	asm volatile (
  	"	subq	%2,%2		\n"
  	".p2align 4			\n"
 -	"1:	movq	(%4,%2,8),%0	\n"
@@ -36,7 +36,7 @@ index acb0b401181e..acd76cee2f74 100644
  	"	loop	1b		\n"
  	"	sbbq	%0,%0		\n"
 @@ -215,9 +215,9 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,int
- 	asm (
+ 	asm volatile (
  	"	subq	%2,%2		\n"
  	".p2align 4			\n"
 -	"1:	movq	(%4,%2,8),%0	\n"
diff --git a/patches/openssl-1.0.1i/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch b/patches/openssl-1.0.1j/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch
index 4d0951b10..563a8f1dc 100644
--- a/patches/openssl-1.0.1i/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch
+++ b/patches/openssl-1.0.1j/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch
@@ -8,7 +8,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Configure b/Configure
-index d76552f4771e..f58e7874caa3 100755
+index dc6d760a8ecc..75590e1747d1 100755
 --- a/Configure
 +++ b/Configure
 @@ -106,7 +106,7 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimenta
diff --git a/patches/openssl-1.0.1i/series b/patches/openssl-1.0.1j/series
index ad425bbb6..ad425bbb6 100644
--- a/patches/openssl-1.0.1i/series
+++ b/patches/openssl-1.0.1j/series
diff --git a/rules/openssl.make b/rules/openssl.make
index 293986850..56cd6b7b3 100644
--- a/rules/openssl.make
+++ b/rules/openssl.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_OPENSSL) += openssl
 #
 # Paths and names
 #
-OPENSSL_VERSION	:= 1.0.1i
-OPENSSL_MD5	:= c8dc151a671b9b92ff3e4c118b174972
+OPENSSL_VERSION	:= 1.0.1j
+OPENSSL_MD5	:= f7175c9cd3c39bb1907ac8bba9df8ed3
 OPENSSL		:= openssl-$(OPENSSL_VERSION)
 OPENSSL_SUFFIX	:= tar.gz
 OPENSSL_URL	:= http://www.openssl.org/source/$(OPENSSL).$(OPENSSL_SUFFIX)