diff options
Diffstat (limited to 'kgpg/transactions/kgpggeneratekey.cpp')
| -rw-r--r-- | kgpg/transactions/kgpggeneratekey.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/kgpg/transactions/kgpggeneratekey.cpp b/kgpg/transactions/kgpggeneratekey.cpp index d95f1e0..52fc1a2 100644 --- a/kgpg/transactions/kgpggeneratekey.cpp +++ b/kgpg/transactions/kgpggeneratekey.cpp @@ -22,7 +22,7 @@ KGpgGenerateKey::KGpgGenerateKey(QObject *parent, const QString &name, const QString &email, const QString &comment, const KgpgCore::KgpgKeyAlgo &algorithm, const uint size, const unsigned int expire, - const char expireunit) + const char expireunit, const QString &password) : KGpgTransaction(parent) { addArgument(QLatin1String( "--status-fd=1" )); @@ -37,6 +37,7 @@ KGpgGenerateKey::KGpgGenerateKey(QObject *parent, const QString &name, const QSt setAlgorithm(algorithm); setSize(size); setExpire(expire, expireunit); + setPassword(password); getProcess()->setOutputChannelMode(KProcess::SeparateChannels); } @@ -103,10 +104,14 @@ KGpgGenerateKey::postStart() keymessage.append(QByteArray::number(m_expire)); keymessage.append(m_expireunit); } + + keymessage.append("\nPassphrase: "); - write(keymessage, false); + keymessage.append(m_password.toUtf8()); + write(keymessage, true); + write("%commit"); - QString passdlgmessage; + /*QString passdlgmessage; if (!m_email.isEmpty()) { passdlgmessage = QObject::tr("<p><b>Enter passphrase for %1 <%2></b>:<br />Passphrase should include non alphanumeric characters and random sequences.</p>").arg(m_name).arg(m_email); } else { @@ -114,7 +119,7 @@ KGpgGenerateKey::postStart() } QApplication::restoreOverrideCursor(); - askNewPassphrase(passdlgmessage); + askNewPassphrase(passdlgmessage);*/ } bool @@ -261,6 +266,12 @@ KGpgGenerateKey::setExpire(const unsigned int expire, const char expireunit) m_expireunit = expireunit; } +void +KGpgGenerateKey::setPassword(const QString &password) +{ + m_password = password; +} + QString KGpgGenerateKey::getFingerprint() const { |