AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed setPassphraseCallback() function from ServerController and libssh::Client

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-04-04 13:32:37 +03:00
parent a005ed2a84
commit f8ef69b88a
5 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/core/sshclient.cpp
View file

@ -338,12 +338,13 @@ namespace libssh {
}
}
ErrorCode Client::getDecryptedPrivateKey(const ServerCredentials &credentials, QString &decryptedPrivateKey)
ErrorCode Client::getDecryptedPrivateKey(const ServerCredentials &credentials, QString &decryptedPrivateKey, const std::function<QString()> &passphraseCallback)
{
int authResult = SSH_ERROR;
ErrorCode errorCode = ErrorCode::NoError;
ssh_key privateKey;
m_passphraseCallback = passphraseCallback;
authResult = ssh_pki_import_privkey_base64(credentials.password.toStdString().c_str(), nullptr, callback, nullptr, &privateKey);
if (authResult == SSH_OK) {
char* key = new char[65535];
@ -363,9 +364,4 @@ namespace libssh {
ssh_key_free(privateKey);
return errorCode;
}
void Client::setPassphraseCallback(const std::function<QString()> &callback)
{
m_passphraseCallback = callback;
}
}