X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-demo-hmi%2Fnavigation%2Fmapviewer%2F0002-openssl-1.1-fixes.patch;fp=recipes-demo-hmi%2Fnavigation%2Fmapviewer%2F0002-openssl-1.1-fixes.patch;h=9506ce115f81d5a5d01e97a1b3af29a0c378a8b5;hb=b341690d2cf66dec6fed0c981bb91d9fdbd3050e;hp=0000000000000000000000000000000000000000;hpb=f1c9acb641af6555c438e887e4bbfc3567bcc5e3;p=AGL%2Fmeta-agl-demo.git

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
new file mode 100644
index 000000000..9506ce115
--- /dev/null
+++ b/recipes-demo-hmi/navigation/mapviewer/0002-openssl-1.1-fixes.patch
@@ -0,0 +1,31 @@
+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;