feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

SSH: Allow creation of encrypted keys.

Browse Source 
Change-Id: Id896246ad9f82d37cc7594c80e5bcf9c042149ce
Reviewed-on: http://codereview.qt.nokia.com/2351
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2011-07-28 16:47:15 +02:00
parent 70407c73e5
commit d037858091
3 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/libs/utils/ssh/sshkeygenerator.cpp
View File

@@ -46,6 +46,9 @@
#include <botan/x509_key.h>
#include <QtCore/QDateTime>
#include <QtGui/QInputDialog>
#include <string>
namespace Utils {
@@ -69,14 +72,14 @@ bool SshKeyGenerator::generateKeys(KeyType type, PrivateKeyFormat format, int ke
key = KeyPtr(new DSA_PrivateKey(rng, DL_Group(rng, DL_Group::DSA_Kosherizer, keySize)));
switch (format) {
case Pkcs8:
generatePkcs8KeyStrings(key);
generatePkcs8KeyStrings(key, rng);
break;
case OpenSsl:
generateOpenSslKeyStrings(key);
break;
case Mixed:
default:
generatePkcs8KeyString(key, true);
generatePkcs8KeyString(key, true, rng);
generateOpenSslPublicKeyString(key);
}
return true;
@@ -86,19 +89,37 @@ bool SshKeyGenerator::generateKeys(KeyType type, PrivateKeyFormat format, int ke
}
}
void SshKeyGenerator::generatePkcs8KeyStrings(const KeyPtr &key)
void SshKeyGenerator::generatePkcs8KeyStrings(const KeyPtr &key, Botan::RandomNumberGenerator &rng)
{
generatePkcs8KeyString(key, false);
generatePkcs8KeyString(key, true);
generatePkcs8KeyString(key, false, rng);
generatePkcs8KeyString(key, true, rng);
}
void SshKeyGenerator::generatePkcs8KeyString(const KeyPtr &key, bool privateKey)
void SshKeyGenerator::generatePkcs8KeyString(const KeyPtr &key, bool privateKey,
Botan::RandomNumberGenerator &rng)
{
Pipe pipe;
pipe.start_msg();
QByteArray *keyData;
if (privateKey) {
PKCS8::encode(*key, pipe);
QInputDialog d;
d.setInputMode(QInputDialog::TextInput);
d.setTextEchoMode(QLineEdit::Password);
d.setWindowTitle(tr("Password for Private Key"));
d.setLabelText(tr("It is recommended that you secure your private key\n"
"with a password, which you can can enter below."));
d.setOkButtonText(tr("Encrypt key file"));
d.setCancelButtonText(tr("Do not encrypt key file"));
int result = QDialog::Accepted;
QString password;
while (result == QDialog::Accepted && password.isEmpty()) {
result = d.exec();
password = d.textValue();
}
if (result == QDialog::Accepted)
PKCS8::encrypt_key(*key, pipe, rng, password.toLocal8Bit().data());
else
PKCS8::encode(*key, pipe);
keyData = &m_privateKey;
} else {
X509::encode(*key, pipe);