linphonec encryption support

diff --git a/console/commands.c b/console/commands.c
index 84639ada82f874d3da82ea41a1d1dcefdeb86fb1..e40dda66c35bc20fd690627a89071ac18052d983 100644 (file)
--- a/console/commands.c
+++ b/console/commands.c
@@ -103,6 +103,7 @@ static int lpc_cmd_states(LinphoneCore *lc, char *args);
 static int lpc_cmd_identify(LinphoneCore *lc, char *args);
 static int lpc_cmd_ringback(LinphoneCore *lc, char *args);
 static int lpc_cmd_conference(LinphoneCore *lc, char *args);
+static int lpc_cmd_zrtp_verified(LinphoneCore *lc, char *args);
 
 /* Command handler helpers */
 static void linphonec_proxy_add(LinphoneCore *lc);
@@ -348,6 +349,9 @@ static LPC_COMMAND advanced_commands[] = {
        { "redirect", lpc_cmd_redirect, "Redirect an incoming call",
                "'redirect <redirect-uri>'\t: Redirect all pending incoming calls to the <redirect-uri>\n"
        },
+       { "zrtp-set-verified", lpc_cmd_zrtp_verified,"Set ZRTP SAS verified.",
+               "'Set ZRTP SAS verified'\n"
+       },
        {       NULL,NULL,NULL,NULL}
 };
 
@@ -2552,6 +2556,14 @@ static int lpc_cmd_ringback(LinphoneCore *lc, char *args){
        return 1;
 }
 
+static int lpc_cmd_zrtp_verified(LinphoneCore *lc, char *args){
+       LinphoneCall *call=linphone_core_get_current_call(lc);
+       if (linphone_call_params_get_media_encryption(linphone_call_get_current_params(call))==LinphoneMediaEncryptionZRTP){
+               linphone_call_set_authentication_token_verified(call,TRUE);
+       }
+       return 1;
+}
+
 /***************************************************************************
  *
  *  Command table management funx

diff --git a/gtk/main.ui b/gtk/main.ui
index 9254923865c1e16af8c352063646035ee89db3d9..9d02cb42b40fb3747f9f05086624a28c753189a1 100644 (file)
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@ -167,7 +167,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="encryption_verify_button">
-                        <property name="label" translatable="yes">button</property>
+                        <property name="label" translatable="yes">Set verified</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>