From 69550034572923acf2368c2df8b3762395a68b0f Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Thu, 15 Dec 2011 11:53:28 +0100 Subject: [PATCH] Use ZRTP by default when SRTP is disabled. --- Classes/LinphoneUI/LinphoneManager.m | 2 +- linphonerc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m index 65ec30936..fbfc39ae2 100644 --- a/Classes/LinphoneUI/LinphoneManager.m +++ b/Classes/LinphoneUI/LinphoneManager.m @@ -597,7 +597,7 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach ms_warning("Disable video for phones prior to iPhone 3GS"); } bool enableSrtp = [[NSUserDefaults standardUserDefaults] boolForKey:@"enable_srtp_preference"]; - linphone_core_set_media_encryption(theLinphoneCore, enableSrtp?LinphoneMediaEncryptionSRTP:LinphoneMediaEncryptionNone); + linphone_core_set_media_encryption(theLinphoneCore, enableSrtp?LinphoneMediaEncryptionSRTP:LinphoneMediaEncryptionZRTP); UIDevice* device = [UIDevice currentDevice]; bool backgroundSupported = false; diff --git a/linphonerc b/linphonerc index eee6763a7..c494f1303 100644 --- a/linphonerc +++ b/linphonerc @@ -20,6 +20,7 @@ default_proxy=-1 register_only_when_network_is_up=1 auto_net_state_mon=0 keepalive_period=30000 +media_encryption=zrtp [rtp] audio_rtp_port=7076