You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
40 lines
2.0 KiB
40 lines
2.0 KiB
8 months ago
|
From 319faa95c34f89707b35af407d44b2f3c7147039 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Jani=20V=C3=A4limaa?= <wally@mageia.org>
|
||
|
|
Date: Mon, 1 Jan 2024 16:21:47 +0200
|
||
|
|
Subject: [PATCH] Use system CA Bundle
|
||
|
|
|
||
|
|
---
|
||
|
|
coreapi/linphonecore.c | 2 +-
|
||
|
|
.../classes/org/linphone/core/tools/AndroidPlatformHelper.java | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
|
||
|
|
index 17f339d..9c6666c 100644
|
||
|
|
--- a/coreapi/linphonecore.c
|
||
|
|
+++ b/coreapi/linphonecore.c
|
||
|
|
@@ -1721,7 +1721,7 @@ static int _linphone_core_tls_postcheck_callback(void *data, const bctbx_x509_ce
|
||
|
|
}
|
||
|
|
|
||
|
|
static void certificates_config_read(LinphoneCore *lc) {
|
||
|
|
- string rootCaPath = static_cast<PlatformHelpers *>(lc->platform_helper)->getDataResource("rootca.pem");
|
||
|
|
+ string rootCaPath = "/etc/pki/tls/cert.pem";
|
||
|
|
const char *rootca = linphone_config_get_string(lc->config, "sip", "root_ca", nullptr);
|
||
|
|
|
||
|
|
// If rootca is not existing anymore, we try data_resources_dir/rootca.pem else default from belle-sip
|
||
|
|
diff --git a/wrappers/java/classes/org/linphone/core/tools/AndroidPlatformHelper.java b/wrappers/java/classes/org/linphone/core/tools/AndroidPlatformHelper.java
|
||
|
|
index 8a91880..c515a29 100644
|
||
|
|
--- a/wrappers/java/classes/org/linphone/core/tools/AndroidPlatformHelper.java
|
||
|
|
+++ b/wrappers/java/classes/org/linphone/core/tools/AndroidPlatformHelper.java
|
||
|
|
@@ -340,7 +340,7 @@ public class AndroidPlatformHelper {
|
||
|
|
/*legacy code for 3.X*/
|
||
|
|
String basePath = mContext.getFilesDir().getAbsolutePath();
|
||
|
|
//make sure to follow same path as unix version of the sdk
|
||
|
|
- String mLinphoneRootCaFile = basePath + "/share/linphone/rootca.pem";
|
||
|
|
+ String mLinphoneRootCaFile = "/etc/pki/tls/cert.pem";
|
||
|
|
String mRingSoundFile = basePath + "/share/sounds/linphone/rings/notes_of_the_optimistic.mkv";
|
||
|
|
String mRingbackSoundFile = basePath + "/share/sounds/linphone/ringback.wav";
|
||
|
|
String mPauseSoundFile = basePath + "/share/sounds/linphone/rings/dont_wait_too_long.mkv";
|
||
|
|
--
|
||
|
|
2.43.0
|
||
|
|
|