summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/rehash-crt.patch
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-01-16 17:53:46 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-17 14:58:41 +0000
commitac27587f9307fba1706b79c2c49347ff4e26caa6 (patch)
treef0f12a2126a3dedd5411cf57247a4f2b4f055e3d /meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/rehash-crt.patch
parent7edf3dc05955042349ed71d329b6a2477963cb3f (diff)
downloadpoky-ac27587f9307fba1706b79c2c49347ff4e26caa6.tar.gz
openssl-0.9.8: Update to 0.9.8s
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4108 http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4109 http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4576 http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4577 http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4619 [YOCTO #1904] (From OE-Core rev: 980ba5e77438c3a22c295f56ffb71f1d290db50a) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/rehash-crt.patch')
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/rehash-crt.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/rehash-crt.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/rehash-crt.patch
new file mode 100644
index 0000000000..d9d6b70b30
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/rehash-crt.patch
@@ -0,0 +1,35 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8k/tools/c_rehash.in
4===================================================================
5--- openssl-0.9.8k.orig/tools/c_rehash.in 2002-10-11 22:31:27.000000000 +0200
6+++ openssl-0.9.8k/tools/c_rehash.in 2009-07-19 11:36:26.000000000 +0200
7@@ -59,12 +59,15 @@
8 }
9 }
10 closedir DIR;
11- FILE: foreach $fname (grep {/\.pem$/} @flist) {
12+ FILE: foreach $fname (grep {/\.pem$|\.crt$/} @flist) {
13 # Check to see if certificates and/or CRLs present.
14 my ($cert, $crl) = check_file($fname);
15 if(!$cert && !$crl) {
16- print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
17- next;
18+ ($cert, $crl) = check_file("$openssl x509 -in \"$fname\" -inform der -outform pem | ");
19+ if(!$cert && !$crl) {
20+ print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
21+ next;
22+ }
23 }
24 link_hash_cert($fname) if($cert);
25 link_hash_crl($fname) if($crl);
26@@ -102,6 +105,9 @@
27 my $fname = $_[0];
28 $fname =~ s/'/'\\''/g;
29 my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname'`;
30+ if(!$hash || !fprint) {
31+ ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname' -inform der`;
32+ }
33 chomp $hash;
34 chomp $fprint;
35 $fprint =~ s/^.*=//;