diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-01-16 17:53:46 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-17 14:53:04 +0000 |
commit | 980ba5e77438c3a22c295f56ffb71f1d290db50a (patch) | |
tree | 6feb062b3c3c56e960fcddffe7df0ea6bdb67a91 /meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/rehash-crt.patch | |
parent | 8953e4a93ce6ad0257a094fdc6f3cd88ac5e89b9 (diff) | |
download | openembedded-core-980ba5e77438c3a22c295f56ffb71f1d290db50a.tar.gz openembedded-core-980ba5e77438c3a22c295f56ffb71f1d290db50a.tar.bz2 openembedded-core-980ba5e77438c3a22c295f56ffb71f1d290db50a.tar.xz openembedded-core-980ba5e77438c3a22c295f56ffb71f1d290db50a.zip |
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]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
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.patch | 35 |
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 000000000..d9d6b70b3 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/rehash-crt.patch @@ -0,0 +1,35 @@ +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/^.*=//; |