[Pkg-gnupg-commit] [gpgme] 193/412: Cpp: Add support for TOFU_CONFLICT sigsum

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gpgme.

commit 80498ab662238a31325e78c0037ea6752f680a37
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Jul 4 11:31:01 2016 +0200

    Cpp: Add support for TOFU_CONFLICT sigsum
    
    * lang/cpp/src/verificationresult.cpp (GpgME::Signature::Summary):
    Handle TOFU_CONFLICT.
    * lang/cpp/src/verificationresult.h (Summary): Add TofuConflict.
---
 lang/cpp/src/verificationresult.cpp | 4 ++++
 lang/cpp/src/verificationresult.h   | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lang/cpp/src/verificationresult.cpp b/lang/cpp/src/verificationresult.cpp
index 4bd1a7b..3eb8a85 100644
--- a/lang/cpp/src/verificationresult.cpp
+++ b/lang/cpp/src/verificationresult.cpp
@@ -224,6 +224,9 @@ GpgME::Signature::Summary GpgME::Signature::summary() const
     if (sigsum & GPGME_SIGSUM_SYS_ERROR) {
         result |= SysError;
     }
+    if (sigsum & GPGME_SIGSUM_TOFU_CONFLICT) {
+        result |= TofuConflict;
+    }
     return static_cast<Summary>(result);
 }
 
@@ -520,6 +523,7 @@ std::ostream &GpgME::operator<<(std::ostream &os, Signature::Summary summary)
     OUTPUT(CrlTooOld);
     OUTPUT(BadPolicy);
     OUTPUT(SysError);
+    OUTPUT(TofuConflict);
 #undef OUTPUT
     return os << ')';
 }
diff --git a/lang/cpp/src/verificationresult.h b/lang/cpp/src/verificationresult.h
index 5a2927f..f5fbc2e 100644
--- a/lang/cpp/src/verificationresult.h
+++ b/lang/cpp/src/verificationresult.h
@@ -115,7 +115,8 @@ public:
         CrlMissing = 0x080,
         CrlTooOld  = 0x100,
         BadPolicy  = 0x200,
-        SysError   = 0x400
+        SysError   = 0x400,
+        TofuConflict= 0x800
     };
     Summary summary() const;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git