Page MenuHome GnuPG
Files F37955185

No OneTemporary
Actions

View Options

diff --git a/src/importresult.cpp b/src/importresult.cpp
index 8c35f9cc..dbb31d05 100644
--- a/src/importresult.cpp
+++ b/src/importresult.cpp
@@ -1,221 +1,226 @@
/*
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++.
GPGME++ is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
GPGME++ is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with GPGME++; see the file COPYING.LIB. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <importresult.h>
#include "result_p.h"
#include <gpgme.h>
#include <cstdlib>
#include <cstring>
#include <string.h>
class GpgME::ImportResult::Private
{
public:
Private(const _gpgme_op_import_result &r) : res(r)
{
// copy recursively, using compiler-generated copy ctor.
// We just need to handle the pointers in the structs:
for (gpgme_import_status_t is = r.imports ; is ; is = is->next) {
gpgme_import_status_t copy = new _gpgme_import_status(*is);
copy->fpr = strdup(is->fpr);
copy->next = 0;
imports.push_back(copy);
}
res.imports = 0;
}
~Private()
{
for (std::vector<gpgme_import_status_t>::iterator it = imports.begin() ; it != imports.end() ; ++it) {
std::free((*it)->fpr);
delete *it; *it = 0;
}
}
_gpgme_op_import_result res;
std::vector<gpgme_import_status_t> imports;
};
GpgME::ImportResult::ImportResult(gpgme_ctx_t ctx, int error)
: GpgME::Result(error), d()
{
init(ctx);
}
GpgME::ImportResult::ImportResult(gpgme_ctx_t ctx, const Error &error)
: GpgME::Result(error), d()
{
init(ctx);
}
void GpgME::ImportResult::init(gpgme_ctx_t ctx)
{
if (!ctx) {
return;
}
gpgme_import_result_t res = gpgme_op_import_result(ctx);
if (!res) {
return;
}
d.reset(new Private(*res));
}
make_standard_stuff(ImportResult)
int GpgME::ImportResult::numConsidered() const
{
return d ? d->res.considered : 0 ;
}
int GpgME::ImportResult::numKeysWithoutUserID() const
{
return d ? d->res.no_user_id : 0 ;
}
int GpgME::ImportResult::numImported() const
{
return d ? d->res.imported : 0 ;
}
int GpgME::ImportResult::numRSAImported() const
{
return d ? d->res.imported_rsa : 0 ;
}
int GpgME::ImportResult::numUnchanged() const
{
return d ? d->res.unchanged : 0 ;
}
int GpgME::ImportResult::newUserIDs() const
{
return d ? d->res.new_user_ids : 0 ;
}
int GpgME::ImportResult::newSubkeys() const
{
return d ? d->res.new_sub_keys : 0 ;
}
int GpgME::ImportResult::newSignatures() const
{
return d ? d->res.new_signatures : 0 ;
}
int GpgME::ImportResult::newRevocations() const
{
return d ? d->res.new_revocations : 0 ;
}
int GpgME::ImportResult::numSecretKeysConsidered() const
{
return d ? d->res.secret_read : 0 ;
}
int GpgME::ImportResult::numSecretKeysImported() const
{
return d ? d->res.secret_imported : 0 ;
}
int GpgME::ImportResult::numSecretKeysUnchanged() const
{
return d ? d->res.secret_unchanged : 0 ;
}
int GpgME::ImportResult::notImported() const
{
return d ? d->res.not_imported : 0 ;
}
+int GpgME::ImportResult::numV3KeysSkipped() const
+{
+ return d ? d->res.skipped_v3_keys : 0 ;
+}
+
GpgME::Import GpgME::ImportResult::import(unsigned int idx) const
{
return Import(d, idx);
}
std::vector<GpgME::Import> GpgME::ImportResult::imports() const
{
if (!d) {
return std::vector<Import>();
}
std::vector<Import> result;
result.reserve(d->imports.size());
for (unsigned int i = 0 ; i < d->imports.size() ; ++i) {
result.push_back(Import(d, i));
}
return result;
}
GpgME::Import::Import(const std::shared_ptr<ImportResult::Private> &parent, unsigned int i)
: d(parent), idx(i)
{
}
GpgME::Import::Import() : d(), idx(0) {}
bool GpgME::Import::isNull() const
{
return !d || idx >= d->imports.size() ;
}
const char *GpgME::Import::fingerprint() const
{
return isNull() ? 0 : d->imports[idx]->fpr ;
}
GpgME::Error GpgME::Import::error() const
{
return Error(isNull() ? 0 : d->imports[idx]->result);
}
GpgME::Import::Status GpgME::Import::status() const
{
if (isNull()) {
return Unknown;
}
const unsigned int s = d->imports[idx]->status;
unsigned int result = Unknown;
if (s & GPGME_IMPORT_NEW) {
result |= NewKey;
}
if (s & GPGME_IMPORT_UID) {
result |= NewUserIDs;
}
if (s & GPGME_IMPORT_SIG) {
result |= NewSignatures;
}
if (s & GPGME_IMPORT_SUBKEY) {
result |= NewSubkeys;
}
if (s & GPGME_IMPORT_SECRET) {
result |= ContainedSecretKey;
}
return static_cast<Status>(result);
}
diff --git a/src/importresult.h b/src/importresult.h
index 2f0e7f20..05476796 100644
--- a/src/importresult.h
+++ b/src/importresult.h
@@ -1,136 +1,137 @@
/*
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++.
GPGME++ is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
GPGME++ is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with GPGME++; see the file COPYING.LIB. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#ifndef __GPGMEPP_IMPORTRESULT_H__
#define __GPGMEPP_IMPORTRESULT_H__
#include "gpgmefw.h"
#include "result.h"
#include "gpgmepp_export.h"
#include <memory>
#include <vector>
namespace GpgME
{
class Error;
class Import;
class GPGMEPP_EXPORT ImportResult : public Result
{
public:
ImportResult();
ImportResult(gpgme_ctx_t ctx, int error);
ImportResult(gpgme_ctx_t ctx, const Error &error);
explicit ImportResult(const Error &error);
const ImportResult &operator=(ImportResult other)
{
swap(other);
return *this;
}
void swap(ImportResult &other)
{
Result::swap(other);
using std::swap;
swap(this->d, other.d);
}
bool isNull() const;
int numConsidered() const;
int numKeysWithoutUserID() const;
int numImported() const;
int numRSAImported() const;
int numUnchanged() const;
int newUserIDs() const;
int newSubkeys() const;
int newSignatures() const;
int newRevocations() const;
int numSecretKeysConsidered() const;
int numSecretKeysImported() const;
int numSecretKeysUnchanged() const;
int notImported() const;
+ int numV3KeysSkipped() const;
Import import(unsigned int idx) const;
std::vector<Import> imports() const;
class Private;
private:
void init(gpgme_ctx_t ctx);
std::shared_ptr<Private> d;
};
class GPGMEPP_EXPORT Import
{
friend class ::GpgME::ImportResult;
Import(const std::shared_ptr<ImportResult::Private> &parent, unsigned int idx);
public:
Import();
const Import &operator=(Import other)
{
swap(other);
return *this;
}
void swap(Import &other)
{
using std::swap;
swap(this->d, other.d);
swap(this->idx, other.idx);
}
bool isNull() const;
const char *fingerprint() const;
Error error() const;
enum Status {
Unknown = 0x0,
NewKey = 0x1,
NewUserIDs = 0x2,
NewSignatures = 0x4,
NewSubkeys = 0x8,
ContainedSecretKey = 0x10
};
Status status() const;
private:
std::shared_ptr<ImportResult::Private> d;
unsigned int idx;
};
}
GPGMEPP_MAKE_STD_SWAP_SPECIALIZATION(ImportResult)
GPGMEPP_MAKE_STD_SWAP_SPECIALIZATION(Import)
#endif // __GPGMEPP_IMPORTRESULT_H__

File Metadata

Mime Type
text/x-diff
Expires
Thu, Mar 19, 6:10 PM (1 d, 2 h)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
86/2d/18d4b0164debe537927df32e376c

Event Timeline