Commit 4661e874 authored by kh1's avatar kh1
Browse files

Fix missing member initialization.

Task-number: QTCREATORBUG-2694
Reviewed-by: ck
parent 82f80d54
...@@ -49,21 +49,28 @@ namespace Core { ...@@ -49,21 +49,28 @@ namespace Core {
using namespace Botan; using namespace Botan;
using namespace Internal; using namespace Internal;
SshKeyGenerator::SshKeyGenerator() { } SshKeyGenerator::SshKeyGenerator()
: m_type(Rsa)
, m_format(OpenSsl)
{
}
bool SshKeyGenerator::generateKeys(KeyType type, PrivateKeyFormat format, bool SshKeyGenerator::generateKeys(KeyType type, PrivateKeyFormat format,
int keySize) int keySize)
{ {
m_type = type;
m_format = format;
try { try {
AutoSeeded_RNG rng; AutoSeeded_RNG rng;
KeyPtr key; KeyPtr key;
if (type == Rsa) if (m_type == Rsa)
key = KeyPtr(new RSA_PrivateKey(rng, keySize)); key = KeyPtr(new RSA_PrivateKey(rng, keySize));
else else
key = KeyPtr(new DSA_PrivateKey(rng, DL_Group(rng, DL_Group::Strong, key = KeyPtr(new DSA_PrivateKey(rng, DL_Group(rng, DL_Group::Strong,
keySize))); keySize)));
return format == Pkcs8 return m_format == Pkcs8
? generatePkcs8Keys(key) : generateOpenSslKeys(key, type); ? generatePkcs8Keys(key) : generateOpenSslKeys(key);
} catch (Botan::Exception &e) { } catch (Botan::Exception &e) {
m_error = tr("Error generating key: %1").arg(e.what()); m_error = tr("Error generating key: %1").arg(e.what());
return false; return false;
...@@ -95,12 +102,12 @@ void SshKeyGenerator::generatePkcs8Key(const KeyPtr &key, bool privateKey) ...@@ -95,12 +102,12 @@ void SshKeyGenerator::generatePkcs8Key(const KeyPtr &key, bool privateKey)
pipe.message_count() - 1); pipe.message_count() - 1);
} }
bool SshKeyGenerator::generateOpenSslKeys(const KeyPtr &key, KeyType type) bool SshKeyGenerator::generateOpenSslKeys(const KeyPtr &key)
{ {
QList<BigInt> publicParams; QList<BigInt> publicParams;
QList<BigInt> allParams; QList<BigInt> allParams;
QByteArray keyId; QByteArray keyId;
if (type == Rsa) { if (m_type == Rsa) {
const QSharedPointer<RSA_PrivateKey> rsaKey const QSharedPointer<RSA_PrivateKey> rsaKey
= key.dynamicCast<RSA_PrivateKey>(); = key.dynamicCast<RSA_PrivateKey>();
publicParams << rsaKey->get_e() << rsaKey->get_n(); publicParams << rsaKey->get_e() << rsaKey->get_n();
...@@ -130,7 +137,7 @@ bool SshKeyGenerator::generateOpenSslKeys(const KeyPtr &key, KeyType type) ...@@ -130,7 +137,7 @@ bool SshKeyGenerator::generateOpenSslKeys(const KeyPtr &key, KeyType type)
encoder.encode(b); encoder.encode(b);
encoder.end_cons(); encoder.end_cons();
const char * const label const char * const label
= type == Rsa ? "RSA PRIVATE KEY" : "DSA PRIVATE KEY"; = m_type == Rsa ? "RSA PRIVATE KEY" : "DSA PRIVATE KEY";
m_privateKey m_privateKey
= QByteArray(PEM_Code::encode (encoder.get_contents(), label).c_str()); = QByteArray(PEM_Code::encode (encoder.get_contents(), label).c_str());
return true; return true;
......
...@@ -61,7 +61,7 @@ private: ...@@ -61,7 +61,7 @@ private:
bool generatePkcs8Keys(const KeyPtr &key); bool generatePkcs8Keys(const KeyPtr &key);
void generatePkcs8Key(const KeyPtr &key, bool privateKey); void generatePkcs8Key(const KeyPtr &key, bool privateKey);
bool generateOpenSslKeys(const KeyPtr &key, KeyType type); bool generateOpenSslKeys(const KeyPtr &key);
QString m_error; QString m_error;
QByteArray m_publicKey; QByteArray m_publicKey;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment