From ac27587f9307fba1706b79c2c49347ff4e26caa6 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 16 Jan 2012 17:53:46 -0800 Subject: 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 Signed-off-by: Richard Purdie --- .../openssl/openssl-0.9.8r/debian/rehash-crt.patch | 35 ---------------------- 1 file changed, 35 deletions(-) delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/rehash-crt.patch (limited to 'meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/rehash-crt.patch') diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/rehash-crt.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/rehash-crt.patch deleted file mode 100644 index d9d6b70b30..0000000000 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/rehash-crt.patch +++ /dev/null @@ -1,35 +0,0 @@ -Upstream-Status: Backport [debian] - -Index: openssl-0.9.8k/tools/c_rehash.in -=================================================================== ---- openssl-0.9.8k.orig/tools/c_rehash.in 2002-10-11 22:31:27.000000000 +0200 -+++ openssl-0.9.8k/tools/c_rehash.in 2009-07-19 11:36:26.000000000 +0200 -@@ -59,12 +59,15 @@ - } - } - closedir DIR; -- FILE: foreach $fname (grep {/\.pem$/} @flist) { -+ FILE: foreach $fname (grep {/\.pem$|\.crt$/} @flist) { - # Check to see if certificates and/or CRLs present. - my ($cert, $crl) = check_file($fname); - if(!$cert && !$crl) { -- print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n"; -- next; -+ ($cert, $crl) = check_file("$openssl x509 -in \"$fname\" -inform der -outform pem | "); -+ if(!$cert && !$crl) { -+ print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n"; -+ next; -+ } - } - link_hash_cert($fname) if($cert); - link_hash_crl($fname) if($crl); -@@ -102,6 +105,9 @@ - my $fname = $_[0]; - $fname =~ s/'/'\\''/g; - my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname'`; -+ if(!$hash || !fprint) { -+ ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname' -inform der`; -+ } - chomp $hash; - chomp $fprint; - $fprint =~ s/^.*=//; -- cgit v1.2.3-54-g00ecf