diff options
Diffstat (limited to 'lang/cpp')
73 files changed, 267 insertions, 30 deletions
diff --git a/lang/cpp/Makefile.am b/lang/cpp/Makefile.am index 7fbaca8..026ca00 100644 --- a/lang/cpp/Makefile.am +++ b/lang/cpp/Makefile.am @@ -1,5 +1,6 @@ # Makefile.am for GPGMEPP. -# Copyright (C) 2016 Intevation GmbH +# Copyright (C) 2016 Bundesamt für Sicherheit in der Informationstechnik +# Software engineering by Intevation GmbH # # This file is part of GPGMEPP. # diff --git a/lang/cpp/Makefile.in b/lang/cpp/Makefile.in index f49d1d0..0527499 100644 --- a/lang/cpp/Makefile.in +++ b/lang/cpp/Makefile.in @@ -15,7 +15,8 @@ @SET_MAKE@ # Makefile.am for GPGMEPP. -# Copyright (C) 2016 Intevation GmbH +# Copyright (C) 2016 Bundesamt für Sicherheit in der Informationstechnik +# Software engineering by Intevation GmbH # # This file is part of GPGMEPP. # @@ -318,7 +319,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ -PYTHON_VERSIONS = @PYTHON_VERSIONS@ QTCHOOSER = @QTCHOOSER@ RANLIB = @RANLIB@ RC = @RC@ diff --git a/lang/cpp/README b/lang/cpp/README index b9a48da..e142e37 100644 --- a/lang/cpp/README +++ b/lang/cpp/README @@ -62,7 +62,7 @@ Example to set the ownertrust of a key: Data data; /* Start the edit on some key previously obtained. */ Error e = ctx->edit(key, std::unique_ptr<EditInteractor>(ei), data); - /* Errors provide boolean comparision */ + /* Errors provide boolean comparison */ if (!e) ... /* Delete the context */ diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in index 7f42f31..73f5eaa 100644 --- a/lang/cpp/src/GpgmeppConfig.cmake.in.in +++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in @@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED) set_target_properties(Gpgmepp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@" - INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@" + INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@" IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp@libsuffix@" ) diff --git a/lang/cpp/src/Makefile.am b/lang/cpp/src/Makefile.am index 4028b3d..1e6bdc2 100644 --- a/lang/cpp/src/Makefile.am +++ b/lang/cpp/src/Makefile.am @@ -1,5 +1,6 @@ # Makefile.am for GPGMEPP. -# Copyright (C) 2016 Intevation GmbH +# Copyright (C) 2016 Bundesamt für Sicherheit in der Informationstechnik +# Software engineering by Intevation GmbH # # This file is part of GPGMEPP. # diff --git a/lang/cpp/src/Makefile.in b/lang/cpp/src/Makefile.in index 27bf982..21b259d 100644 --- a/lang/cpp/src/Makefile.in +++ b/lang/cpp/src/Makefile.in @@ -15,7 +15,8 @@ @SET_MAKE@ # Makefile.am for GPGMEPP. -# Copyright (C) 2016 Intevation GmbH +# Copyright (C) 2016 Bundesamt für Sicherheit in der Informationstechnik +# Software engineering by Intevation GmbH # # This file is part of GPGMEPP. # @@ -382,7 +383,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ -PYTHON_VERSIONS = @PYTHON_VERSIONS@ QTCHOOSER = @QTCHOOSER@ RANLIB = @RANLIB@ RC = @RC@ diff --git a/lang/cpp/src/callbacks.cpp b/lang/cpp/src/callbacks.cpp index 3631c53..f7692a0 100644 --- a/lang/cpp/src/callbacks.cpp +++ b/lang/cpp/src/callbacks.cpp @@ -1,6 +1,8 @@ /* callbacks.cpp - callback targets for internal use: Copyright (C) 2003,2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/callbacks.h b/lang/cpp/src/callbacks.h index 4206637..a2c6e1b 100644 --- a/lang/cpp/src/callbacks.h +++ b/lang/cpp/src/callbacks.h @@ -1,6 +1,8 @@ /* callbacks.h - callback targets for internal use: Copyright (C) 2003 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/configuration.cpp b/lang/cpp/src/configuration.cpp index 293746a..8ccc05e 100644 --- a/lang/cpp/src/configuration.cpp +++ b/lang/cpp/src/configuration.cpp @@ -1,6 +1,8 @@ /* configuration.cpp - wraps gpgme configuration components Copyright (C) 2010 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/configuration.h b/lang/cpp/src/configuration.h index 288a410..6993b6d 100644 --- a/lang/cpp/src/configuration.h +++ b/lang/cpp/src/configuration.h @@ -1,6 +1,8 @@ /* configuration.h - wraps gpgme configuration components Copyright (C) 2010 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. @@ -93,8 +95,8 @@ class GPGMEPP_EXPORT Component { public: Component() : comp() {} - explicit Component(const shared_gpgme_conf_comp_t &comp) - : comp(comp) {} + explicit Component(const shared_gpgme_conf_comp_t &gpgme_comp) + : comp(gpgme_comp) {} // copy ctor is ok @@ -144,8 +146,8 @@ class GPGMEPP_EXPORT Option { public: Option() : comp(), opt(0) {} - Option(const shared_gpgme_conf_comp_t &comp, gpgme_conf_opt_t opt) - : comp(comp), opt(opt) {} + Option(const shared_gpgme_conf_comp_t &gpgme_comp, gpgme_conf_opt_t gpgme_opt) + : comp(gpgme_comp), opt(gpgme_opt) {} const Option &operator=(const Option &other) { diff --git a/lang/cpp/src/context.cpp b/lang/cpp/src/context.cpp index 77962d8..135e4d5 100644 --- a/lang/cpp/src/context.cpp +++ b/lang/cpp/src/context.cpp @@ -1404,6 +1404,38 @@ Error Context::setTofuPolicyStart(const Key &k, unsigned int policy) k.impl(), to_tofu_policy_t(policy))); } +Error Context::startCreateKey (const char *userid, + const char *algo, + unsigned long reserved, + unsigned long expires, + const Key &certkey, + unsigned int flags) +{ + return Error(d->lasterr = gpgme_op_createkey_start(d->ctx, + userid, + algo, + reserved, + expires, + certkey.impl(), + flags)); +} + +Error Context::createKey (const char *userid, + const char *algo, + unsigned long reserved, + unsigned long expires, + const Key &certkey, + unsigned int flags) +{ + return Error(d->lasterr = gpgme_op_createkey(d->ctx, + userid, + algo, + reserved, + expires, + certkey.impl(), + flags)); +} + Error Context::addUid(const Key &k, const char *userid) { return Error(d->lasterr = gpgme_op_adduid(d->ctx, @@ -1428,6 +1460,24 @@ Error Context::startRevUid(const Key &k, const char *userid) k.impl(), userid, 0)); } +Error Context::createSubkey(const Key &k, const char *algo, + unsigned long reserved, + unsigned long expires, + unsigned int flags) +{ + return Error(d->lasterr = gpgme_op_createsubkey(d->ctx, + k.impl(), algo, reserved, expires, flags)); +} + +Error Context::startCreateSubkey(const Key &k, const char *algo, + unsigned long reserved, + unsigned long expires, + unsigned int flags) +{ + return Error(d->lasterr = gpgme_op_createsubkey_start(d->ctx, + k.impl(), algo, reserved, expires, flags)); +} + // Engine Spawn stuff Error Context::spawn(const char *file, const char *argv[], Data &input, Data &output, Data &err, diff --git a/lang/cpp/src/context.h b/lang/cpp/src/context.h index bec4e39..4cd5b30 100644 --- a/lang/cpp/src/context.h +++ b/lang/cpp/src/context.h @@ -214,12 +214,38 @@ public: GpgME::Error edit(const Key &key, std::unique_ptr<EditInteractor> function, Data &out); GpgME::Error startEditing(const Key &key, std::unique_ptr<EditInteractor> function, Data &out); + + // + // Modern Interface actions. Require 2.1.x + // + Error startCreateKey (const char *userid, + const char *algo, + unsigned long reserved, + unsigned long expires, + const Key &certkey, + unsigned int flags); + Error createKey (const char *userid, + const char *algo, + unsigned long reserved, + unsigned long expires, + const Key &certkey, + unsigned int flags); + Error addUid(const Key &key, const char *userid); Error startAddUid(const Key &key, const char *userid); Error revUid(const Key &key, const char *userid); Error startRevUid(const Key &key, const char *userid); + Error createSubkey(const Key &key, const char *algo, + unsigned long reserved = 0, + unsigned long expires = 0, + unsigned int flags = 0); + Error startCreateSubkey(const Key &key, const char *algo, + unsigned long reserved = 0, + unsigned long expires = 0, + unsigned int flags = 0); + // 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_p.h b/lang/cpp/src/context_p.h index d53da0a..6b0a080 100644 --- a/lang/cpp/src/context_p.h +++ b/lang/cpp/src/context_p.h @@ -1,6 +1,8 @@ /* context_p.h - wraps a gpgme context (private part) Copyright (C) 2003, 2007 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/context_vanilla.cpp b/lang/cpp/src/context_vanilla.cpp index 77a488a..60ddea2 100644 --- a/lang/cpp/src/context_vanilla.cpp +++ b/lang/cpp/src/context_vanilla.cpp @@ -1,6 +1,8 @@ /* context_vanilla.cpp - wraps a gpgme key context, gpgme (vanilla)-specific functions Copyright (C) 2007 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/data_p.h b/lang/cpp/src/data_p.h index 38ba55a..493b754 100644 --- a/lang/cpp/src/data_p.h +++ b/lang/cpp/src/data_p.h @@ -1,6 +1,8 @@ /* data_p.h - wraps a gpgme data object, private part -*- c++ -*- Copyright (C) 2003,2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/decryptionresult.cpp b/lang/cpp/src/decryptionresult.cpp index f59d24c..1e815cb 100644 --- a/lang/cpp/src/decryptionresult.cpp +++ b/lang/cpp/src/decryptionresult.cpp @@ -1,6 +1,8 @@ /* decryptionresult.cpp - wraps a gpgme keygen result Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. @@ -108,6 +110,11 @@ bool GpgME::DecryptionResult::isWrongKeyUsage() const return d && d->res.wrong_key_usage; } +bool GpgME::DecryptionResult::isDeVs() const +{ + return d && d->res.is_de_vs; +} + const char *GpgME::DecryptionResult::fileName() const { return d ? d->res.file_name : 0 ; @@ -223,6 +230,7 @@ std::ostream &GpgME::operator<<(std::ostream &os, const DecryptionResult &result << "\n fileName: " << protect(result.fileName()) << "\n unsupportedAlgorithm: " << protect(result.unsupportedAlgorithm()) << "\n isWrongKeyUsage: " << result.isWrongKeyUsage() + << "\n isDeVs " << result.isDeVs() << "\n recipients:\n"; const std::vector<DecryptionResult::Recipient> recipients = result.recipients(); std::copy(recipients.begin(), recipients.end(), diff --git a/lang/cpp/src/decryptionresult.h b/lang/cpp/src/decryptionresult.h index 60b78d9..57705b4 100644 --- a/lang/cpp/src/decryptionresult.h +++ b/lang/cpp/src/decryptionresult.h @@ -1,6 +1,8 @@ /* decryptionresult.h - wraps a gpgme keygen result Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. @@ -71,6 +73,7 @@ public: return isWrongKeyUsage(); } bool isWrongKeyUsage() const; + bool isDeVs() const; const char *fileName() const; diff --git a/lang/cpp/src/defaultassuantransaction.cpp b/lang/cpp/src/defaultassuantransaction.cpp index 549092d..2184f04 100644 --- a/lang/cpp/src/defaultassuantransaction.cpp +++ b/lang/cpp/src/defaultassuantransaction.cpp @@ -1,6 +1,8 @@ /* defaultassuantransaction.cpp - default Assuan Transaction that just stores data and status lines Copyright (C) 2009 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/defaultassuantransaction.h b/lang/cpp/src/defaultassuantransaction.h index bf4b839..f294ffe 100644 --- a/lang/cpp/src/defaultassuantransaction.h +++ b/lang/cpp/src/defaultassuantransaction.h @@ -1,6 +1,8 @@ /* defaultassuantransaction.h - default Assuan Transaction that just stores data and status lines Copyright (C) 2009 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/editinteractor.cpp b/lang/cpp/src/editinteractor.cpp index b652bda..3e29488 100644 --- a/lang/cpp/src/editinteractor.cpp +++ b/lang/cpp/src/editinteractor.cpp @@ -1,6 +1,8 @@ /* editinteractor.cpp - Interface for edit interactors Copyright (C) 2007 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/editinteractor.h b/lang/cpp/src/editinteractor.h index 2122052..247bf8c 100644 --- a/lang/cpp/src/editinteractor.h +++ b/lang/cpp/src/editinteractor.h @@ -1,6 +1,8 @@ /* editinteractor.h - Interface for edit interactors Copyright (C) 2007 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/encryptionresult.cpp b/lang/cpp/src/encryptionresult.cpp index b4298d7..33365cd 100644 --- a/lang/cpp/src/encryptionresult.cpp +++ b/lang/cpp/src/encryptionresult.cpp @@ -1,6 +1,8 @@ /* encryptionresult.cpp - wraps a gpgme verify result Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/encryptionresult.h b/lang/cpp/src/encryptionresult.h index edc400f..312dfec 100644 --- a/lang/cpp/src/encryptionresult.h +++ b/lang/cpp/src/encryptionresult.h @@ -1,6 +1,8 @@ /* encryptionresult.h - wraps a gpgme sign result Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/engineinfo.cpp b/lang/cpp/src/engineinfo.cpp index 763aab9..1a66ced 100644 --- a/lang/cpp/src/engineinfo.cpp +++ b/lang/cpp/src/engineinfo.cpp @@ -1,6 +1,8 @@ /* engineinfo.h Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/engineinfo.h b/lang/cpp/src/engineinfo.h index aa6fcca..cd1b7a7 100644 --- a/lang/cpp/src/engineinfo.h +++ b/lang/cpp/src/engineinfo.h @@ -1,6 +1,8 @@ /* engineinfo.h Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. @@ -69,13 +71,13 @@ public: bool operator < (const Version& other) { - if (major < other.major) - return true; - if (minor < other.minor) - return true; - if (patch < other.patch) - return true; - return false; + if (major > other.major || + (major == other.major && minor > other.minor) || + (major == other.major && minor == other.minor && patch > other.patch) || + (major >= other.major && minor >= other.minor && patch >= other.patch)) { + return false; + } + return true; } bool operator < (const char* other) @@ -83,6 +85,15 @@ public: return operator<(Version(other)); } + bool operator > (const char* other) + { + return !operator<(Version(other)); + } + + bool operator > (const Version & other) + { + return !operator<(other); + } bool operator == (const Version& other) { return major == other.major diff --git a/lang/cpp/src/error.h b/lang/cpp/src/error.h index 009fe20..d136704 100644 --- a/lang/cpp/src/error.h +++ b/lang/cpp/src/error.h @@ -1,6 +1,8 @@ /* error.h - wraps a gpgme error Copyright (C) 2003, 2007 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/eventloopinteractor.cpp b/lang/cpp/src/eventloopinteractor.cpp index 7faa50c..a30b793 100644 --- a/lang/cpp/src/eventloopinteractor.cpp +++ b/lang/cpp/src/eventloopinteractor.cpp @@ -1,6 +1,8 @@ /* eventloopinteractor.cpp Copyright (C) 2003,2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/eventloopinteractor.h b/lang/cpp/src/eventloopinteractor.h index 94821d6..79f6b63 100644 --- a/lang/cpp/src/eventloopinteractor.h +++ b/lang/cpp/src/eventloopinteractor.h @@ -1,6 +1,8 @@ /* eventloopinteractor.h Copyright (C) 2003,2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/exception.cpp b/lang/cpp/src/exception.cpp index cf42f91..7751c3e 100644 --- a/lang/cpp/src/exception.cpp +++ b/lang/cpp/src/exception.cpp @@ -1,6 +1,8 @@ /* exception.cpp - exception wrapping a gpgme error Copyright (C) 2007 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/exception.h b/lang/cpp/src/exception.h index 8f40b0e..85169d8 100644 --- a/lang/cpp/src/exception.h +++ b/lang/cpp/src/exception.h @@ -1,6 +1,8 @@ /* exception.h - exception wrapping a gpgme error Copyright (C) 2007 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/global.h b/lang/cpp/src/global.h index 15cc027..38cfd4c 100644 --- a/lang/cpp/src/global.h +++ b/lang/cpp/src/global.h @@ -1,6 +1,8 @@ /* global.h - global gpgme functions and enums Copyright (C) 2003, 2007 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/gpgadduserideditinteractor.cpp b/lang/cpp/src/gpgadduserideditinteractor.cpp index f7851a5..593ac58 100644 --- a/lang/cpp/src/gpgadduserideditinteractor.cpp +++ b/lang/cpp/src/gpgadduserideditinteractor.cpp @@ -1,6 +1,8 @@ /* gpgadduserideditinteractor.cpp - Edit Interactor to add a new UID to an OpenPGP key Copyright (C) 2008 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/gpgadduserideditinteractor.h b/lang/cpp/src/gpgadduserideditinteractor.h index 12b6e46..10cac08 100644 --- a/lang/cpp/src/gpgadduserideditinteractor.h +++ b/lang/cpp/src/gpgadduserideditinteractor.h @@ -1,6 +1,8 @@ /* gpgadduserideditinteractor.h - Edit Interactor to add a new UID to an OpenPGP key Copyright (C) 2008 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/gpgagentgetinfoassuantransaction.cpp b/lang/cpp/src/gpgagentgetinfoassuantransaction.cpp index 4b30b31..a05ff96 100644 --- a/lang/cpp/src/gpgagentgetinfoassuantransaction.cpp +++ b/lang/cpp/src/gpgagentgetinfoassuantransaction.cpp @@ -1,6 +1,8 @@ /* gpgagentgetinfoassuantransaction.cpp - Assuan Transaction to get information from gpg-agent Copyright (C) 2009 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/gpgagentgetinfoassuantransaction.h b/lang/cpp/src/gpgagentgetinfoassuantransaction.h index 9e3e958..1bc5016 100644 --- a/lang/cpp/src/gpgagentgetinfoassuantransaction.h +++ b/lang/cpp/src/gpgagentgetinfoassuantransaction.h @@ -1,6 +1,8 @@ /* gpgagentgetinfoassuantransaction.h - Assuan Transaction to get information from gpg-agent Copyright (C) 2009 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/gpggencardkeyinteractor.cpp b/lang/cpp/src/gpggencardkeyinteractor.cpp index 90329e2..6f42e47 100644 --- a/lang/cpp/src/gpggencardkeyinteractor.cpp +++ b/lang/cpp/src/gpggencardkeyinteractor.cpp @@ -1,6 +1,7 @@ /* gpggencardkeyinteractor.cpp - Edit Interactor to generate a key on a card - Copyright (C) 2017 Intevation GmbH + Copyright (C) 2017 by Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/gpggencardkeyinteractor.h b/lang/cpp/src/gpggencardkeyinteractor.h index c6b17d1..7cc2216 100644 --- a/lang/cpp/src/gpggencardkeyinteractor.h +++ b/lang/cpp/src/gpggencardkeyinteractor.h @@ -1,6 +1,7 @@ /* gpggencardkeyinteractor.h - Edit Interactor to generate a key on a card - Copyright (C) 2017 Intevation GmbH + Copyright (C) 2017 by Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/gpgmefw.h b/lang/cpp/src/gpgmefw.h index e3c9b18..fdad7bf 100644 --- a/lang/cpp/src/gpgmefw.h +++ b/lang/cpp/src/gpgmefw.h @@ -1,6 +1,8 @@ /* gpgmefw.h - Forwards declarations for gpgme (0.3 and 0.4) Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/gpgmepp_export.h b/lang/cpp/src/gpgmepp_export.h index d660310..0e5302f 100644 --- a/lang/cpp/src/gpgmepp_export.h +++ b/lang/cpp/src/gpgmepp_export.h @@ -1,5 +1,6 @@ /*gpgmepp_export.h - Export macros for gpgmepp - Copyright (C) 2016, Intevation GmbH + Copyright (C) 2016, by Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp b/lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp index 5e8ba80..7aebe73 100644 --- a/lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp +++ b/lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp @@ -1,6 +1,8 @@ /* gpgsetexpirytimeeditinteractor.cpp - Edit Interactor to change the expiry time of an OpenPGP key Copyright (C) 2007 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/gpgsetexpirytimeeditinteractor.h b/lang/cpp/src/gpgsetexpirytimeeditinteractor.h index 670b445..6a4c737 100644 --- a/lang/cpp/src/gpgsetexpirytimeeditinteractor.h +++ b/lang/cpp/src/gpgsetexpirytimeeditinteractor.h @@ -1,6 +1,8 @@ /* gpgsetexpirytimeeditinteractor.h - Edit Interactor to change the expiry time of an OpenPGP key Copyright (C) 2007 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/gpgsetownertrusteditinteractor.cpp b/lang/cpp/src/gpgsetownertrusteditinteractor.cpp index 581605f..7525fd8 100644 --- a/lang/cpp/src/gpgsetownertrusteditinteractor.cpp +++ b/lang/cpp/src/gpgsetownertrusteditinteractor.cpp @@ -1,6 +1,8 @@ /* gpgsetownertrusteditinteractor.cpp - Edit Interactor to change the expiry time of an OpenPGP key Copyright (C) 2007 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/gpgsetownertrusteditinteractor.h b/lang/cpp/src/gpgsetownertrusteditinteractor.h index caf29ee..9cec77e 100644 --- a/lang/cpp/src/gpgsetownertrusteditinteractor.h +++ b/lang/cpp/src/gpgsetownertrusteditinteractor.h @@ -1,6 +1,8 @@ /* gpgsetownertrusteditinteractor.h - Edit Interactor to change the owner trust of an OpenPGP key Copyright (C) 2007 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/gpgsignkeyeditinteractor.cpp b/lang/cpp/src/gpgsignkeyeditinteractor.cpp index 7effc64..79691bc 100644 --- a/lang/cpp/src/gpgsignkeyeditinteractor.cpp +++ b/lang/cpp/src/gpgsignkeyeditinteractor.cpp @@ -1,6 +1,8 @@ /* gpgsignkeyeditinteractor.cpp - Edit Interactor to change the expiry time of an OpenPGP key Copyright (C) 2007 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. @@ -156,6 +158,7 @@ enum SignKeyState { SET_TRUST_DEPTH, SET_TRUST_REGEXP, CONFIRM, + CONFIRM2, QUIT, SAVE, ERROR = EditInteractor::ErrorState @@ -180,6 +183,7 @@ static GpgSignKeyEditInteractor_Private::TransitionMap makeTable() addEntry(START, GET_LINE, "keyedit.prompt", COMMAND); addEntry(COMMAND, GET_BOOL, "keyedit.sign_all.okay", UIDS_ANSWER_SIGN_ALL); addEntry(COMMAND, GET_BOOL, "sign_uid.okay", CONFIRM); + addEntry(COMMAND, GET_BOOL, "sign_uid.local_promote_okay", CONFIRM2); addEntry(UIDS_ANSWER_SIGN_ALL, GET_BOOL, "sign_uid.okay", CONFIRM); addEntry(UIDS_ANSWER_SIGN_ALL, GET_LINE, "sign_uid.expire", SET_EXPIRE); addEntry(UIDS_ANSWER_SIGN_ALL, GET_LINE, "sign_uid.class", SET_CHECK_LEVEL); @@ -190,6 +194,7 @@ static GpgSignKeyEditInteractor_Private::TransitionMap makeTable() addEntry(SET_EXPIRE, GET_BOOL, "sign_uid.class", SET_CHECK_LEVEL); addEntry(CONFIRM, GET_BOOL, "sign_uid.local_promote_okay", CONFIRM); addEntry(CONFIRM, GET_BOOL, "sign_uid.okay", CONFIRM); + addEntry(CONFIRM2, GET_BOOL, "sign_uid.okay", CONFIRM); addEntry(CONFIRM, GET_LINE, "keyedit.prompt", COMMAND); addEntry(CONFIRM, GET_LINE, "trustsign_prompt.trust_value", SET_TRUST_VALUE); addEntry(CONFIRM, GET_LINE, "sign_uid.expire", SET_EXPIRE); @@ -231,6 +236,7 @@ const char *GpgSignKeyEditInteractor::action(Error &err) const return 0; case SET_CHECK_LEVEL: return check_level_strings[d->checkLevel]; + case CONFIRM2: case CONFIRM: return answer(true); case QUIT: diff --git a/lang/cpp/src/gpgsignkeyeditinteractor.h b/lang/cpp/src/gpgsignkeyeditinteractor.h index 47ff8e5..f6cb473 100644 --- a/lang/cpp/src/gpgsignkeyeditinteractor.h +++ b/lang/cpp/src/gpgsignkeyeditinteractor.h @@ -1,6 +1,8 @@ /* gpgsignkeyeditinteractor.h - Edit Interactor to change the owner trust of an OpenPGP key Copyright (C) 2008 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/importresult.cpp b/lang/cpp/src/importresult.cpp index 4329fc0..8c35f9c 100644 --- a/lang/cpp/src/importresult.cpp +++ b/lang/cpp/src/importresult.cpp @@ -1,6 +1,8 @@ /* importresult.cpp - wraps a gpgme import result Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/importresult.h b/lang/cpp/src/importresult.h index adda80a..2f0e7f2 100644 --- a/lang/cpp/src/importresult.h +++ b/lang/cpp/src/importresult.h @@ -1,6 +1,8 @@ /* importresult.h - wraps a gpgme import result Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/interfaces/assuantransaction.h b/lang/cpp/src/interfaces/assuantransaction.h index a382b05..0d0dccc 100644 --- a/lang/cpp/src/interfaces/assuantransaction.h +++ b/lang/cpp/src/interfaces/assuantransaction.h @@ -1,6 +1,8 @@ /* assuantransaction.h - Interface for ASSUAN transactions - Copyright (C) 2009 Klarälvdalens Datakonsult AB <info@kdab.com> + Copyright (C) 2009 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH <info@kdab.com> Author: Marc Mutz <marc@kdab.com> This file is part of GPGME++. diff --git a/lang/cpp/src/interfaces/dataprovider.h b/lang/cpp/src/interfaces/dataprovider.h index 166bb4e..c8f387d 100644 --- a/lang/cpp/src/interfaces/dataprovider.h +++ b/lang/cpp/src/interfaces/dataprovider.h @@ -1,6 +1,8 @@ /* interface/dataprovider.h - Interface for data sources Copyright (C) 2003 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/interfaces/passphraseprovider.h b/lang/cpp/src/interfaces/passphraseprovider.h index 5275e44..c97aa54 100644 --- a/lang/cpp/src/interfaces/passphraseprovider.h +++ b/lang/cpp/src/interfaces/passphraseprovider.h @@ -1,6 +1,8 @@ /* interface/passphraseprovider.h - Interface for passphrase callbacks Copyright (C) 2003,2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/interfaces/progressprovider.h b/lang/cpp/src/interfaces/progressprovider.h index 78bbdd7..ef4ca3c 100644 --- a/lang/cpp/src/interfaces/progressprovider.h +++ b/lang/cpp/src/interfaces/progressprovider.h @@ -1,6 +1,8 @@ /* interface/progressprovider.h - Interface for progress reports Copyright (C) 2003 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/key.cpp b/lang/cpp/src/key.cpp index 31e59e1..66fdea9 100644 --- a/lang/cpp/src/key.cpp +++ b/lang/cpp/src/key.cpp @@ -236,7 +236,18 @@ bool Key::isQualified() const bool Key::isDeVs() const { - return key && key->subkeys && key->subkeys->is_de_vs; + if (!key) { + return false; + } + if (!key->subkeys || !key->subkeys->is_de_vs) { + return false; + } + for (gpgme_sub_key_t subkey = key->subkeys ; subkey ; subkey = subkey->next) { + if (!subkey->is_de_vs) { + return false; + } + } + return true; } const char *Key::issuerSerial() const diff --git a/lang/cpp/src/keygenerationresult.cpp b/lang/cpp/src/keygenerationresult.cpp index 52d5222..ebbb3b9 100644 --- a/lang/cpp/src/keygenerationresult.cpp +++ b/lang/cpp/src/keygenerationresult.cpp @@ -1,6 +1,8 @@ /* keygenerationresult.cpp - wraps a gpgme keygen result Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/keygenerationresult.h b/lang/cpp/src/keygenerationresult.h index c35c504..a92151b 100644 --- a/lang/cpp/src/keygenerationresult.h +++ b/lang/cpp/src/keygenerationresult.h @@ -1,6 +1,8 @@ /* keygenerationresult.h - wraps a gpgme keygen result Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/keylistresult.cpp b/lang/cpp/src/keylistresult.cpp index e6fb77f..6e6b001 100644 --- a/lang/cpp/src/keylistresult.cpp +++ b/lang/cpp/src/keylistresult.cpp @@ -1,6 +1,8 @@ /* keylistresult.cpp - wraps a gpgme keylist result Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/keylistresult.h b/lang/cpp/src/keylistresult.h index 7dfe2d7..d0a8690 100644 --- a/lang/cpp/src/keylistresult.h +++ b/lang/cpp/src/keylistresult.h @@ -1,6 +1,8 @@ /* keylistresult.h - wraps a gpgme keylist result Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/notation.h b/lang/cpp/src/notation.h index 807bdaa..5b89214 100644 --- a/lang/cpp/src/notation.h +++ b/lang/cpp/src/notation.h @@ -1,6 +1,8 @@ /* notation.h - wraps a gpgme verify result Copyright (C) 2004, 2007 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/result.h b/lang/cpp/src/result.h index a86d81f..5ed52a8 100644 --- a/lang/cpp/src/result.h +++ b/lang/cpp/src/result.h @@ -1,6 +1,8 @@ /* result.h - base class for results Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/result_p.h b/lang/cpp/src/result_p.h index 0cf73e4..70c45c4 100644 --- a/lang/cpp/src/result_p.h +++ b/lang/cpp/src/result_p.h @@ -1,6 +1,8 @@ /* result.h - base class for results Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/scdgetinfoassuantransaction.cpp b/lang/cpp/src/scdgetinfoassuantransaction.cpp index fb59bcc..c2fbeed 100644 --- a/lang/cpp/src/scdgetinfoassuantransaction.cpp +++ b/lang/cpp/src/scdgetinfoassuantransaction.cpp @@ -1,6 +1,8 @@ /* scdgetinfoassuantransaction.cpp - Assuan Transaction to get information from scdaemon Copyright (C) 2009 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/scdgetinfoassuantransaction.h b/lang/cpp/src/scdgetinfoassuantransaction.h index a22a0ff..ef80530 100644 --- a/lang/cpp/src/scdgetinfoassuantransaction.h +++ b/lang/cpp/src/scdgetinfoassuantransaction.h @@ -1,6 +1,8 @@ /* scdgetinfoassuantransaction.h - Assuan Transaction to get information from scdaemon Copyright (C) 2009 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/signingresult.cpp b/lang/cpp/src/signingresult.cpp index 3252c03..6a5231f 100644 --- a/lang/cpp/src/signingresult.cpp +++ b/lang/cpp/src/signingresult.cpp @@ -1,6 +1,8 @@ /* signingresult.cpp - wraps a gpgme verify result Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/signingresult.h b/lang/cpp/src/signingresult.h index 2c27454..c6654fc 100644 --- a/lang/cpp/src/signingresult.h +++ b/lang/cpp/src/signingresult.h @@ -1,6 +1,8 @@ /* signingresult.h - wraps a gpgme sign result Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/swdbresult.cpp b/lang/cpp/src/swdbresult.cpp index 3afa8b5..202a107 100644 --- a/lang/cpp/src/swdbresult.cpp +++ b/lang/cpp/src/swdbresult.cpp @@ -1,5 +1,6 @@ /* swdbresult.cpp - wraps gpgme swdb result / query - Copyright (C) 2016 Intevation GmbH + Copyright (C) 2016 by Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/swdbresult.h b/lang/cpp/src/swdbresult.h index e15954d..d13b57c 100644 --- a/lang/cpp/src/swdbresult.h +++ b/lang/cpp/src/swdbresult.h @@ -1,6 +1,7 @@ /* swdbresult.h - wraps a gpgme swdb query / rsult - Copyright (C) 2016 Intevation GmbH + Copyright (C) 2016 by Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. @@ -86,7 +87,7 @@ public: /* The time the online info was retrieved. */ unsigned long retrieved() const; - /* This bit is set if an error occured or some of the information + /* This bit is set if an error occurred or some of the information * in this structure may not be set. */ bool warning() const; diff --git a/lang/cpp/src/tofuinfo.cpp b/lang/cpp/src/tofuinfo.cpp index a10a3cb..f0132f7 100644 --- a/lang/cpp/src/tofuinfo.cpp +++ b/lang/cpp/src/tofuinfo.cpp @@ -1,5 +1,6 @@ /* tofuinfo.cpp - wraps gpgme tofu info - Copyright (C) 2016 Intevation GmbH + Copyright (C) 2016 by Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/tofuinfo.h b/lang/cpp/src/tofuinfo.h index 7165d05..5bb024f 100644 --- a/lang/cpp/src/tofuinfo.h +++ b/lang/cpp/src/tofuinfo.h @@ -1,6 +1,7 @@ /* tofuinfo.h - wraps gpgme tofu info - Copyright (C) 2016 Intevation GmbH + Copyright (C) 2016 by Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/trustitem.cpp b/lang/cpp/src/trustitem.cpp index 0565030..c29c0f4 100644 --- a/lang/cpp/src/trustitem.cpp +++ b/lang/cpp/src/trustitem.cpp @@ -1,6 +1,8 @@ /* trustitem.cpp - wraps a gpgme trust item Copyright (C) 2003 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME. diff --git a/lang/cpp/src/trustitem.h b/lang/cpp/src/trustitem.h index 65f109c..ad2a4a6 100644 --- a/lang/cpp/src/trustitem.h +++ b/lang/cpp/src/trustitem.h @@ -1,6 +1,8 @@ /* trustitem.h - wraps a gpgme trust item Copyright (C) 2003 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME. diff --git a/lang/cpp/src/util.h b/lang/cpp/src/util.h index b0d47e3..4495cc0 100644 --- a/lang/cpp/src/util.h +++ b/lang/cpp/src/util.h @@ -1,6 +1,8 @@ /* util.h - some inline helper functions Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. diff --git a/lang/cpp/src/verificationresult.cpp b/lang/cpp/src/verificationresult.cpp index 42e483c..2c42d07 100644 --- a/lang/cpp/src/verificationresult.cpp +++ b/lang/cpp/src/verificationresult.cpp @@ -1,6 +1,8 @@ /* verificationresult.cpp - wraps a gpgme verify result Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. @@ -276,6 +278,11 @@ bool GpgME::Signature::isVerifiedUsingChainModel() const return !isNull() && d->sigs[idx]->chain_model; } +bool GpgME::Signature::isDeVs() const +{ + return !isNull() && d->sigs[idx]->is_de_vs; +} + GpgME::Signature::PKAStatus GpgME::Signature::pkaStatus() const { if (!isNull()) { @@ -583,6 +590,7 @@ std::ostream &GpgME::operator<<(std::ostream &os, const Signature &sig) << "\n publicKeyAlgorithm: " << protect(sig.publicKeyAlgorithmAsString()) << "\n hashAlgorithm: " << protect(sig.hashAlgorithmAsString()) << "\n policyURL: " << protect(sig.policyURL()) + << "\n isDeVs " << sig.isDeVs() << "\n notations:\n"; const std::vector<Notation> nota = sig.notations(); std::copy(nota.begin(), nota.end(), diff --git a/lang/cpp/src/verificationresult.h b/lang/cpp/src/verificationresult.h index b6d1d8c..3f6299c 100644 --- a/lang/cpp/src/verificationresult.h +++ b/lang/cpp/src/verificationresult.h @@ -1,6 +1,8 @@ /* verificationresult.h - wraps a gpgme verify result Copyright (C) 2004 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH This file is part of GPGME++. @@ -134,6 +136,7 @@ public: } bool isWrongKeyUsage() const; bool isVerifiedUsingChainModel() const; + bool isDeVs() const; enum PKAStatus { UnknownPKAStatus, PKAVerificationFailed, PKAVerificationSucceeded diff --git a/lang/cpp/src/vfsmountresult.cpp b/lang/cpp/src/vfsmountresult.cpp index d3607d1..60faa38 100644 --- a/lang/cpp/src/vfsmountresult.cpp +++ b/lang/cpp/src/vfsmountresult.cpp @@ -1,6 +1,8 @@ /* vfsmountresult.cpp - wraps a gpgme vfs mount result - Copyright (C) 2009 Klarälvdalens Datakonsult AB <info@kdab.com> + Copyright (C) 2009 Klarälvdalens Datakonsult AB + 2016 Bundesamt für Sicherheit in der Informationstechnik + Software engineering by Intevation GmbH <info@kdab.com> Author: Marc Mutz <marc@kdab.com>, Volker Krause <volker@kdab.com> This file is part of GPGME++. |