From 05968533a5b64005a38702b7e2fdf787c59265ba Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Tue, 18 Apr 2023 18:35:47 +0200
Subject: [PATCH] InlineVerifyImpl: Export signature mode in Verification
 result

---
 .../RoundTripInlineSignInlineVerifyCmdTest.java |  2 +-
 .../org/pgpainless/sop/InlineVerifyImpl.java    | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/pgpainless-cli/src/test/java/org/pgpainless/cli/commands/RoundTripInlineSignInlineVerifyCmdTest.java b/pgpainless-cli/src/test/java/org/pgpainless/cli/commands/RoundTripInlineSignInlineVerifyCmdTest.java
index d36ee58f..0676f213 100644
--- a/pgpainless-cli/src/test/java/org/pgpainless/cli/commands/RoundTripInlineSignInlineVerifyCmdTest.java
+++ b/pgpainless-cli/src/test/java/org/pgpainless/cli/commands/RoundTripInlineSignInlineVerifyCmdTest.java
@@ -409,7 +409,7 @@ public class RoundTripInlineSignInlineVerifyCmdTest extends CLITest {
         assertEquals("Hello, World!\n", out.toString());
         String ver = readStringFromFile(verifications);
         assertEquals(
-                "2022-11-18T14:55:33Z 7A073EDF273C902796D259528FBDD36D01831673 AEA0FD2C899D3FC077815F0026560D2AE53DB86F\n", ver);
+                "2022-11-18T14:55:33Z 7A073EDF273C902796D259528FBDD36D01831673 AEA0FD2C899D3FC077815F0026560D2AE53DB86F mode:binary\n", ver);
     }
 
     @Test
diff --git a/pgpainless-sop/src/main/java/org/pgpainless/sop/InlineVerifyImpl.java b/pgpainless-sop/src/main/java/org/pgpainless/sop/InlineVerifyImpl.java
index 7665a7bb..eea5ebfb 100644
--- a/pgpainless-sop/src/main/java/org/pgpainless/sop/InlineVerifyImpl.java
+++ b/pgpainless-sop/src/main/java/org/pgpainless/sop/InlineVerifyImpl.java
@@ -13,6 +13,7 @@ import java.util.List;
 
 import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
+import org.bouncycastle.openpgp.PGPSignature;
 import org.bouncycastle.util.io.Streams;
 import org.pgpainless.PGPainless;
 import org.pgpainless.decryption_verification.ConsumerOptions;
@@ -23,6 +24,7 @@ import org.pgpainless.exception.MalformedOpenPgpMessageException;
 import org.pgpainless.exception.MissingDecryptionMethodException;
 import sop.ReadyWithResult;
 import sop.Verification;
+import sop.enums.SignatureMode;
 import sop.exception.SOPGPException;
 import sop.operation.InlineVerify;
 
@@ -96,6 +98,19 @@ public class InlineVerifyImpl implements InlineVerify {
     private Verification map(SignatureVerification sigVerification) {
         return new Verification(sigVerification.getSignature().getCreationTime(),
                 sigVerification.getSigningKey().getSubkeyFingerprint().toString(),
-                sigVerification.getSigningKey().getPrimaryKeyFingerprint().toString());
+                sigVerification.getSigningKey().getPrimaryKeyFingerprint().toString(),
+                getMode(sigVerification.getSignature()),
+                null);
+    }
+
+    private static SignatureMode getMode(PGPSignature signature) {
+        if (signature.getSignatureType() == PGPSignature.BINARY_DOCUMENT) {
+            return SignatureMode.binary;
+        }
+        if (signature.getSignatureType() == PGPSignature.CANONICAL_TEXT_DOCUMENT) {
+            return SignatureMode.text;
+        }
+
+        return null;
     }
 }