diff --git a/lang/cpp/src/context.h b/lang/cpp/src/context.h --- a/lang/cpp/src/context.h +++ b/lang/cpp/src/context.h @@ -324,6 +324,9 @@ Error startRevokeSignature(const Key &key, const Key &signingKey, const std::vector &userIds = std::vector()); + Error addAdsk(const Key &k, const char *adsk); + Error startAddAdsk(const Key &k, const char *adsk); + // using TofuInfo::Policy Error setTofuPolicy(const Key &k, unsigned int policy); Error setTofuPolicyStart(const Key &k, unsigned int policy); diff --git a/lang/cpp/src/context.cpp b/lang/cpp/src/context.cpp --- a/lang/cpp/src/context.cpp +++ b/lang/cpp/src/context.cpp @@ -1799,6 +1799,16 @@ key.impl(), signingKey.impl(), uids.c_str(), flags)); } +Error Context::addAdsk(const Key &k, const char *adsk) +{ + return Error(d->lasterr = gpgme_op_createsubkey(d->ctx, k.impl(), adsk, 0, 0, GPGME_CREATE_ADSK)); +} + +Error Context::startAddAdsk(const Key &k, const char *adsk) +{ + return Error(d->lasterr = gpgme_op_createsubkey_start(d->ctx, k.impl(), adsk, 0, 0, GPGME_CREATE_ADSK)); +} + Error Context::setFlag(const char *name, const char *value) { return Error(d->lasterr = gpgme_set_ctx_flag(d->ctx, name, value)); diff --git a/lang/qt/src/qgpgmequickjob.h b/lang/qt/src/qgpgmequickjob.h --- a/lang/qt/src/qgpgmequickjob.h +++ b/lang/qt/src/qgpgmequickjob.h @@ -71,6 +71,7 @@ unsigned int flags = 0) override; void startRevokeSignature(const GpgME::Key &key, const GpgME::Key &signingKey, const std::vector &userIds = std::vector()) override; + void startAddAdsk(const GpgME::Key &key, const char *adsk) override; }; } diff --git a/lang/qt/src/qgpgmequickjob.cpp b/lang/qt/src/qgpgmequickjob.cpp --- a/lang/qt/src/qgpgmequickjob.cpp +++ b/lang/qt/src/qgpgmequickjob.cpp @@ -107,6 +107,12 @@ return std::make_tuple(err, QString(), Error()); } +static QGpgMEQuickJob::result_type addAdskWorker(Context *ctx, const Key &key, const char *adsk) +{ + const auto err = ctx->addAdsk(key, adsk); + return std::make_tuple(err, QString(), Error()); +} + void QGpgMEQuickJob::startCreate(const QString &uid, const char *algo, const QDateTime &expires, @@ -140,4 +146,9 @@ run(std::bind(&revokeSignatureWorker, std::placeholders::_1, key, signingKey, userIds)); } +void QGpgMEQuickJob::startAddAdsk(const GpgME::Key &key, const char *adsk) +{ + run(std::bind(&addAdskWorker, std::placeholders::_1, key, adsk)); +} + #include "qgpgmequickjob.moc" diff --git a/lang/qt/src/quickjob.h b/lang/qt/src/quickjob.h --- a/lang/qt/src/quickjob.h +++ b/lang/qt/src/quickjob.h @@ -85,6 +85,9 @@ virtual void startRevokeSignature(const GpgME::Key &key, const GpgME::Key &signingKey, const std::vector &userIds = std::vector()) = 0; + /** Start --quick-add-adsk */ + virtual void startAddAdsk(const GpgME::Key &key, const char *adsk) = 0; + Q_SIGNALS: void result(const GpgME::Error &error, const QString &auditLogAsHtml = QString(), const GpgME::Error &auditLogError = GpgME::Error());