diff options
author | Saul Wold <sgw@linux.intel.com> | 2015-03-04 09:46:48 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-10 10:47:46 +0000 |
commit | f5e4349011bd00aa47d142022dcdd1d1706a9655 (patch) | |
tree | 31b2c535de004b08968cfdb57ce085ca3b70eb83 /meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_digicert_malaysia.patch | |
parent | 7c504b44ef593f97f5311d0d27f667e85a2eddbb (diff) | |
download | poky-f5e4349011bd00aa47d142022dcdd1d1706a9655.tar.gz |
openssl: Upgrade to 1.0.2
Rebased numerous patches
removed aarch64 initial work since it's part of upstream now
Imported a few additional patches from Debian to support the version-script
and blacklist additional bad certificates.
(From OE-Core rev: 10b689033551c37d6cafa284d82bdccd43f6113e)
Signed-off-by: Saul Wold <sgw@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/debian1.0.2/block_digicert_malaysia.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_digicert_malaysia.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_digicert_malaysia.patch b/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_digicert_malaysia.patch new file mode 100644 index 0000000000..c43bcd1c77 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/debian1.0.2/block_digicert_malaysia.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From: Raphael Geissert <geissert@debian.org> | ||
2 | Description: make X509_verify_cert indicate that any certificate whose | ||
3 | name contains "Digicert Sdn. Bhd." (from Malaysia) is revoked. | ||
4 | Forwarded: not-needed | ||
5 | Origin: vendor | ||
6 | Last-Update: 2011-11-05 | ||
7 | |||
8 | Upstream-Status: Backport [debian] | ||
9 | |||
10 | |||
11 | Index: openssl-1.0.2~beta1/crypto/x509/x509_vfy.c | ||
12 | =================================================================== | ||
13 | --- openssl-1.0.2~beta1.orig/crypto/x509/x509_vfy.c 2014-02-25 00:16:12.488028844 +0100 | ||
14 | +++ openssl-1.0.2~beta1/crypto/x509/x509_vfy.c 2014-02-25 00:16:12.484028929 +0100 | ||
15 | @@ -964,10 +964,11 @@ | ||
16 | for (i = sk_X509_num(ctx->chain) - 1; i >= 0; i--) | ||
17 | { | ||
18 | x = sk_X509_value(ctx->chain, i); | ||
19 | - /* Mark DigiNotar certificates as revoked, no matter | ||
20 | - * where in the chain they are. | ||
21 | + /* Mark certificates containing the following names as | ||
22 | + * revoked, no matter where in the chain they are. | ||
23 | */ | ||
24 | - if (x->name && strstr(x->name, "DigiNotar")) | ||
25 | + if (x->name && (strstr(x->name, "DigiNotar") || | ||
26 | + strstr(x->name, "Digicert Sdn. Bhd."))) | ||
27 | { | ||
28 | ctx->error = X509_V_ERR_CERT_REVOKED; | ||
29 | ctx->error_depth = i; | ||