diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-04-27 20:43:27 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-30 23:04:13 +0100 |
commit | 636cbe60117e5b61f5f1eca573e1a62dde38a93c (patch) | |
tree | 8c6565bac82ec158999dff193981718594c2e407 | |
parent | 2be3398005922111be89ef2af12f049b6880c684 (diff) | |
download | poky-636cbe60117e5b61f5f1eca573e1a62dde38a93c.tar.gz |
openssl: remove 3 patches
Removed:
- openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch
- upgate-vegsion-script-for-1.0.2.patch
Since they are already in the source.
- make-targets.patch
It removed test dir from DIRS, which is not needed any more since we
need build it.
(From OE-Core rev: 5fa533c69f92f2dd46c795509b0830b36413b814)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 0 insertions, 107 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/debian/make-targets.patch b/meta/recipes-connectivity/openssl/openssl/debian/make-targets.patch deleted file mode 100644 index ee0a62c3c7..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/debian/make-targets.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | Upstream-Status: Backport [debian] | ||
2 | |||
3 | Index: openssl-1.0.1/Makefile.org | ||
4 | =================================================================== | ||
5 | --- openssl-1.0.1.orig/Makefile.org 2012-03-17 09:41:07.000000000 +0000 | ||
6 | +++ openssl-1.0.1/Makefile.org 2012-03-17 09:41:21.000000000 +0000 | ||
7 | @@ -135,7 +135,7 @@ | ||
8 | |||
9 | BASEADDR= | ||
10 | |||
11 | -DIRS= crypto ssl engines apps test tools | ||
12 | +DIRS= crypto ssl engines apps tools | ||
13 | ENGDIRS= ccgost | ||
14 | SHLIBDIRS= crypto ssl | ||
15 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch b/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch deleted file mode 100644 index d7047bbaac..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | openssl: avoid NULL pointer dereference in dh_pub_encode()/dsa_pub_encode() | ||
2 | |||
3 | We should avoid accessing the pointer if ASN1_STRING_new() | ||
4 | allocates memory failed. | ||
5 | |||
6 | Upstream-Status: Submitted | ||
7 | http://www.mail-archive.com/openssl-dev@openssl.org/msg32859.html | ||
8 | |||
9 | Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com> | ||
10 | --- | ||
11 | Index: openssl-1.0.2/crypto/dh/dh_ameth.c | ||
12 | =================================================================== | ||
13 | --- openssl-1.0.2.orig/crypto/dh/dh_ameth.c | ||
14 | +++ openssl-1.0.2/crypto/dh/dh_ameth.c | ||
15 | @@ -161,6 +161,11 @@ static int dh_pub_encode(X509_PUBKEY *pk | ||
16 | dh = pkey->pkey.dh; | ||
17 | |||
18 | str = ASN1_STRING_new(); | ||
19 | + if (!str) { | ||
20 | + DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE); | ||
21 | + goto err; | ||
22 | + } | ||
23 | + | ||
24 | str->length = i2d_dhp(pkey, dh, &str->data); | ||
25 | if (str->length <= 0) { | ||
26 | DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE); | ||
diff --git a/meta/recipes-connectivity/openssl/openssl/update-version-script-for-1.0.2.patch b/meta/recipes-connectivity/openssl/openssl/update-version-script-for-1.0.2.patch deleted file mode 100644 index fcfccfadb3..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/update-version-script-for-1.0.2.patch +++ /dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | Index: openssl-1.0.2/openssl.ld | ||
2 | =================================================================== | ||
3 | --- openssl-1.0.2.orig/openssl.ld | ||
4 | +++ openssl-1.0.2/openssl.ld | ||
5 | @@ -4618,3 +4618,61 @@ OPENSSL_1.0.1d { | ||
6 | CRYPTO_memcmp; | ||
7 | } OPENSSL_1.0.1; | ||
8 | |||
9 | +OPENSSL_1.0.2 { | ||
10 | + global: | ||
11 | + ASN1_TIME_diff; | ||
12 | + CMS_RecipientInfo_get0_pkey_ctx; | ||
13 | + CMS_RecipientInfo_kari_get0_ctx; | ||
14 | + CMS_SignerInfo_get0_pkey_ctx; | ||
15 | + DH_get_1024_160; | ||
16 | + DH_get_2048_224; | ||
17 | + DH_get_2048_256; | ||
18 | + DTLS_client_method; | ||
19 | + DTLS_server_method; | ||
20 | + DTLSv1_2_client_method; | ||
21 | + DTLSv1_2_server_method; | ||
22 | + EC_curve_nid2nist; | ||
23 | + EC_curve_nist2nid; | ||
24 | + EVP_aes_128_cbc_hmac_sha256; | ||
25 | + EVP_aes_128_wrap; | ||
26 | + EVP_aes_192_wrap; | ||
27 | + EVP_aes_256_cbc_hmac_sha256; | ||
28 | + EVP_aes_256_wrap; | ||
29 | + EVP_des_ede3_wrap; | ||
30 | + OCSP_REQ_CTX_http; | ||
31 | + OCSP_REQ_CTX_new; | ||
32 | + PEM_write_bio_DHxparams; | ||
33 | + SSL_CIPHER_find; | ||
34 | + SSL_CONF_CTX_finish; | ||
35 | + SSL_CONF_CTX_free; | ||
36 | + SSL_CONF_CTX_new; | ||
37 | + SSL_CONF_CTX_set_flags; | ||
38 | + SSL_CONF_CTX_set_ssl_ctx; | ||
39 | + SSL_CONF_cmd; | ||
40 | + SSL_CONF_cmd_argv; | ||
41 | + SSL_CTX_add_client_custom_ext; | ||
42 | + SSL_CTX_add_server_custom_ext; | ||
43 | + SSL_CTX_set_alpn_protos; | ||
44 | + SSL_CTX_set_alpn_select_cb; | ||
45 | + SSL_CTX_set_cert_cb; | ||
46 | + SSL_CTX_use_serverinfo_file; | ||
47 | + SSL_certs_clear; | ||
48 | + SSL_check_chain; | ||
49 | + SSL_get0_alpn_selected; | ||
50 | + SSL_get_shared_sigalgs; | ||
51 | + SSL_get_sigalgs; | ||
52 | + SSL_is_server; | ||
53 | + X509_CRL_diff; | ||
54 | + X509_CRL_http_nbio; | ||
55 | + X509_STORE_set_lookup_crls_cb; | ||
56 | + X509_VERIFY_PARAM_set1_email; | ||
57 | + X509_VERIFY_PARAM_set1_host; | ||
58 | + X509_VERIFY_PARAM_set1_ip_asc; | ||
59 | + X509_chain_check_suiteb; | ||
60 | + X509_chain_up_ref; | ||
61 | + X509_check_email; | ||
62 | + X509_check_host; | ||
63 | + X509_check_ip_asc; | ||
64 | + X509_get_signature_nid; | ||
65 | + X509_http_nbio; | ||
66 | +} OPENSSL_1.0.1d; | ||