Merge branch 'master' of github.com:open-keychain/open-keychain

1 files changed, 10 insertions, 0 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java
index 12b091e32..c4f66b950 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java
@@ -27,6 +27,9 @@ public class PgpSignEncryptResult extends InputPendingResult {
 
     byte[] mDetachedSignature;
     public long mOperationTime;
+    // this is the micalg parameter used in PGP/MIME, see RFC3156:
+    // https://tools.ietf.org/html/rfc3156#section-5
+    private String mMicAlgDigestName;
 
     public void setDetachedSignature(byte[] detachedSignature) {
         mDetachedSignature = detachedSignature;
@@ -74,4 +77,11 @@ public class PgpSignEncryptResult extends InputPendingResult {
         }
     };
 
+    public void setMicAlgDigestName(String micAlgDigestName) {
+        mMicAlgDigestName = micAlgDigestName;
+    }
+
+    public String getMicAlgDigestName() {
+        return mMicAlgDigestName;
+    }
 }