summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash-crt.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash-crt.patch')
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash-crt.patch35
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash-crt.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash-crt.patch
deleted file mode 100644
index d9d6b70b30..0000000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash-crt.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1Upstream-Status: Backport [debian]
2
3Index: openssl-0.9.8k/tools/c_rehash.in
4===================================================================
5--- openssl-0.9.8k.orig/tools/c_rehash.in 2002-10-11 22:31:27.000000000 +0200
6+++ openssl-0.9.8k/tools/c_rehash.in 2009-07-19 11:36:26.000000000 +0200
7@@ -59,12 +59,15 @@
8 }
9 }
10 closedir DIR;
11- FILE: foreach $fname (grep {/\.pem$/} @flist) {
12+ FILE: foreach $fname (grep {/\.pem$|\.crt$/} @flist) {
13 # Check to see if certificates and/or CRLs present.
14 my ($cert, $crl) = check_file($fname);
15 if(!$cert && !$crl) {
16- print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
17- next;
18+ ($cert, $crl) = check_file("$openssl x509 -in \"$fname\" -inform der -outform pem | ");
19+ if(!$cert && !$crl) {
20+ print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
21+ next;
22+ }
23 }
24 link_hash_cert($fname) if($cert);
25 link_hash_crl($fname) if($crl);
26@@ -102,6 +105,9 @@
27 my $fname = $_[0];
28 $fname =~ s/'/'\\''/g;
29 my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname'`;
30+ if(!$hash || !fprint) {
31+ ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname' -inform der`;
32+ }
33 chomp $hash;
34 chomp $fprint;
35 $fprint =~ s/^.*=//;