openssl: bump to 1.0.0j

Fixes CVE-2012-2333

http://www.openssl.org/news/secadv_20120510.txt
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-2333

Signed-off-by: George McCollister <george.mccollister@gmail.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

21 files changed, 92 insertions, 186 deletions

diff --git a/patches/openssl-1.0.0h/0005-debian-kfreebsd-pipe.patch b/patches/openssl-1.0.0h/0005-debian-kfreebsd-pipe.patch
deleted file mode 100644
index c72f13b87..000000000
--- a/patches/openssl-1.0.0h/0005-debian-kfreebsd-pipe.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From fd3576d36606be6953b3dda66dc3fe31cb6399fb Mon Sep 17 00:00:00 2001
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 22 Feb 2011 13:56:43 +0100
-Subject: [PATCH 05/18] debian kfreebsd-pipe
-
-Applied kfreebsd-pipe.patch from openssl_1.0.0c-2.debian.tar.gz
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- crypto/perlasm/x86_64-xlate.pl |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
-index 674da3b..8d50b67 100755
---- a/crypto/perlasm/x86_64-xlate.pl
-+++ b/crypto/perlasm/x86_64-xlate.pl
-@@ -66,7 +66,7 @@ if ($flavour =~ /\./) { $output = $flavour; undef $flavour; }
-   my ($outdev,$outino,@junk)=stat($output);
- 
-     open STDOUT,">$output" || die "can't open $output: $!"
--	if ($stddev!=$outdev || $stdino!=$outino);
-+#	if ($stddev!=$outdev || $stdino!=$outino);
- }
- 
- my $gas=1;	$gas=0 if ($output =~ /\.asm$/);
--- 
-1.7.8.4
-
diff --git a/patches/openssl-1.0.0h/series b/patches/openssl-1.0.0h/series
deleted file mode 100644
index ec25c39c2..000000000
--- a/patches/openssl-1.0.0h/series
+++ /dev/null
@@ -1,18 +0,0 @@
-0001-debian-ca.patch
-0002-debian-config-hurd.patch
-0003-debian-debian-targets.patch
-0004-debian-engines-path.patch
-0005-debian-kfreebsd-pipe.patch
-0006-debian-make-targets.patch
-0007-debian-man-dir.patch
-0008-debian-man-section.patch
-0009-debian-no-rpath.patch
-0010-debian-no-symbolic.patch
-0011-debian-pic.patch
-0012-debian-valgrind.patch
-0013-debian-rehash-crt.patch
-0014-debian-rehash_pod.patch
-0015-debian-shared-lib-ext.patch
-0016-debian-stddef.patch
-0017-debian-version-script.patch
-0018-debian-gnu_source.patch
diff --git a/patches/openssl-1.0.0h/0001-debian-ca.patch b/patches/openssl-1.0.0j/0001-debian-ca.patch
index b6f7b993f..c3856229d 100644
--- a/patches/openssl-1.0.0h/0001-debian-ca.patch
+++ b/patches/openssl-1.0.0j/0001-debian-ca.patch
@@ -1,14 +1,13 @@
-From 23350fabedeb0ebc4af9ebe394b2de96c66c31bc Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Tue, 22 Feb 2011 13:56:43 +0100
-Subject: [PATCH 01/18] debian ca
+Subject: [PATCH] debian ca
 
 Applied ca.patch from openssl_1.0.0c-2.debian.tar.gz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- apps/CA.pl.in |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ apps/CA.pl.in | 2 ++
+ 1 file changed, 2 insertions(+)
 
 diff --git a/apps/CA.pl.in b/apps/CA.pl.in
 index c783a6e..fa665b7 100644
@@ -30,6 +29,3 @@ index c783a6e..fa665b7 100644
  	    exit 1;
  	}
  }
--- 
-1.7.8.4
-
diff --git a/patches/openssl-1.0.0h/0002-debian-config-hurd.patch b/patches/openssl-1.0.0j/0002-debian-config-hurd.patch
index 7f8cf1428..8f6639d4d 100644
--- a/patches/openssl-1.0.0h/0002-debian-config-hurd.patch
+++ b/patches/openssl-1.0.0j/0002-debian-config-hurd.patch
@@ -1,17 +1,16 @@
-From f246dd52f00c8d6291fa4b26cf03a11e9118b484 Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Tue, 22 Feb 2011 13:56:43 +0100
-Subject: [PATCH 02/18] debian config-hurd
+Subject: [PATCH] debian config-hurd
 
 Applied config-hurd.patch from openssl_1.0.0c-2.debian.tar.gz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- config |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ config | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/config b/config
-index cf64ec5..512074c 100755
+index 2cb4613..54f26ac 100755
 --- a/config
 +++ b/config
 @@ -170,8 +170,8 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
@@ -25,6 +24,3 @@ index cf64ec5..512074c 100755
  	;;
  
      LynxOS:*)
--- 
-1.7.8.4
-
diff --git a/patches/openssl-1.0.0h/0003-debian-debian-targets.patch b/patches/openssl-1.0.0j/0003-debian-debian-targets.patch
index 45609d4b7..b8cbf9970 100644
--- a/patches/openssl-1.0.0h/0003-debian-debian-targets.patch
+++ b/patches/openssl-1.0.0j/0003-debian-debian-targets.patch
@@ -1,14 +1,13 @@
-From bdb352b3a22e26c0c949b3e2adf58bbae9d54604 Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Tue, 22 Feb 2011 13:56:43 +0100
-Subject: [PATCH 03/18] debian debian-targets
+Subject: [PATCH] debian debian-targets
 
 Applied debian-targets.patch from openssl_1.0.0c-2.debian.tar.gz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- Configure |   41 +++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 41 insertions(+), 0 deletions(-)
+ Configure | 41 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 41 insertions(+)
 
 diff --git a/Configure b/Configure
 index 93d708b..7dc0016 100755
@@ -62,6 +61,3 @@ index 93d708b..7dc0016 100755
  ####
  #### Variety of LINUX:-)
  ####
--- 
-1.7.8.4
-
diff --git a/patches/openssl-1.0.0h/0004-debian-engines-path.patch b/patches/openssl-1.0.0j/0004-debian-engines-path.patch
index 87d1ef4a8..bfa4c6a0f 100644
--- a/patches/openssl-1.0.0h/0004-debian-engines-path.patch
+++ b/patches/openssl-1.0.0j/0004-debian-engines-path.patch
@@ -1,16 +1,15 @@
-From 3bed0ce58075ea518598b9f6d01cf2c1aacab02e Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Tue, 22 Feb 2011 13:56:43 +0100
-Subject: [PATCH 04/18] debian engines-path
+Subject: [PATCH] debian engines-path
 
 Applied engines-path.patch from openssl_1.0.0c-2.debian.tar.gz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- Configure               |    2 +-
- Makefile.org            |    2 +-
- engines/Makefile        |   10 +++++-----
- engines/ccgost/Makefile |    6 +++---
+ Configure               |  2 +-
+ Makefile.org            |  2 +-
+ engines/Makefile        | 10 +++++-----
+ engines/ccgost/Makefile |  6 +++---
  4 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/Configure b/Configure
@@ -27,7 +26,7 @@ index 7dc0016..6ec6823 100755
  		print OUT "#define ENGINESDIR \"$foo\"\n";
  		}
 diff --git a/Makefile.org b/Makefile.org
-index 29fd4c3..fafe30d 100644
+index 808b99e..65517b2 100644
 --- a/Makefile.org
 +++ b/Makefile.org
 @@ -500,7 +500,7 @@ install: all install_docs install_sw
@@ -91,6 +90,3 @@ index dadb523..2c88759 100644
  	fi
  
  links:
--- 
-1.7.8.4
-
diff --git a/patches/openssl-1.0.0h/0006-debian-make-targets.patch b/patches/openssl-1.0.0j/0005-debian-make-targets.patch
index aeb3c21d8..7357ec42b 100644
--- a/patches/openssl-1.0.0h/0006-debian-make-targets.patch
+++ b/patches/openssl-1.0.0j/0005-debian-make-targets.patch
@@ -1,17 +1,16 @@
-From 62634fda2e619295a70e05e7b64b2fcd55818c95 Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Tue, 22 Feb 2011 13:56:43 +0100
-Subject: [PATCH 06/18] debian make-targets
+Subject: [PATCH] debian make-targets
 
 Applied make-targets.patch from openssl_1.0.0c-2.debian.tar.gz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- Makefile.org |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ Makefile.org | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.org b/Makefile.org
-index fafe30d..ec07d38 100644
+index 65517b2..21304f1 100644
 --- a/Makefile.org
 +++ b/Makefile.org
 @@ -109,7 +109,7 @@ LIBKRB5=
@@ -23,6 +22,3 @@ index fafe30d..ec07d38 100644
  ENGDIRS= ccgost
  SHLIBDIRS= crypto ssl
  
--- 
-1.7.8.4
-
diff --git a/patches/openssl-1.0.0h/0007-debian-man-dir.patch b/patches/openssl-1.0.0j/0006-debian-man-dir.patch
index 243118f19..220266959 100644
--- a/patches/openssl-1.0.0h/0007-debian-man-dir.patch
+++ b/patches/openssl-1.0.0j/0006-debian-man-dir.patch
@@ -1,17 +1,16 @@
-From c0c5c223f5e25672d34ed53ebea28266033e41af Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Tue, 22 Feb 2011 13:56:43 +0100
-Subject: [PATCH 07/18] debian man-dir
+Subject: [PATCH] debian man-dir
 
 Applied man-dir.patch from openssl_1.0.0c-2.debian.tar.gz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- Makefile.org |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ Makefile.org | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.org b/Makefile.org
-index ec07d38..ff33e42 100644
+index 21304f1..572fe1d 100644
 --- a/Makefile.org
 +++ b/Makefile.org
 @@ -131,7 +131,7 @@ TESTS = alltests
@@ -23,6 +22,3 @@ index ec07d38..ff33e42 100644
  MAN1=1
  MAN3=3
  MANSUFFIX=
--- 
-1.7.8.4
-
diff --git a/patches/openssl-1.0.0h/0008-debian-man-section.patch b/patches/openssl-1.0.0j/0007-debian-man-section.patch
index 5d0df6354..540bd7d27 100644
--- a/patches/openssl-1.0.0h/0008-debian-man-section.patch
+++ b/patches/openssl-1.0.0j/0007-debian-man-section.patch
@@ -1,17 +1,16 @@
-From 82beb140cb033c499f4f8087fb3764c1433e3f58 Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Tue, 22 Feb 2011 13:56:43 +0100
-Subject: [PATCH 08/18] debian man-section
+Subject: [PATCH] debian man-section
 
 Applied man-section.patch from openssl_1.0.0c-2.debian.tar.gz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- Makefile.org |    7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
+ Makefile.org | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/Makefile.org b/Makefile.org
-index ff33e42..ce30b46 100644
+index 572fe1d..ae37b94 100644
 --- a/Makefile.org
 +++ b/Makefile.org
 @@ -134,7 +134,8 @@ MAKEFILE= Makefile
@@ -42,6 +41,3 @@ index ff33e42..ce30b46 100644
  			--release=$(VERSION) `basename $$i`") \
  			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
  		$(PERL) util/extract-names.pl < $$i | \
--- 
-1.7.8.4
-
diff --git a/patches/openssl-1.0.0h/0009-debian-no-rpath.patch b/patches/openssl-1.0.0j/0008-debian-no-rpath.patch
index d7e3ec699..1c52d5953 100644
--- a/patches/openssl-1.0.0h/0009-debian-no-rpath.patch
+++ b/patches/openssl-1.0.0j/0008-debian-no-rpath.patch
@@ -1,14 +1,13 @@
-From 97971ff31e5e3539a69bf29457ba55357d28ca1a Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Tue, 22 Feb 2011 13:56:43 +0100
-Subject: [PATCH 09/18] debian no-rpath
+Subject: [PATCH] debian no-rpath
 
 Applied no-rpath.patch from openssl_1.0.0c-2.debian.tar.gz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- Makefile.shared |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ Makefile.shared | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.shared b/Makefile.shared
 index e753f44..6e3f886 100644
@@ -23,6 +22,3 @@ index e753f44..6e3f886 100644
  
  #This is rather special.  It's a special target with which one can link
  #applications without bothering with any features that have anything to
--- 
-1.7.8.4
-
diff --git a/patches/openssl-1.0.0h/0010-debian-no-symbolic.patch b/patches/openssl-1.0.0j/0009-debian-no-symbolic.patch
index 1f16d8833..ade707a99 100644
--- a/patches/openssl-1.0.0h/0010-debian-no-symbolic.patch
+++ b/patches/openssl-1.0.0j/0009-debian-no-symbolic.patch
@@ -1,14 +1,13 @@
-From 7d5cbc0a8a01c47cf7f8899a45551f622d7e4a11 Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Tue, 22 Feb 2011 13:56:43 +0100
-Subject: [PATCH 10/18] debian no-symbolic
+Subject: [PATCH] debian no-symbolic
 
 Applied no-symbolic.patch from openssl_1.0.0c-2.debian.tar.gz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- Makefile.shared |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ Makefile.shared | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.shared b/Makefile.shared
 index 6e3f886..44e3d9c 100644
@@ -23,6 +22,3 @@ index 6e3f886..44e3d9c 100644
  
  DO_GNU_APP=LDFLAGS="$(CFLAGS)"
  
--- 
-1.7.8.4
-
diff --git a/patches/openssl-1.0.0h/0011-debian-pic.patch b/patches/openssl-1.0.0j/0010-debian-pic.patch
index 805bf0bd4..4a8e00905 100644
--- a/patches/openssl-1.0.0h/0011-debian-pic.patch
+++ b/patches/openssl-1.0.0j/0010-debian-pic.patch
@@ -1,22 +1,21 @@
-From 081f2bc05a7231de8eb5b4763840966c4974f2fe Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Tue, 22 Feb 2011 13:56:43 +0100
-Subject: [PATCH 11/18] debian pic
+Subject: [PATCH] debian pic
 
 Applied pic.patch from openssl_1.0.0c-2.debian.tar.gz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- crypto/Makefile                |    4 ++--
- crypto/aes/Makefile            |    2 +-
- crypto/aes/asm/aes-x86_64.pl   |    4 ++++
- crypto/des/asm/desboth.pl      |   17 ++++++++++++++---
- crypto/perlasm/cbc.pl          |   24 ++++++++++++++++++++----
- crypto/perlasm/x86_64-xlate.pl |    2 +-
- crypto/perlasm/x86gas.pl       |   10 ++++++++++
- crypto/rc4/Makefile            |    2 +-
- crypto/rc4/asm/rc4-x86_64.pl   |    8 ++++++++
- crypto/x86_64cpuid.pl          |    4 ++++
+ crypto/Makefile                |  4 ++--
+ crypto/aes/Makefile            |  2 +-
+ crypto/aes/asm/aes-x86_64.pl   |  4 ++++
+ crypto/des/asm/desboth.pl      | 17 ++++++++++++++---
+ crypto/perlasm/cbc.pl          | 24 ++++++++++++++++++++----
+ crypto/perlasm/x86_64-xlate.pl |  2 +-
+ crypto/perlasm/x86gas.pl       | 10 ++++++++++
+ crypto/rc4/Makefile            |  2 +-
+ crypto/rc4/asm/rc4-x86_64.pl   |  8 ++++++++
+ crypto/x86_64cpuid.pl          |  4 ++++
  10 files changed, 65 insertions(+), 12 deletions(-)
 
 diff --git a/crypto/Makefile b/crypto/Makefile
@@ -168,10 +167,10 @@ index 6fc2510..f2c8139 100644
  	&mov("eax",	&DWP($data_off,"esp","",0));	# get return
  	&mov("ebx",	&DWP($data_off+4,"esp","",0));	#
 diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
-index 8d50b67..311cbcf 100755
+index 544fa93..8a85b61 100755
 --- a/crypto/perlasm/x86_64-xlate.pl
 +++ b/crypto/perlasm/x86_64-xlate.pl
-@@ -639,7 +639,7 @@ while($line=<>) {
+@@ -635,7 +635,7 @@ while($line=<>) {
  
      chomp($line);
  
@@ -259,6 +258,3 @@ index c96821a..b35762b 100644
  
  .text
  
--- 
-1.7.8.4
-
diff --git a/patches/openssl-1.0.0h/0012-debian-valgrind.patch b/patches/openssl-1.0.0j/0011-debian-valgrind.patch
index 99bbd4b51..cd4518f2d 100644
--- a/patches/openssl-1.0.0h/0012-debian-valgrind.patch
+++ b/patches/openssl-1.0.0j/0011-debian-valgrind.patch
@@ -1,14 +1,13 @@
-From 6bc9a385b1c9d38e57a6a44b409f21e709231c80 Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Tue, 22 Feb 2011 13:56:43 +0100
-Subject: [PATCH 12/18] debian valgrind
+Subject: [PATCH] debian valgrind
 
 Applied valgrind.patch from openssl_1.0.0c-2.debian.tar.gz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- crypto/rand/md_rand.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ crypto/rand/md_rand.c | 2 ++
+ 1 file changed, 2 insertions(+)
 
 diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
 index b2f04ff..79d46c6 100644
@@ -30,6 +29,3 @@ index b2f04ff..79d46c6 100644
  
  		k=(st_idx+MD_DIGEST_LENGTH/2)-st_num;
  		if (k > 0)
--- 
-1.7.8.4
-
diff --git a/patches/openssl-1.0.0h/0013-debian-rehash-crt.patch b/patches/openssl-1.0.0j/0012-debian-rehash-crt.patch
index 3bd366db6..d7be56967 100644
--- a/patches/openssl-1.0.0h/0013-debian-rehash-crt.patch
+++ b/patches/openssl-1.0.0j/0012-debian-rehash-crt.patch
@@ -1,14 +1,13 @@
-From d74285cc45273fc0e3f91c699a3425b5d8744dbe Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Tue, 22 Feb 2011 13:56:44 +0100
-Subject: [PATCH 13/18] debian rehash-crt
+Subject: [PATCH] debian rehash-crt
 
 Applied rehash-crt.patch from openssl_1.0.0c-2.debian.tar.gz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- tools/c_rehash.in |   12 +++++++++---
- 1 files changed, 9 insertions(+), 3 deletions(-)
+ tools/c_rehash.in | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
 
 diff --git a/tools/c_rehash.in b/tools/c_rehash.in
 index bfc4a69..4958e3d 100644
@@ -43,6 +42,3 @@ index bfc4a69..4958e3d 100644
  		chomp $hash;
  		chomp $fprint;
  		$fprint =~ s/^.*=//;
--- 
-1.7.8.4
-
diff --git a/patches/openssl-1.0.0h/0014-debian-rehash_pod.patch b/patches/openssl-1.0.0j/0013-debian-rehash_pod.patch
index cc6db03f8..1dde35c29 100644
--- a/patches/openssl-1.0.0h/0014-debian-rehash_pod.patch
+++ b/patches/openssl-1.0.0j/0013-debian-rehash_pod.patch
@@ -1,14 +1,13 @@
-From 63c1537fa5ea3500c28cd2a0c3b5a5415418e74f Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Tue, 22 Feb 2011 13:56:44 +0100
-Subject: [PATCH 14/18] debian rehash_pod
+Subject: [PATCH] debian rehash_pod
 
 Applied rehash_pod.patch from openssl_1.0.0c-2.debian.tar.gz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- doc/apps/c_rehash.pod |   55 +++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 55 insertions(+), 0 deletions(-)
+ doc/apps/c_rehash.pod | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 55 insertions(+)
  create mode 100644 doc/apps/c_rehash.pod
 
 diff --git a/doc/apps/c_rehash.pod b/doc/apps/c_rehash.pod
@@ -72,6 +71,3 @@ index 0000000..5f0c985
 +No known bugs
 +
 +=cut
--- 
-1.7.8.4
-
diff --git a/patches/openssl-1.0.0h/0015-debian-shared-lib-ext.patch b/patches/openssl-1.0.0j/0014-debian-shared-lib-ext.patch
index e8003b6a6..02af39e91 100644
--- a/patches/openssl-1.0.0h/0015-debian-shared-lib-ext.patch
+++ b/patches/openssl-1.0.0j/0014-debian-shared-lib-ext.patch
@@ -1,14 +1,13 @@
-From fef3b40c57e6187fe5806a6aacf9bd7de8b2bed4 Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Tue, 22 Feb 2011 13:56:44 +0100
-Subject: [PATCH 15/18] debian shared-lib-ext
+Subject: [PATCH] debian shared-lib-ext
 
 Applied shared-lib-ext.patch from openssl_1.0.0c-2.debian.tar.gz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- Configure |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ Configure | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/Configure b/Configure
 index 6ec6823..5a1c3b7 100755
@@ -24,6 +23,3 @@ index 6ec6823..5a1c3b7 100755
  		}
  	elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
  		{
--- 
-1.7.8.4
-
diff --git a/patches/openssl-1.0.0h/0016-debian-stddef.patch b/patches/openssl-1.0.0j/0015-debian-stddef.patch
index 88cfb9484..d506db8fe 100644
--- a/patches/openssl-1.0.0h/0016-debian-stddef.patch
+++ b/patches/openssl-1.0.0j/0015-debian-stddef.patch
@@ -1,14 +1,13 @@
-From 79baef912d453d8bda525e5d3c280a0e66270edd Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Tue, 22 Feb 2011 13:56:44 +0100
-Subject: [PATCH 16/18] debian stddef
+Subject: [PATCH] debian stddef
 
 Applied stddef.patch from openssl_1.0.0c-2.debian.tar.gz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- crypto/sha/sha.h |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ crypto/sha/sha.h | 1 +
+ 1 file changed, 1 insertion(+)
 
 diff --git a/crypto/sha/sha.h b/crypto/sha/sha.h
 index 16cacf9..204514d 100644
@@ -22,6 +21,3 @@ index 16cacf9..204514d 100644
  #include <openssl/e_os2.h>
  #include <stddef.h>
  
--- 
-1.7.8.4
-
diff --git a/patches/openssl-1.0.0h/0017-debian-version-script.patch b/patches/openssl-1.0.0j/0016-debian-version-script.patch
index 97416558e..945921e5b 100644
--- a/patches/openssl-1.0.0h/0017-debian-version-script.patch
+++ b/patches/openssl-1.0.0j/0016-debian-version-script.patch
@@ -1,16 +1,15 @@
-From 08195640a349a041872d64be956691a9e15aad0c Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Tue, 22 Feb 2011 13:56:44 +0100
-Subject: [PATCH 17/18] debian version-script
+Subject: [PATCH] debian version-script
 
 Applied version-script.patch from openssl_1.0.0c-2.debian.tar.gz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- Configure          |    2 ++
- engines/openssl.ld |    5 +++++
- openssl.ld         |    5 +++++
- 3 files changed, 12 insertions(+), 0 deletions(-)
+ Configure          | 2 ++
+ engines/openssl.ld | 5 +++++
+ openssl.ld         | 5 +++++
+ 3 files changed, 12 insertions(+)
  create mode 100644 engines/openssl.ld
  create mode 100644 openssl.ld
 
@@ -49,6 +48,3 @@ index 0000000..5f26d60
 +		 *;
 +};
 +
--- 
-1.7.8.4
-
diff --git a/patches/openssl-1.0.0h/0018-debian-gnu_source.patch b/patches/openssl-1.0.0j/0017-debian-gnu_source.patch
index ec66cc7d5..3d043ab0f 100644
--- a/patches/openssl-1.0.0h/0018-debian-gnu_source.patch
+++ b/patches/openssl-1.0.0j/0017-debian-gnu_source.patch
@@ -1,14 +1,13 @@
-From 75a7228beeec79b8edae51575a7f76a1d4c49695 Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Tue, 22 Feb 2011 13:56:44 +0100
-Subject: [PATCH 18/18] debian gnu_source
+Subject: [PATCH] debian gnu_source
 
 Applied gnu_source.patch from openssl_1.0.0c-2.debian.tar.gz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
- crypto/dso/dso_dlfcn.c |    6 ++----
- 1 files changed, 2 insertions(+), 4 deletions(-)
+ crypto/dso/dso_dlfcn.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c
 index c2bc617..0de9fbe 100644
@@ -27,6 +26,3 @@ index c2bc617..0de9fbe 100644
  #endif
  
  #include <stdio.h>
--- 
-1.7.8.4
-
diff --git a/patches/openssl-1.0.0j/series b/patches/openssl-1.0.0j/series
new file mode 100644
index 000000000..6ea09eaae
--- /dev/null
+++ b/patches/openssl-1.0.0j/series
@@ -0,0 +1,20 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-debian-ca.patch
+0002-debian-config-hurd.patch
+0003-debian-debian-targets.patch
+0004-debian-engines-path.patch
+0005-debian-make-targets.patch
+0006-debian-man-dir.patch
+0007-debian-man-section.patch
+0008-debian-no-rpath.patch
+0009-debian-no-symbolic.patch
+0010-debian-pic.patch
+0011-debian-valgrind.patch
+0012-debian-rehash-crt.patch
+0013-debian-rehash_pod.patch
+0014-debian-shared-lib-ext.patch
+0015-debian-stddef.patch
+0016-debian-version-script.patch
+0017-debian-gnu_source.patch
+# 56d4091de49782532f758b6025127a96  - git-ptx-patches magic
diff --git a/rules/openssl.make b/rules/openssl.make
index 663105af9..fe1e7229c 100644
--- a/rules/openssl.make
+++ b/rules/openssl.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_OPENSSL) += openssl
 #
 # Paths and names
 #
-OPENSSL_VERSION	:= 1.0.0h
-OPENSSL_MD5	:= a5bc483c570f2ac3758ce5c19b667fab
+OPENSSL_VERSION	:= 1.0.0j
+OPENSSL_MD5	:= cbe4ac0d8f598680f68a951e04b0996b
 OPENSSL		:= openssl-$(OPENSSL_VERSION)
 OPENSSL_SUFFIX	:= tar.gz
 OPENSSL_URL	:= http://openssl.org/source//$(OPENSSL).$(OPENSSL_SUFFIX)