9506ce115f81d5a5d01e97a1b3af29a0c378a8b5
[AGL/meta-agl-demo.git] / recipes-demo-hmi / navigation / navigation / 0002-openssl-1.1-fixes.patch
1 gpsnavi: Fix compilation with OpenSSL 1.1
2
3 Handle the ERR_load_crypto_strings and ERR_free_strings functions no
4 longer being present in OpenSSL 1.1.
5
6 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
7
8 diff --git a/src/sms/sms-core/SMCAL/SMCAL.c b/src/sms/sms-core/SMCAL/SMCAL.c
9 index eadab8f..2dfe1f3 100755
10 --- a/src/sms/sms-core/SMCAL/SMCAL.c
11 +++ b/src/sms/sms-core/SMCAL/SMCAL.c
12 @@ -158,7 +158,9 @@ void SC_CAL_Initialize_OpenSSL() {
13         // 初期化\r
14         ERR_load_BIO_strings();\r
15         SSL_load_error_strings();\r
16 +#if OPENSSL_VERSION_NUMBER < 0x10100000L\r
17         ERR_load_crypto_strings();\r
18 +#endif\r
19         OpenSSL_add_all_algorithms();\r
20  \r
21         // SSLの初期化(戻り値は常に1)\r
22 @@ -542,7 +544,9 @@ E_SC_CAL_RESULT SC_CAL_DisConnect(SMCAL *cal)
23                         if (NULL != cal->ssl.ctx) {\r
24                                 SSL_CTX_free((SSL_CTX*)cal->ssl.ctx);\r
25                         }\r
26 +#if OPENSSL_VERSION_NUMBER < 0x10100000L\r
27                         ERR_free_strings();\r
28 +#endif\r
29  \r
30                         cal->ssl.ssl = NULL;\r
31                         cal->ssl.ctx = NULL;\r