From bbf95cae4c009d967fee545d94f809452c215c3f Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Tue, 24 Apr 2012 22:13:13 -0700 Subject: openssl: upgrade to 1.0.0i Addresses CVE-2012-2110 Fixes bug [YOCTO #2368] (From OE-Core rev: 51a122a5593c62d7ffd07f860e54a2fb0327959c) Signed-off-by: Scott Garman Signed-off-by: Richard Purdie --- .../openssl-1.0.0h/debian/c_rehash-compat.patch | 45 ---------------------- 1 file changed, 45 deletions(-) delete mode 100644 meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/c_rehash-compat.patch (limited to 'meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/c_rehash-compat.patch') diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/c_rehash-compat.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/c_rehash-compat.patch deleted file mode 100644 index 8f9a034a0f..0000000000 --- a/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/c_rehash-compat.patch +++ /dev/null @@ -1,45 +0,0 @@ -Upstream-Status: Backport [debian] - -From 83f318d68bbdab1ca898c94576a838cc97df4700 Mon Sep 17 00:00:00 2001 -From: Ludwig Nussel -Date: Wed, 21 Apr 2010 15:52:10 +0200 -Subject: [PATCH] also create old hash for compatibility - ---- - tools/c_rehash.in | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -Index: openssl-1.0.0c/tools/c_rehash.in -=================================================================== ---- openssl-1.0.0c.orig/tools/c_rehash.in 2010-04-14 16:07:28.000000000 -0700 -+++ openssl-1.0.0c/tools/c_rehash.in 2011-08-12 23:06:41.976664773 -0700 -@@ -83,6 +83,7 @@ - next; - } - link_hash_cert($fname) if($cert); -+ link_hash_cert_old($fname) if($cert); - link_hash_crl($fname) if($crl); - } - } -@@ -116,8 +117,9 @@ - - sub link_hash_cert { - my $fname = $_[0]; -+ my $hashopt = $_[1] || '-subject_hash'; - $fname =~ s/'/'\\''/g; -- my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in "$fname"`; -+ my ($hash, $fprint) = `"$openssl" x509 $hashopt -fingerprint -noout -in "$fname"`; - chomp $hash; - chomp $fprint; - $fprint =~ s/^.*=//; -@@ -147,6 +149,10 @@ - $hashlist{$hash} = $fprint; - } - -+sub link_hash_cert_old { -+ link_hash_cert($_[0], '-subject_hash_old'); -+} -+ - # Same as above except for a CRL. CRL links are of the form .r - - sub link_hash_crl { -- cgit v1.2.3-54-g00ecf