summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-05-12 12:06:34 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-12 12:14:42 (GMT)
commite6b06016bcad22d79ad67cc8193af490027c2dd0 (patch)
tree2e7a52fc7a41558c20d488c39bd782cd6ae9fceb
parent740a2d817a217d63a7112a39b2b5df0129b7e783 (diff)
downloadpoky-e6b06016bcad22d79ad67cc8193af490027c2dd0.tar.gz
openssl: prevent ABI break from earlier fido releases
The backported upgrade to 1.0.2h included an updated GNU LD version-script which results in an ABI change. In order to try and respect ABI for existing binaries built against fido this commit partially reverts the version-script to maintain the existing ABI and instead only add the new symbols required by 1.0.2h. Suggested-by: Martin Jansa <martin.jansa@gmail.com> (From OE-Core rev: 480db6be99f9a53d8657b31b846f0079ee1a124f) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patch31
1 files changed, 22 insertions, 9 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patch b/meta/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patch
index 29f11a2..f53efdb 100644
--- a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patch
+++ b/meta/recipes-connectivity/openssl/openssl/debian1.0.2/version-script.patch
@@ -15,8 +15,8 @@ Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld
15=================================================================== 15===================================================================
16--- /dev/null 1970-01-01 00:00:00.000000000 +0000 16--- /dev/null 1970-01-01 00:00:00.000000000 +0000
17+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld 2014-02-24 22:19:08.601827266 +0100 17+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld 2014-02-24 22:19:08.601827266 +0100
18@@ -0,0 +1,4608 @@ 18@@ -0,0 +1,4621 @@
19+OPENSSL_1.0.2d { 19+OPENSSL_1.0.0 {
20+ global: 20+ global:
21+ BIO_f_ssl; 21+ BIO_f_ssl;
22+ BIO_new_buffer_ssl_connect; 22+ BIO_new_buffer_ssl_connect;
@@ -4314,6 +4314,14 @@ Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld
4314+ CRYPTO_cbc128_decrypt; 4314+ CRYPTO_cbc128_decrypt;
4315+ CRYPTO_cfb128_encrypt; 4315+ CRYPTO_cfb128_encrypt;
4316+ CRYPTO_cfb128_8_encrypt; 4316+ CRYPTO_cfb128_8_encrypt;
4317+
4318+ local:
4319+ *;
4320+};
4321+
4322+
4323+OPENSSL_1.0.1 {
4324+ global:
4317+ SSL_renegotiate_abbreviated; 4325+ SSL_renegotiate_abbreviated;
4318+ TLSv1_1_method; 4326+ TLSv1_1_method;
4319+ TLSv1_1_client_method; 4327+ TLSv1_1_client_method;
@@ -4475,7 +4483,15 @@ Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld
4475+ BIO_s_datagram_sctp; 4483+ BIO_s_datagram_sctp;
4476+ BIO_dgram_is_sctp; 4484+ BIO_dgram_is_sctp;
4477+ BIO_dgram_sctp_notification_cb; 4485+ BIO_dgram_sctp_notification_cb;
4486+} OPENSSL_1.0.0;
4487+
4488+OPENSSL_1.0.1d {
4489+ global:
4478+ CRYPTO_memcmp; 4490+ CRYPTO_memcmp;
4491+} OPENSSL_1.0.1;
4492+
4493+OPENSSL_1.0.2 {
4494+ global:
4479+ SSL_CTX_set_alpn_protos; 4495+ SSL_CTX_set_alpn_protos;
4480+ SSL_set_alpn_protos; 4496+ SSL_set_alpn_protos;
4481+ SSL_CTX_set_alpn_select_cb; 4497+ SSL_CTX_set_alpn_select_cb;
@@ -4613,23 +4629,20 @@ Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/openssl.ld
4613+ BUF_strnlen; 4629+ BUF_strnlen;
4614+ sk_deep_copy; 4630+ sk_deep_copy;
4615+ SSL_test_functions; 4631+ SSL_test_functions;
4616+ 4632+} OPENSSL_1.0.1d;
4617+ local:
4618+ *;
4619+};
4620+ 4633+
4621+OPENSSL_1.0.2g { 4634+OPENSSL_1.0.2g {
4622+ global: 4635+ global:
4623+ SRP_VBASE_get1_by_user; 4636+ SRP_VBASE_get1_by_user;
4624+ SRP_user_pwd_free; 4637+ SRP_user_pwd_free;
4625+} OPENSSL_1.0.2d; 4638+} OPENSSL_1.0.2;
4626+ 4639+
4627Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld 4640Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld
4628=================================================================== 4641===================================================================
4629--- /dev/null 1970-01-01 00:00:00.000000000 +0000 4642--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4630+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld 2014-02-24 21:02:30.000000000 +0100 4643+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/openssl.ld 2014-02-24 21:02:30.000000000 +0100
4631@@ -0,0 +1,10 @@ 4644@@ -0,0 +1,10 @@
4632+OPENSSL_1.0.2 { 4645+OPENSSL_1.0.0 {
4633+ global: 4646+ global:
4634+ bind_engine; 4647+ bind_engine;
4635+ v_check; 4648+ v_check;
@@ -4644,7 +4657,7 @@ Index: openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld
4644--- /dev/null 1970-01-01 00:00:00.000000000 +0000 4657--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4645+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld 2014-02-24 21:02:30.000000000 +0100 4658+++ openssl-1.0.2~beta1.obsolete.0.0498436515490575/engines/ccgost/openssl.ld 2014-02-24 21:02:30.000000000 +0100
4646@@ -0,0 +1,10 @@ 4659@@ -0,0 +1,10 @@
4647+OPENSSL_1.0.2 { 4660+OPENSSL_1.0.0 {
4648+ global: 4661+ global:
4649+ bind_engine; 4662+ bind_engine;
4650+ v_check; 4663+ v_check;