diff options
| author |   Matt Ranostay <matt.ranostay@konsulko.com> | 2019-11-12 07:26:31 +0200 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-11-19 16:41:30 +0000 |
| commit | d8222a239eb57a6a48cadb3f9385b0e5beba38f2 (patch) | |
| tree | 05e8421960a210db9cd1907d2f0e792626df03e2 /recipes-demo-hmi/navigation/navigation/0002-openssl-1.1-fixes.patch | |
| parent | 28ea9b9f75aa10624808bf376d77a992a48e7139 (diff) | |
navigation: remove deprecated package
navigation is no longer used, and will not work with
agl-service-navigation rewrite so must be removed.
Bug-AGL: SPEC-2880
Change-Id: Ifbd96abfba2c46b1b20180ca86d5fcef2b1d5aae
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
Diffstat (limited to 'recipes-demo-hmi/navigation/navigation/0002-openssl-1.1-fixes.patch')
| -rw-r--r-- | recipes-demo-hmi/navigation/navigation/0002-openssl-1.1-fixes.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/recipes-demo-hmi/navigation/navigation/0002-openssl-1.1-fixes.patch b/recipes-demo-hmi/navigation/navigation/0002-openssl-1.1-fixes.patch deleted file mode 100644 index 9506ce11..00000000 --- a/recipes-demo-hmi/navigation/navigation/0002-openssl-1.1-fixes.patch +++ /dev/null @@ -1,31 +0,0 @@ -gpsnavi: Fix compilation with OpenSSL 1.1 - -Handle the ERR_load_crypto_strings and ERR_free_strings functions no -longer being present in OpenSSL 1.1. - -Signed-off-by: Scott Murray <scott.murray@konsulko.com> - -diff --git a/src/sms/sms-core/SMCAL/SMCAL.c b/src/sms/sms-core/SMCAL/SMCAL.c -index eadab8f..2dfe1f3 100755 ---- a/src/sms/sms-core/SMCAL/SMCAL.c -+++ b/src/sms/sms-core/SMCAL/SMCAL.c -@@ -158,7 +158,9 @@ void SC_CAL_Initialize_OpenSSL() { - // 初期化
- ERR_load_BIO_strings();
- SSL_load_error_strings();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- ERR_load_crypto_strings();
-+#endif
- OpenSSL_add_all_algorithms();
-
- // SSLの初期化(戻り値は常に1)
-@@ -542,7 +544,9 @@ E_SC_CAL_RESULT SC_CAL_DisConnect(SMCAL *cal) - if (NULL != cal->ssl.ctx) {
- SSL_CTX_free((SSL_CTX*)cal->ssl.ctx);
- }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- ERR_free_strings();
-+#endif
-
- cal->ssl.ssl = NULL;
- cal->ssl.ctx = NULL;
|