summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/c_rehash-compat.patch
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2012-07-20 08:38:34 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-22 11:42:22 +0100
commitb2c094f81dcf352f17156eb7ac9511af0759b0ea (patch)
tree278e1f6f220e1ba8d3253824610c1c6ce9971a01 /meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/c_rehash-compat.patch
parent71105cce11ac2c6725a92d02394c81f6dfc29952 (diff)
downloadpoky-b2c094f81dcf352f17156eb7ac9511af0759b0ea.tar.gz
openssl: upgrade to 1.0.0j
Addresses CVE-2012-2333 Fixes [YOCTO #2682] (From OE-Core rev: 57f45fca7b8e1c0cf98d295bc0fd8839799dfa86) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/c_rehash-compat.patch')
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/c_rehash-compat.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/c_rehash-compat.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/c_rehash-compat.patch
new file mode 100644
index 0000000000..8f9a034a0f
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0j/debian/c_rehash-compat.patch
@@ -0,0 +1,45 @@
1Upstream-Status: Backport [debian]
2
3From 83f318d68bbdab1ca898c94576a838cc97df4700 Mon Sep 17 00:00:00 2001
4From: Ludwig Nussel <ludwig.nussel@suse.de>
5Date: Wed, 21 Apr 2010 15:52:10 +0200
6Subject: [PATCH] also create old hash for compatibility
7
8---
9 tools/c_rehash.in | 8 +++++++-
10 1 files changed, 7 insertions(+), 1 deletions(-)
11
12Index: openssl-1.0.0c/tools/c_rehash.in
13===================================================================
14--- openssl-1.0.0c.orig/tools/c_rehash.in 2010-04-14 16:07:28.000000000 -0700
15+++ openssl-1.0.0c/tools/c_rehash.in 2011-08-12 23:06:41.976664773 -0700
16@@ -83,6 +83,7 @@
17 next;
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@@ -116,8 +117,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@@ -147,6 +149,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 {