TDE
/
kvpnc
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kvpnc
0
0
Fork 0
Code Issues Releases Wiki Activity

Adapted to new KPasswordEdit::password() signature. This relates to bug 2961.git

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 6 years ago
parent bb94223137
commit ec259d1e7d
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File

4
src/ciscocertificateenrollment.cpp
Unescape View File

@ -177,7 +177,7 @@ void CiscoCertificateEnrollment::next ()
else if ( GlobalConfig->KvpncDebugLevel > 4 ) else if ( GlobalConfig->KvpncDebugLevel > 4 )
GlobalConfig->appendLogEntry ( i18n ( "Password (cleartext): %1" ).arg ( selectionpage->NewPasswordPasswordEdit->password() ), KVpncConfig::debug ); GlobalConfig->appendLogEntry ( i18n ( "Password (cleartext): %1" ).arg ( selectionpage->NewPasswordPasswordEdit->password() ), KVpncConfig::debug );
ChallengePassword =TQString(selectionpage->NewPasswordPasswordEdit->password()); ChallengePassword = selectionpage->NewPasswordPasswordEdit->password();
} }
if ( GlobalConfig->KvpncDebugLevel > 2 ) if ( GlobalConfig->KvpncDebugLevel > 2 )
@ -224,7 +224,7 @@ void CiscoCertificateEnrollment::next ()
else if ( GlobalConfig->KvpncDebugLevel > 4 ) else if ( GlobalConfig->KvpncDebugLevel > 4 )
GlobalConfig->appendLogEntry ( i18n ( "Challenge password (cleartext): %1" ).arg ( selectionpage->ChallengePasswordPasswordEdit->password() ), KVpncConfig::debug ); GlobalConfig->appendLogEntry ( i18n ( "Challenge password (cleartext): %1" ).arg ( selectionpage->ChallengePasswordPasswordEdit->password() ), KVpncConfig::debug );
ChallengePassword =TQString(selectionpage->ChallengePasswordPasswordEdit->password()); ChallengePassword = selectionpage->ChallengePasswordPasswordEdit->password();
} }
} }

14
src/importcertificatedialog.cpp
Unescape View File

@ -259,7 +259,7 @@ void ImportCertificateDialog::accept()
} }
if ( importOk ) if ( importOk )
{ {
if ( TQString ( main->PrivateKeyPasswordEdit->password() ) != TQString ( main->PrivateKeyAgainPasswordEdit->password() ) ) if ( main->PrivateKeyPasswordEdit->password() != main->PrivateKeyAgainPasswordEdit->password() )
{ {
importOk = false; importOk = false;
KMessageBox::sorry ( 0, i18n ( "Private key passwords does not match!" ), i18n ( "Passwords Do Not Match" ) ); KMessageBox::sorry ( 0, i18n ( "Private key passwords does not match!" ), i18n ( "Passwords Do Not Match" ) );
@ -268,7 +268,7 @@ void ImportCertificateDialog::accept()
} }
else else
{ {
privatekeypassword= TQString ( main->PrivateKeyAgainPasswordEdit->password() ); privatekeypassword = main->PrivateKeyAgainPasswordEdit->password();
} }
} }
} }
@ -291,7 +291,7 @@ void ImportCertificateDialog::accept()
} }
if ( importOk ) if ( importOk )
{ {
if ( main->UsePrivateKeyPasswordCheckBox->isChecked() && (TQString ( main->PrivateKeyPasswordEdit->password() ) != TQString ( main->PrivateKeyAgainPasswordEdit->password() ) )) if ( main->UsePrivateKeyPasswordCheckBox->isChecked() && (main->PrivateKeyPasswordEdit->password() != main->PrivateKeyAgainPasswordEdit->password() ))
{ {
importOk = false; importOk = false;
KMessageBox::sorry ( 0, i18n ( "Certificate passwords does not match!" ), i18n ( "Passwords Do Not Match" ) ); KMessageBox::sorry ( 0, i18n ( "Certificate passwords does not match!" ), i18n ( "Passwords Do Not Match" ) );
@ -301,7 +301,7 @@ void ImportCertificateDialog::accept()
else else
{ {
if (main->UsePrivateKeyPasswordCheckBox->isChecked() ) if (main->UsePrivateKeyPasswordCheckBox->isChecked() )
privatekeypassword= TQString ( main->PrivateKeyAgainPasswordEdit->password() ); privatekeypassword = main->PrivateKeyAgainPasswordEdit->password();
} }
} }
} }
@ -509,8 +509,8 @@ void ImportCertificateDialog::accept()
ImportProcess->writeToStdin ( main->ImportPasswordEdit->text() +"\n"); ImportProcess->writeToStdin ( main->ImportPasswordEdit->text() +"\n");
if (main->UsePrivateKeyPasswordCheckBox->isChecked() ) if (main->UsePrivateKeyPasswordCheckBox->isChecked() )
{ {
ImportProcess->writeToStdin ( TQString ( main->PrivateKeyPasswordEdit->password() ) + "\n" ); ImportProcess->writeToStdin ( main->PrivateKeyPasswordEdit->password() + "\n" );
ImportProcess->writeToStdin ( TQString ( main->PrivateKeyPasswordEdit->password() ) + "\n" ); ImportProcess->writeToStdin ( main->PrivateKeyPasswordEdit->password() + "\n" );
} }
} }
} }
@ -1054,7 +1054,7 @@ void ImportCertificateDialog::readFromStdout_import()
{ {
if ( GlobalConfig->KvpncDebugLevel > 0 ) if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1 was requested, send it..." ).arg ( i18n ( "certificate password" ) ),GlobalConfig->debug ); GlobalConfig->appendLogEntry ( i18n ( "Certificate import: %1 was requested, send it..." ).arg ( i18n ( "certificate password" ) ),GlobalConfig->debug );
ImportProcess->writeToStdin ( TQString ( main->PrivateKeyPasswordEdit->password() ) + "\n" ); ImportProcess->writeToStdin ( main->PrivateKeyPasswordEdit->password() + "\n" );
} }
if ( line.find ( "Success: certificate imported from path:", 0, FALSE ) > -1 ) if ( line.find ( "Success: certificate imported from path:", 0, FALSE ) > -1 )

4
src/manageciscocert.cpp
Unescape View File

@ -103,7 +103,7 @@ void ManageCiscoCert::deleteCertClicked()
if ( GlobalConfig->KvpncDebugLevel > 2 ) if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "Process (%1) started." ).arg ("cisco_cert_mgr" ),GlobalConfig->debug ); GlobalConfig->appendLogEntry ( i18n ( "Process (%1) started." ).arg ("cisco_cert_mgr" ),GlobalConfig->debug );
TQCString password; TQString password;
int result = KPasswordDialog::getPassword(password, i18n("Certificate password")); int result = KPasswordDialog::getPassword(password, i18n("Certificate password"));
if (result == KPasswordDialog::Accepted) if (result == KPasswordDialog::Accepted)
@ -112,7 +112,7 @@ void ManageCiscoCert::deleteCertClicked()
if ( GlobalConfig->KvpncDebugLevel > 2 ) if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry ( i18n ( "Certicate password got from user, send it..." ),GlobalConfig->debug ); GlobalConfig->appendLogEntry ( i18n ( "Certicate password got from user, send it..." ),GlobalConfig->debug );
DeleteProcess->writeToStdin( TQString(password)+"\n"); DeleteProcess->writeToStdin( password+"\n");
while (DeleteProcess->isRunning()) while (DeleteProcess->isRunning())
{ {
sleep(1); sleep(1);

8
src/openvpnmanagementhandler.cpp
Unescape View File

@ -243,7 +243,7 @@ void OpenvpnManagementHandler::socketReadyRead()
// GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("'password'"), GlobalConfig->debug ); // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "got %1 message" ).arg("'password'"), GlobalConfig->debug );
// //
// TQString req = line.section( TQRegExp( ".*'(.*)'.*" ), 0, 0 ); // $1; // TQString req = line.section( TQRegExp( ".*'(.*)'.*" ), 0, 0 ); // $1;
// TQCString password; // TQString password;
// TQString pass = ""; // TQString pass = "";
// int result = KPasswordDialog::getPassword( password, TQString( req + i18n( " password:" ) ) ); // int result = KPasswordDialog::getPassword( password, TQString( req + i18n( " password:" ) ) );
// TQTextStream os( socket ); // TQTextStream os( socket );
@ -251,7 +251,7 @@ void OpenvpnManagementHandler::socketReadyRead()
// if ( result == KPasswordDialog::Accepted ) { // if ( result == KPasswordDialog::Accepted ) {
// if ( GlobalConfig->KvpncDebugLevel > 2 ) // if ( GlobalConfig->KvpncDebugLevel > 2 )
// GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "password got from user" ), GlobalConfig->debug ); // GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "password got from user" ), GlobalConfig->debug );
// pass = TQString( password ); // pass = password;
// //
// pass = pass.remove( '\r' ); // pass = pass.remove( '\r' );
// pass = pass.remove( '\n' ); // pass = pass.remove( '\n' );
@ -331,7 +331,7 @@ void OpenvpnManagementHandler::socketReadyRead()
{ {
if ( GlobalConfig->TmpPassword.isEmpty() ) if ( GlobalConfig->TmpPassword.isEmpty() )
{ {
TQCString password; TQString password;
TQString pass = ""; TQString pass = "";
int result = KPasswordDialog::getPassword( password, TQString( i18n( " password:" ) ) ); int result = KPasswordDialog::getPassword( password, TQString( i18n( " password:" ) ) );
TQTextStream os( socket ); TQTextStream os( socket );
@ -340,7 +340,7 @@ void OpenvpnManagementHandler::socketReadyRead()
{ {
if ( GlobalConfig->KvpncDebugLevel > 2 ) if ( GlobalConfig->KvpncDebugLevel > 2 )
GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "password got from user" ), GlobalConfig->debug ); GlobalConfig->appendLogEntry( "OpenvpnManagementHandler: " + i18n( "password got from user" ), GlobalConfig->debug );
GlobalConfig->TmpPassword = TQString( password ); GlobalConfig->TmpPassword = password;
// if ( GlobalConfig->KvpncDebugLevel > 5 ) // if ( GlobalConfig->KvpncDebugLevel > 5 )

Write Preview
Loading…
Cancel
Save