mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 21:49:33 +02:00
f720f8f3d2
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>
46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
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.0d/tools/c_rehash.in
|
|
===================================================================
|
|
--- openssl-1.0.0d.orig/tools/c_rehash.in 2011-04-13 20:41:28.000000000 +0000
|
|
+++ openssl-1.0.0d/tools/c_rehash.in 2011-04-13 20:41:28.000000000 +0000
|
|
@@ -86,6 +86,7 @@
|
|
}
|
|
}
|
|
link_hash_cert($fname) if($cert);
|
|
+ link_hash_cert_old($fname) if($cert);
|
|
link_hash_crl($fname) if($crl);
|
|
}
|
|
}
|
|
@@ -119,8 +120,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/^.*=//;
|
|
@@ -150,6 +152,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 {
|