diff options
author | Scott Garman <scott.a.garman@intel.com> | 2012-03-19 23:11:25 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-21 14:05:09 +0000 |
commit | 50d99fc8c5a158c7f3ce3e72377827f53406d88f (patch) | |
tree | dc2045d34fc79645bca8788348b9c1ce4ff56663 /meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/c_rehash-compat.patch | |
parent | 69f019c48b40ac3b7a8bce2da819f03072e78020 (diff) | |
download | openembedded-core-50d99fc8c5a158c7f3ce3e72377827f53406d88f.tar.gz openembedded-core-50d99fc8c5a158c7f3ce3e72377827f53406d88f.tar.bz2 openembedded-core-50d99fc8c5a158c7f3ce3e72377827f53406d88f.tar.xz openembedded-core-50d99fc8c5a158c7f3ce3e72377827f53406d88f.zip |
openssl: upgrade to 1.0.0.h
Removed pkg-config.patch, which was incorporated upstream.
Addresses CVE-2012-0884.
Fixes bug [YOCTO #2139].
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/c_rehash-compat.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/c_rehash-compat.patch | 45 |
1 files changed, 45 insertions, 0 deletions
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 new file mode 100644 index 000000000..8f9a034a0 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.0h/debian/c_rehash-compat.patch @@ -0,0 +1,45 @@ +Upstream-Status: Backport [debian] + +From 83f318d68bbdab1ca898c94576a838cc97df4700 Mon Sep 17 00:00:00 2001 +From: Ludwig Nussel <ludwig.nussel@suse.de> +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 <hash>.r<n> + + sub link_hash_crl { |