diff options
author | Radu Moisan <radu.moisan@intel.com> | 2013-04-09 10:06:27 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-09 13:16:53 +0100 |
commit | f720f8f3d24fe914aaa2e7f6db190118769abf63 (patch) | |
tree | 1145f63be04aafa0b6532c184a47df46ab3f9dfe /meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/c_rehash-compat.patch | |
parent | fb37dd6822578fced05fa4ab66b56341a46b3bbc (diff) | |
download | poky-f720f8f3d24fe914aaa2e7f6db190118769abf63.tar.gz |
openssl: Upgrade to v1.0.1e
Dropped obolete patches and pulled updates for debian patches.
Addresses CVEs:
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-2686
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-0166
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-0169
[YOCTO #3965]
(From OE-Core rev: 0470edd01c0aebaa78db137e365a7e22bfb199e9)
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/c_rehash-compat.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/c_rehash-compat.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/c_rehash-compat.patch b/meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/c_rehash-compat.patch new file mode 100644 index 0000000000..ac1b19b943 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.1e/debian/c_rehash-compat.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | Upstream-Status: Backport [debian] | ||
2 | |||
3 | From 83f318d68bbdab1ca898c94576a838cc97df4700 Mon Sep 17 00:00:00 2001 | ||
4 | From: Ludwig Nussel <ludwig.nussel@suse.de> | ||
5 | Date: Wed, 21 Apr 2010 15:52:10 +0200 | ||
6 | Subject: [PATCH] also create old hash for compatibility | ||
7 | |||
8 | --- | ||
9 | tools/c_rehash.in | 8 +++++++- | ||
10 | 1 files changed, 7 insertions(+), 1 deletions(-) | ||
11 | |||
12 | Index: openssl-1.0.0d/tools/c_rehash.in | ||
13 | =================================================================== | ||
14 | --- openssl-1.0.0d.orig/tools/c_rehash.in 2011-04-13 20:41:28.000000000 +0000 | ||
15 | +++ openssl-1.0.0d/tools/c_rehash.in 2011-04-13 20:41:28.000000000 +0000 | ||
16 | @@ -86,6 +86,7 @@ | ||
17 | } | ||
18 | } | ||
19 | link_hash_cert($fname) if($cert); | ||
20 | + link_hash_cert_old($fname) if($cert); | ||
21 | link_hash_crl($fname) if($crl); | ||
22 | } | ||
23 | } | ||
24 | @@ -119,8 +120,9 @@ | ||
25 | |||
26 | sub link_hash_cert { | ||
27 | my $fname = $_[0]; | ||
28 | + my $hashopt = $_[1] || '-subject_hash'; | ||
29 | $fname =~ s/'/'\\''/g; | ||
30 | - my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in "$fname"`; | ||
31 | + my ($hash, $fprint) = `"$openssl" x509 $hashopt -fingerprint -noout -in "$fname"`; | ||
32 | chomp $hash; | ||
33 | chomp $fprint; | ||
34 | $fprint =~ s/^.*=//; | ||
35 | @@ -150,6 +152,10 @@ | ||
36 | $hashlist{$hash} = $fprint; | ||
37 | } | ||
38 | |||
39 | +sub link_hash_cert_old { | ||
40 | + link_hash_cert($_[0], '-subject_hash_old'); | ||
41 | +} | ||
42 | + | ||
43 | # Same as above except for a CRL. CRL links are of the form <hash>.r<n> | ||
44 | |||
45 | sub link_hash_crl { | ||