From 80498ab662238a31325e78c0037ea6752f680a37 Mon Sep 17 00:00:00 2001
From: Andre Heinecke <aheinecke@intevation.de>
Date: Mon, 4 Jul 2016 11:31:01 +0200
Subject: [PATCH] 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 4bd1a7b1..3eb8a850 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 5a2927f9..f5fbc2ec 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;