diff options
| author |   Matt Ranostay <matt.ranostay@konsulko.com> | 2019-11-12 07:09:57 +0200 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-11-27 16:10:17 +0000 |
| commit | 8583af6d83d71c44d8441aa5cfb948bb45de47da (patch) | |
| tree | 0cb413c31a284b42b64848b5d1984d3c84c87d5b /recipes-demo-hmi/navigation/mapviewer/0002-openssl-1.1-fixes.patch | |
| parent | a6e0f8ed016d6bfc06b88a27249adf33378d4d99 (diff) | |
mapviewer: remove recipe due to package being deprecated
mapviewer is no longer used, and will not work with
agl-service-navigation rewrite so must be removed.
Bug-AGL: SPEC-2880
Change-Id: Ia3a60200ba78be689874c99b18c2b5b329c39a45
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
(cherry picked from commit d713285f617aed53a897da8d9f8f66943c7b09e4)
Diffstat (limited to 'recipes-demo-hmi/navigation/mapviewer/0002-openssl-1.1-fixes.patch')
| -rw-r--r-- | recipes-demo-hmi/navigation/mapviewer/0002-openssl-1.1-fixes.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/recipes-demo-hmi/navigation/mapviewer/0002-openssl-1.1-fixes.patch b/recipes-demo-hmi/navigation/mapviewer/0002-openssl-1.1-fixes.patch deleted file mode 100644 index 9506ce115..000000000 --- a/recipes-demo-hmi/navigation/mapviewer/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;
|