From 060dfb0f1fa7c288da48b02f27948cd3481fbc07 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 1 Jul 2015 14:47:33 +0200
Subject: [PATCH] update ms2
---
coreapi/callbacks.c | 34 +++++++++++++++++-----------------
mediastreamer2 | 2 +-
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index b511ce21b8..0e190fb3e4 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -1160,27 +1160,27 @@ static void ping_reply(SalOp *op){
}
static bool_t fill_auth_info_with_client_certificate(LinphoneCore *lc, SalAuthInfo* sai) {
- const char *chain_file = lp_config_get_string(lc->config,"sip","client_cert_chain", 0);
- const char *key_file = lp_config_get_string(lc->config,"sip","client_cert_key", 0);;
+ const char *chain_file = lp_config_get_string(lc->config,"sip","client_cert_chain", 0);
+ const char *key_file = lp_config_get_string(lc->config,"sip","client_cert_key", 0);;
#ifndef WIN32
- {
- // optinal check for files
- struct stat st;
- if (stat(key_file,&st)) {
- ms_warning("No client certificate key found in %s", key_file);
- return FALSE;
- }
- if (stat(chain_file,&st)) {
- ms_warning("No client certificate chain found in %s", chain_file);
- return FALSE;
- }
- }
+ {
+ // optinal check for files
+ struct stat st;
+ if (stat(key_file,&st)) {
+ ms_warning("No client certificate key found in %s", key_file);
+ return FALSE;
+ }
+ if (stat(chain_file,&st)) {
+ ms_warning("No client certificate chain found in %s", chain_file);
+ return FALSE;
+ }
+ }
#endif
- sal_certificates_chain_parse_file(sai, chain_file, SAL_CERTIFICATE_RAW_FORMAT_PEM );
- sal_signing_key_parse_file(sai, key_file, "");
- return sai->certificates && sai->key;
+ sal_certificates_chain_parse_file(sai, chain_file, SAL_CERTIFICATE_RAW_FORMAT_PEM );
+ sal_signing_key_parse_file(sai, key_file, "");
+ return sai->certificates && sai->key;
}
static bool_t fill_auth_info(LinphoneCore *lc, SalAuthInfo* sai) {
diff --git a/mediastreamer2 b/mediastreamer2
index 6f82c67839..e2c8f2a99f 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 6f82c6783913285768dd35afe3ea46519ebaf494
+Subproject commit e2c8f2a99fb508c97c8ac382508f126bb2396396
--
GitLab