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

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 9506ce115..000000000
--- 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;