diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-08-08 18:30:48 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-13 09:27:38 +0100 |
commit | e326733d69181a03af7a4f837ea78fce348fdf00 (patch) | |
tree | f2b049b04bf94693ad017ac68df139b4ed655c65 /meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch | |
parent | 04891b31e62f37e692647399fa3534d3dd4ab7f9 (diff) | |
download | poky-e326733d69181a03af7a4f837ea78fce348fdf00.tar.gz |
openssl: add a 1.1 version
Existing openssl 1.0 recipe is renamed to openssl10; it will
continue to be provided for as long as upstream supports it
(and there are still several recipes which do not work with openssl
1.1 due to API differences).
A few files (such as openssl binary) are no longer installed by openssl 1.0,
because they clash with openssl 1.1.
(From OE-Core rev: da1183f9fa5e06fbe66b5b31eb3313d5d35d11e3)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch b/meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch deleted file mode 100644 index 68e54d561e..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
1 | From 83f318d68bbdab1ca898c94576a838cc97df4700 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ludwig Nussel <ludwig.nussel@suse.de> | ||
3 | Date: Wed, 21 Apr 2010 15:52:10 +0200 | ||
4 | Subject: [PATCH] also create old hash for compatibility | ||
5 | |||
6 | Upstream-Status: Backport [debian] | ||
7 | |||
8 | diff --git a/tools/c_rehash.in b/tools/c_rehash.in | ||
9 | index b086ff9..b777d79 100644 | ||
10 | --- a/tools/c_rehash.in | ||
11 | +++ b/tools/c_rehash.in | ||
12 | @@ -8,8 +8,6 @@ my $prefix; | ||
13 | |||
14 | my $openssl = $ENV{OPENSSL} || "openssl"; | ||
15 | my $pwd; | ||
16 | -my $x509hash = "-subject_hash"; | ||
17 | -my $crlhash = "-hash"; | ||
18 | my $verbose = 0; | ||
19 | my $symlink_exists=eval {symlink("",""); 1}; | ||
20 | my $removelinks = 1; | ||
21 | @@ -18,10 +16,7 @@ my $removelinks = 1; | ||
22 | while ( $ARGV[0] =~ /^-/ ) { | ||
23 | my $flag = shift @ARGV; | ||
24 | last if ( $flag eq '--'); | ||
25 | - if ( $flag eq '-old') { | ||
26 | - $x509hash = "-subject_hash_old"; | ||
27 | - $crlhash = "-hash_old"; | ||
28 | - } elsif ( $flag eq '-h') { | ||
29 | + if ( $flag eq '-h') { | ||
30 | help(); | ||
31 | } elsif ( $flag eq '-n' ) { | ||
32 | $removelinks = 0; | ||
33 | @@ -113,7 +108,9 @@ sub hash_dir { | ||
34 | next; | ||
35 | } | ||
36 | link_hash_cert($fname) if($cert); | ||
37 | + link_hash_cert_old($fname) if($cert); | ||
38 | link_hash_crl($fname) if($crl); | ||
39 | + link_hash_crl_old($fname) if($crl); | ||
40 | } | ||
41 | } | ||
42 | |||
43 | @@ -146,6 +143,7 @@ sub check_file { | ||
44 | |||
45 | sub link_hash_cert { | ||
46 | my $fname = $_[0]; | ||
47 | + my $x509hash = $_[1] || '-subject_hash'; | ||
48 | $fname =~ s/'/'\\''/g; | ||
49 | my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`; | ||
50 | chomp $hash; | ||
51 | @@ -176,11 +174,21 @@ sub link_hash_cert { | ||
52 | $hashlist{$hash} = $fprint; | ||
53 | } | ||
54 | |||
55 | +sub link_hash_cert_old { | ||
56 | + link_hash_cert($_[0], '-subject_hash_old'); | ||
57 | +} | ||
58 | + | ||
59 | +sub link_hash_crl_old { | ||
60 | + link_hash_crl($_[0], '-hash_old'); | ||
61 | +} | ||
62 | + | ||
63 | + | ||
64 | # Same as above except for a CRL. CRL links are of the form <hash>.r<n> | ||
65 | |||
66 | sub link_hash_crl { | ||
67 | my $fname = $_[0]; | ||
68 | + my $crlhash = $_[1] || "-hash"; | ||
69 | $fname =~ s/'/'\\''/g; | ||
70 | my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fname'`; | ||
71 | chomp $hash; | ||