Skip to content
Snippets Groups Projects
Commit c6d9e386 authored by kde-devel's avatar kde-devel
Browse files

Add --partial-- support for security. Some value are not saved in the... 

Add --partial-- support for security. Some value are not saved in the sflphoned and the encryption type (TLS, SSLv2 and so on) does not save correctly. I am working on that and will commit a fix later.
parent 15628996
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
sflphone-client-kde/CMakeLists.txt
+ 1
− 1
View file @ c6d9e386
...@@ -8,7 +8,7 @@ SET(CMAKE_MODULE_PATH "${LOCAL_CMAKE_MODULE_PATH}") ...@@ -8,7 +8,7 @@ SET(CMAKE_MODULE_PATH "${LOCAL_CMAKE_MODULE_PATH}")
# --- custom targets: --- # --- custom targets: ---
INCLUDE( ${LOCAL_CMAKE_MODULE_PATH}/TargetDistclean.cmake REQUIRED) INCLUDE( ${LOCAL_CMAKE_MODULE_PATH}/TargetDistclean.cmake REQUIRED)
FIND_PACKAGE ( Kabc REQUIRED ) #FIND_PACKAGE ( Kabc REQUIRED )
# FIND_PACKAGE ( PkgConfig REQUIRED ) # FIND_PACKAGE ( PkgConfig REQUIRED )
FIND_PACKAGE ( KDE4 REQUIRED ) FIND_PACKAGE ( KDE4 REQUIRED )
FIND_PACKAGE ( Qt4 REQUIRED ) FIND_PACKAGE ( Qt4 REQUIRED )
......
sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp
+ 6
− 6
View file @ c6d9e386
...@@ -61,7 +61,7 @@ void ConfigurationSkeleton::readConfig() ...@@ -61,7 +61,7 @@ void ConfigurationSkeleton::readConfig()
//////////////////////// ////////////////////////
//Call history settings //Call history settings
setEnableHistory(configurationManager.getHistoryEnabled()); //setEnableHistory(configurationManager.getHistoryEnabled()); //TODO uncomment
setHistoryMax(configurationManager.getHistoryLimit()); setHistoryMax(configurationManager.getHistoryLimit());
//SIP port settings //SIP port settings
...@@ -119,10 +119,10 @@ void ConfigurationSkeleton::readConfig() ...@@ -119,10 +119,10 @@ void ConfigurationSkeleton::readConfig()
setAlsaPlugin(configurationManager.getCurrentAudioOutputPlugin()); setAlsaPlugin(configurationManager.getCurrentAudioOutputPlugin());
bool ok; bool ok;
QStringList devices = configurationManager.getCurrentAudioDevicesIndex(); QStringList devices = configurationManager.getCurrentAudioDevicesIndex();
qDebug() << "inputDevice = " << devices[1]; //qDebug() << "inputDevice = " << devices[1]; //TODO uncomment
int inputDevice = devices[1].toInt(& ok); //int inputDevice = devices[1].toInt(& ok); //TODO uncomment
if(!ok) qDebug() << "inputDevice is not a number"; //if(!ok) qDebug() << "inputDevice is not a number"; //TODO uncomment
setAlsaInputDevice(inputDevice); //setAlsaInputDevice(inputDevice); //TODO uncomment
qDebug() << "outputDevice = " << devices[0]; qDebug() << "outputDevice = " << devices[0];
int outputDevice = devices[0].toInt(& ok); int outputDevice = devices[0].toInt(& ok);
...@@ -191,7 +191,7 @@ void ConfigurationSkeleton::writeConfig() ...@@ -191,7 +191,7 @@ void ConfigurationSkeleton::writeConfig()
qDebug() << "Writing General settings"; qDebug() << "Writing General settings";
//Call history settings //Call history settings
if(enableHistory() != configurationManager.getHistoryEnabled()) configurationManager.setHistoryEnabled(); //TODO if(enableHistory() != configurationManager.getHistoryEnabled()) configurationManager.setHistoryEnabled();
configurationManager.setHistoryLimit(historyMax()); configurationManager.setHistoryLimit(historyMax());
//SIP port settings //SIP port settings
configurationManager.setSipPort(sIPPort()); configurationManager.setSipPort(sIPPort());
......
sflphone-client-kde/src/conf/dlgaccounts.cpp
+ 106
− 36
View file @ c6d9e386
...@@ -40,7 +40,7 @@ DlgAccounts::DlgAccounts(KConfigDialog *parent) ...@@ -40,7 +40,7 @@ DlgAccounts::DlgAccounts(KConfigDialog *parent)
accountList = new AccountList(false); accountList = new AccountList(false);
loadAccountList(); loadAccountList();
accountListHasChanged = false; accountListHasChanged = false;
toolButton_accountsApply->setEnabled(false); //toolButton_accountsApply->setEnabled(false);
connect(edit1_alias, SIGNAL(textEdited(const QString &)), connect(edit1_alias, SIGNAL(textEdited(const QString &)),
this, SLOT(changedAccountList())); this, SLOT(changedAccountList()));
...@@ -66,10 +66,41 @@ DlgAccounts::DlgAccounts(KConfigDialog *parent) ...@@ -66,10 +66,41 @@ DlgAccounts::DlgAccounts(KConfigDialog *parent)
this, SLOT(changedAccountList())); this, SLOT(changedAccountList()));
connect(button_accountRemove, SIGNAL(clicked()), connect(button_accountRemove, SIGNAL(clicked()),
this, SLOT(changedAccountList())); this, SLOT(changedAccountList()));
connect(edit_tls_private_key_password, SIGNAL(textEdited(const QString &)),
this, SLOT(changedAccountList()));
connect(spinbox_tls_listener, SIGNAL(editingFinished()),
this, SLOT(changedAccountList()));
connect(file_tls_authority, SIGNAL(textChanged(const QString &)),
this, SLOT(changedAccountList()));
connect(file_tls_endpoint, SIGNAL(textChanged(const QString &)),
this, SLOT(changedAccountList()));
connect(file_tls_private_key, SIGNAL(textChanged(const QString &)),
this, SLOT(changedAccountList()));
connect(combo_tls_method, SIGNAL(currentIndexChanged(int)),
this, SLOT(changedAccountList()));
connect(edit_tls_cipher, SIGNAL(textEdited(const QString &)),
this, SLOT(changedAccountList()));
connect(edit_tls_outgoing, SIGNAL(textEdited(const QString &)),
this, SLOT(changedAccountList()));
connect(spinbox_tls_timeout_sec, SIGNAL(editingFinished()),
this, SLOT(changedAccountList()));
connect(spinbox_tls_timeout_msec, SIGNAL(editingFinished()),
this, SLOT(changedAccountList()));
connect(check_tls_incoming, SIGNAL(clicked(bool)),
this, SLOT(changedAccountList()));
connect(check_tls_answer, SIGNAL(clicked(bool)),
this, SLOT(changedAccountList()));
connect(check_tls_requier_cert, SIGNAL(clicked(bool)),
this, SLOT(changedAccountList()));
connect(group_security_tls, SIGNAL(clicked(bool)),
this, SLOT(changedAccountList()));
connect(&configurationManager, SIGNAL(accountsChanged()), connect(&configurationManager, SIGNAL(accountsChanged()),
this, SLOT(updateAccountStates())); this, SLOT(updateAccountStates()));
connect(edit_tls_private_key_password, SIGNAL(textEdited(const QString &)),
this, SLOT(changedAccountList()));
connect(this, SIGNAL(updateButtons()), parent, SLOT(updateButtons())); connect(this, SIGNAL(updateButtons()), parent, SLOT(updateButtons()));
} }
...@@ -156,6 +187,24 @@ void DlgAccounts::saveAccount(QListWidgetItem * item) ...@@ -156,6 +187,24 @@ void DlgAccounts::saveAccount(QListWidgetItem * item)
account->setAccountDetail(ACCOUNT_RESOLVE_ONCE, checkBox_conformRFC->isChecked() ? "FALSE" : "TRUE"); account->setAccountDetail(ACCOUNT_RESOLVE_ONCE, checkBox_conformRFC->isChecked() ? "FALSE" : "TRUE");
account->setAccountDetail(ACCOUNT_EXPIRE, QString::number(spinbox_regExpire->value())); account->setAccountDetail(ACCOUNT_EXPIRE, QString::number(spinbox_regExpire->value()));
account->setAccountDetail(ACCOUNT_ENABLED, account->isChecked() ? ACCOUNT_ENABLED_TRUE : ACCOUNT_ENABLED_FALSE); account->setAccountDetail(ACCOUNT_ENABLED, account->isChecked() ? ACCOUNT_ENABLED_TRUE : ACCOUNT_ENABLED_FALSE);
//Security
account->setAccountDetail(TLS_PASSWORD,edit_tls_private_key_password->text());
account->setAccountDetail(TLS_LISTENER_PORT,QString::number(spinbox_tls_listener->value()));
account->setAccountDetail(TLS_CA_LIST_FILE,file_tls_authority->text());
account->setAccountDetail(TLS_CERTIFICATE_FILE,file_tls_endpoint->text());
account->setAccountDetail(TLS_PRIVATE_KEY_FILE,file_tls_private_key->text());
//qDebug() << "\n\n\n\nSET: " << combo_tls_method->currentText() << "\n\n\n";
account->setAccountDetail(TLS_METHOD,combo_tls_method->currentText());
account->setAccountDetail(TLS_CIPHERS,edit_tls_cipher->text());
account->setAccountDetail(TLS_SERVER_NAME,edit_tls_outgoing->text());
account->setAccountDetail(TLS_NEGOTIATION_TIMEOUT_SEC,QString::number(spinbox_tls_timeout_sec->value()));
account->setAccountDetail(TLS_NEGOTIATION_TIMEOUT_MSEC,QString::number(spinbox_tls_timeout_msec->value()));
account->setAccountDetail(TLS_VERIFY_SERVER,check_tls_incoming->isChecked()?"true":"false");
account->setAccountDetail(TLS_VERIFY_CLIENT,check_tls_answer->isChecked()?"true":"false");
account->setAccountDetail(TLS_REQUIRE_CLIENT_CERTIFICATE,check_tls_requier_cert->isChecked()?"true":"false");
account->setAccountDetail(TLS_ENABLE,group_security_tls->isChecked()?"true":"false");
account->setAccountDetail(TLS_METHOD, QString::number(combo_security_STRP->currentIndex()));
} }
void DlgAccounts::loadAccount(QListWidgetItem * item) void DlgAccounts::loadAccount(QListWidgetItem * item)
...@@ -186,6 +235,27 @@ void DlgAccounts::loadAccount(QListWidgetItem * item) ...@@ -186,6 +235,27 @@ void DlgAccounts::loadAccount(QListWidgetItem * item)
bool ok; bool ok;
int val = account->getAccountDetail(ACCOUNT_EXPIRE).toInt(&ok); int val = account->getAccountDetail(ACCOUNT_EXPIRE).toInt(&ok);
spinbox_regExpire->setValue(ok ? val : ACCOUNT_EXPIRE_DEFAULT); spinbox_regExpire->setValue(ok ? val : ACCOUNT_EXPIRE_DEFAULT);
//Security
edit_tls_private_key_password->setText( account->getAccountDetail(TLS_PASSWORD ));
spinbox_tls_listener->setValue( account->getAccountDetail(TLS_LISTENER_PORT ).toInt());
file_tls_authority->setText( account->getAccountDetail(TLS_CA_LIST_FILE ));
file_tls_endpoint->setText( account->getAccountDetail(TLS_CERTIFICATE_FILE ));
file_tls_private_key->setText( account->getAccountDetail(TLS_PRIVATE_KEY_FILE ));
//qDebug() << "\n\n\n\nTHIS: " << account->getAccountDetail(TLS_METHOD ) << "\n\n\n";
combo_tls_method->setCurrentIndex( combo_tls_method->findText(account->getAccountDetail(TLS_METHOD )));
edit_tls_cipher->setText( account->getAccountDetail(TLS_CIPHERS ));
edit_tls_outgoing->setText( account->getAccountDetail(TLS_SERVER_NAME ));
spinbox_tls_timeout_sec->setValue( account->getAccountDetail(TLS_NEGOTIATION_TIMEOUT_SEC ).toInt());
spinbox_tls_timeout_msec->setValue( account->getAccountDetail(TLS_NEGOTIATION_TIMEOUT_MSEC ).toInt());
check_tls_incoming->setChecked( (account->getAccountDetail(TLS_VERIFY_SERVER ) == "true")?1:0);
check_tls_answer->setChecked( (account->getAccountDetail(TLS_VERIFY_CLIENT ) == "true")?1:0);
check_tls_requier_cert->setChecked( (account->getAccountDetail(TLS_REQUIRE_CLIENT_CERTIFICATE ) == "true")?1:0);
group_security_tls->setChecked( (account->getAccountDetail(TLS_ENABLE ) == "true")?1:0);
combo_security_STRP->setCurrentIndex(account->getAccountDetail(TLS_METHOD ).toInt());
updateStatusLabel(account); updateStatusLabel(account);
frame2_editAccounts->setEnabled(true); frame2_editAccounts->setEnabled(true);
} }
...@@ -220,7 +290,7 @@ void DlgAccounts::changedAccountList() ...@@ -220,7 +290,7 @@ void DlgAccounts::changedAccountList()
qDebug() << "changedAccountList"; qDebug() << "changedAccountList";
accountListHasChanged = true; accountListHasChanged = true;
emit updateButtons(); emit updateButtons();
toolButton_accountsApply->setEnabled(true); //toolButton_accountsApply->setEnabled(true);
} }
...@@ -288,12 +358,12 @@ void DlgAccounts::on_button_accountRemove_clicked() ...@@ -288,12 +358,12 @@ void DlgAccounts::on_button_accountRemove_clicked()
listWidget_accountList->setCurrentRow( (r >= listWidget_accountList->count()) ? r-1 : r ); listWidget_accountList->setCurrentRow( (r >= listWidget_accountList->count()) ? r-1 : r );
} }
void DlgAccounts::on_toolButton_accountsApply_clicked() // void DlgAccounts::on_toolButton_accountsApply_clicked() //This button have been removed, coded kept for potential reversal
{ // {
qDebug() << "on_toolButton_accountsApply_clicked"; // qDebug() << "on_toolButton_accountsApply_clicked";
updateSettings(); // updateSettings();
updateWidgets(); // updateWidgets();
} // }
void DlgAccounts::on_edit1_alias_textChanged(const QString & text) void DlgAccounts::on_edit1_alias_textChanged(const QString & text)
{ {
...@@ -365,7 +435,7 @@ void DlgAccounts::updateSettings() ...@@ -365,7 +435,7 @@ void DlgAccounts::updateSettings()
if(accountListHasChanged) if(accountListHasChanged)
{ {
saveAccountList(); saveAccountList();
toolButton_accountsApply->setEnabled(false); //toolButton_accountsApply->setEnabled(false);
accountListHasChanged = false; accountListHasChanged = false;
} }
} }
...@@ -374,7 +444,7 @@ void DlgAccounts::updateWidgets() ...@@ -374,7 +444,7 @@ void DlgAccounts::updateWidgets()
{ {
qDebug() << "DlgAccounts::updateWidgets"; qDebug() << "DlgAccounts::updateWidgets";
loadAccountList(); loadAccountList();
toolButton_accountsApply->setEnabled(false); //toolButton_accountsApply->setEnabled(false);
accountListHasChanged = false; accountListHasChanged = false;
} }
sflphone-client-kde/src/conf/dlgaccounts.h
+ 1
− 1
View file @ c6d9e386
...@@ -78,7 +78,7 @@ private slots: ...@@ -78,7 +78,7 @@ private slots:
void on_button_accountRemove_clicked(); void on_button_accountRemove_clicked();
void on_edit1_alias_textChanged(const QString & text); void on_edit1_alias_textChanged(const QString & text);
void on_listWidget_accountList_currentItemChanged ( QListWidgetItem * current, QListWidgetItem * previous ); void on_listWidget_accountList_currentItemChanged ( QListWidgetItem * current, QListWidgetItem * previous );
void on_toolButton_accountsApply_clicked(); //void on_toolButton_accountsApply_clicked(); //Disabled for future removal
void updateAccountStates(); void updateAccountStates();
void addAccountToAccountList(Account * account); void addAccountToAccountList(Account * account);
void updateAccountListCommands(); void updateAccountListCommands();
......
sflphone-client-kde/src/conf/dlgaccountsbase.ui
+ 455
− 15
View file @ c6d9e386
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>603</width> <width>748</width>
<height>455</height> <height>447</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
<item> <item>
<widget class="QFrame" name="frame1_accountList"> <widget class="QFrame" name="frame1_accountList">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>1</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
...@@ -46,6 +46,12 @@ ...@@ -46,6 +46,12 @@
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="sizeIncrement">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
...@@ -212,16 +218,6 @@ ...@@ -212,16 +218,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<widget class="QToolButton" name="toolButton_accountsApply">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Apply</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
...@@ -232,7 +228,7 @@ ...@@ -232,7 +228,7 @@
<widget class="QTabWidget" name="frame2_editAccounts"> <widget class="QTabWidget" name="frame2_editAccounts">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>1</horstretch> <horstretch>3</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
...@@ -419,6 +415,445 @@ ...@@ -419,6 +415,445 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Credential</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" rowspan="2" colspan="3">
<widget class="QListWidget" name="list_credential">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" column="0">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>327</width>
<height>23</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0" colspan="3">
<widget class="QGroupBox" name="group_credential">
<property name="title">
<string>Details</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="label_credential_realm">
<property name="text">
<string>Realm</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labe_credential_auth">
<property name="text">
<string>Auth. name</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_credential_password">
<property name="text">
<string>Password</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="KLineEdit" name="edit_credential_realm"/>
</item>
<item row="1" column="1">
<widget class="KLineEdit" name="edit_credential_auth"/>
</item>
<item row="2" column="1">
<widget class="KLineEdit" name="edit_credential_password"/>
</item>
</layout>
</widget>
</item>
<item row="2" column="1">
<widget class="QToolButton" name="button_add_credential">
<property name="text">
<string>Add</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QToolButton" name="button_remove_credential">
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>Security</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>426</width>
<height>588</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<widget class="QLabel" name="label_security_STRP">
<property name="text">
<string>STRP key exchange</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="combo_security_STRP">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Disabled</string>
</property>
</item>
<item>
<property name="text">
<string>ZRTP</string>
</property>
</item>
<item>
<property name="text">
<string>SDES</string>
</property>
</item>
</widget>
</item>
<item row="0" column="2">
<widget class="QToolButton" name="button_security_STRP">
<property name="text">
<string>Edit</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="3">
<widget class="QLabel" name="label_tls_info">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>TLS transport can be used along with UDP for those calls that would require secure sip transactions (aka SIPS). You can configure a different TLS transport for each account. However each of them will run on a dedicated port, different one from each other.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="0" colspan="3">
<widget class="QGroupBox" name="group_security_tls">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Enable TLS</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QLabel" name="label_tls_listener">
<property name="text">
<string>Global TLS listener*</string>
</property>
</widget>
</item>
<item row="0" column="1" colspan="3">
<widget class="KIntSpinBox" name="spinbox_tls_listener">
<property name="maximum">
<number>65535</number>
</property>
</widget>
</item>
<item row="0" column="4" colspan="5">
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_tls_authority">
<property name="text">
<string>Authority certificate list</string>
</property>
</widget>
</item>
<item row="1" column="1" colspan="8">
<widget class="KUrlRequester" name="file_tls_authority"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_tls_endpoint">
<property name="text">
<string>Public endpoint certificate</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="8">
<widget class="KUrlRequester" name="file_tls_endpoint"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_tls_private_key">
<property name="text">
<string>Private key</string>
</property>
</widget>
</item>
<item row="3" column="1" colspan="8">
<widget class="KUrlRequester" name="file_tls_private_key"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_tls_private_key_password">
<property name="text">
<string>Private key password</string>
</property>
</widget>
</item>
<item row="4" column="1" colspan="8">
<widget class="KLineEdit" name="edit_tls_private_key_password"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_tls_method">
<property name="text">
<string>TLS protocol method</string>
</property>
</widget>
</item>
<item row="5" column="1" colspan="3">
<widget class="QComboBox" name="combo_tls_method">
<item>
<property name="text">
<string>Default</string>
</property>
</item>
<item>
<property name="text">
<string>TLSv1</string>
</property>
</item>
<item>
<property name="text">
<string>SSLv2</string>
</property>
</item>
<item>
<property name="text">
<string>SSLv3</string>
</property>
</item>
<item>
<property name="text">
<string>SSLv23</string>
</property>
</item>
</widget>
</item>
<item row="5" column="4" colspan="5">
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_tls_cipher">
<property name="text">
<string>TLS cipher list</string>
</property>
</widget>
</item>
<item row="6" column="1" colspan="8">
<widget class="KLineEdit" name="edit_tls_cipher"/>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_tls_outgoing">
<property name="text">
<string>Outgoing TLS server name</string>
</property>
</widget>
</item>
<item row="7" column="1" colspan="8">
<widget class="KLineEdit" name="edit_tls_outgoing"/>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_tls_timeout">
<property name="text">
<string>Negotiation timeout (s:ms)</string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="KIntSpinBox" name="spinbox_tls_timeout_sec">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="9" column="0" colspan="5">
<widget class="QCheckBox" name="check_tls_incoming">
<property name="text">
<string>Verify incoming certificates (server side)</string>
</property>
</widget>
</item>
<item row="10" column="0" colspan="5">
<widget class="QCheckBox" name="check_tls_answer">
<property name="text">
<string>Verify answer certificates (client side)</string>
</property>
</widget>
</item>
<item row="11" column="0" colspan="5">
<widget class="QCheckBox" name="check_tls_requier_cert">
<property name="text">
<string>Require a certificate for incoming TLS connections</string>
</property>
</widget>
</item>
<item row="12" column="0">
<widget class="QLabel" name="label_tls_details">
<property name="text">
<string>*Apply to all accounts</string>
</property>
</widget>
</item>
<item row="13" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="8" column="4" colspan="5">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="8" column="3">
<widget class="KIntSpinBox" name="spinbox_tls_timeout_msec">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QLabel" name="label_timeout2">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>10</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>&lt;center&gt;:&lt;/center&gt;</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
</layout> </layout>
...@@ -484,6 +919,11 @@ ...@@ -484,6 +919,11 @@
<extends>QSpinBox</extends> <extends>QSpinBox</extends>
<header>knuminput.h</header> <header>knuminput.h</header>
</customwidget> </customwidget>
<customwidget>
<class>KUrlRequester</class>
<extends>QFrame</extends>
<header>kurlrequester.h</header>
</customwidget>
<customwidget> <customwidget>
<class>KLineEdit</class> <class>KLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
......
sflphone-client-kde/src/sflphone_const.h
+ 30
− 1
View file @ c6d9e386
...@@ -205,6 +205,35 @@ ...@@ -205,6 +205,35 @@
#define CONST_ALSA 0 #define CONST_ALSA 0
#define CONST_PULSEAUDIO 1 #define CONST_PULSEAUDIO 1
/** TLS */
#define TLS_LISTENER_PORT "TLS.listenerPort"
#define TLS_ENABLE "TLS.enable"
#define TLS_PORT "TLS.port"
#define TLS_CA_LIST_FILE "TLS.certificateListFile"
#define TLS_CERTIFICATE_FILE "TLS.certificateFile"
#define TLS_PRIVATE_KEY_FILE "TLS.privateKeyFile"
#define TLS_PASSWORD "TLS.password"
#define TLS_METHOD "TLS.method"
#define TLS_CIPHERS "TLS.ciphers"
#define TLS_SERVER_NAME "TLS.serverName"
#define TLS_VERIFY_SERVER "TLS.verifyServer"
#define TLS_VERIFY_CLIENT "TLS.verifyClient"
#define TLS_REQUIRE_CLIENT_CERTIFICATE "TLS.requireClientCertificate"
#define TLS_NEGOTIATION_TIMEOUT_SEC "TLS.negotiationTimeoutSec"
#define TLS_NEGOTIATION_TIMEOUT_MSEC "TLS.negotiationTimemoutMsec"
#define ACCOUNT_PASSWORD "password"
#define ACCOUNT_AUTHENTICATION_USERNAME "authenticationUsername"
#define ACCOUNT_REALM "realm"
#define ACCOUNT_KEY_EXCHANGE "SRTP.keyExchange"
#define ACCOUNT_SRTP_ENABLED "SRTP.enable"
#define ACCOUNT_SRTP_RTP_FALLBACK "SRTP.rtpFallback"
#define ACCOUNT_ZRTP_DISPLAY_SAS "ZRTP.displaySAS"
#define ACCOUNT_ZRTP_NOT_SUPP_WARNING "ZRTP.notSuppWarning"
#define ACCOUNT_ZRTP_HELLO_HASH "ZRTP.helloHashEnable"
#define ACCOUNT_DISPLAY_SAS_ONCE "ZRTP.displaySasOnce"
#define KEY_EXCHANGE_NONE "0"
#define ZRTP "1"
#define SDES "2"
#endif #endif
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment