cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update OpenPgpSignatureResult to version 4, support signatureTimestamp

Browse Source
This commit is contained in:
Vincent Breitmoser
2016-11-17 10:46:05 +01:00
parent 52b1016baa
commit 8092896f41
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java
View File

@@ -19,6 +19,7 @@ package org.sufficientlysecure.keychain.pgp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import org.openintents.openpgp.OpenPgpSignatureResult; import org.openintents.openpgp.OpenPgpSignatureResult;
import org.openintents.openpgp.OpenPgpSignatureResult.SenderStatusResult; import org.openintents.openpgp.OpenPgpSignatureResult.SenderStatusResult;
@@ -54,6 +55,7 @@ public class OpenPgpSignatureResultBuilder {
private boolean mIsKeyExpired = false; private boolean mIsKeyExpired = false;
private boolean mInsecure = false; private boolean mInsecure = false;
private String mSenderAddress; private String mSenderAddress;
private Date mSignatureTimestamp;
public OpenPgpSignatureResultBuilder(ProviderHelper providerHelper) { public OpenPgpSignatureResultBuilder(ProviderHelper providerHelper) {
this.mProviderHelper = providerHelper; this.mProviderHelper = providerHelper;
@@ -67,6 +69,10 @@ public class OpenPgpSignatureResultBuilder {
this.mKeyId = keyId; this.mKeyId = keyId;
} }
public void setSignatureTimestamp(Date signatureTimestamp) {
mSignatureTimestamp = signatureTimestamp;
}
public void setKnownKey(boolean knownKey) { public void setKnownKey(boolean knownKey) {
this.mKnownKey = knownKey; this.mKnownKey = knownKey;
} }
@@ -163,7 +169,7 @@ public class OpenPgpSignatureResultBuilder {
if (!mKnownKey) { if (!mKnownKey) {
Log.d(Constants.TAG, "RESULT_KEY_MISSING"); Log.d(Constants.TAG, "RESULT_KEY_MISSING");
return OpenPgpSignatureResult.createWithKeyMissing(mKeyId); return OpenPgpSignatureResult.createWithKeyMissing(mKeyId, mSignatureTimestamp);
} }
if (!mValidSignature) { if (!mValidSignature) {
@@ -190,7 +196,7 @@ public class OpenPgpSignatureResultBuilder {
} }
return OpenPgpSignatureResult.createWithValidSignature( return OpenPgpSignatureResult.createWithValidSignature(
signatureStatus, mPrimaryUserId, mKeyId, mUserIds, mConfirmedUserIds, mSenderStatusResult); signatureStatus, mPrimaryUserId, mKeyId, mUserIds, mConfirmedUserIds, mSenderStatusResult, mSignatureTimestamp);
} }
public void setSenderAddress(String senderAddress) { public void setSenderAddress(String senderAddress) {

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignatureChecker.java
View File

@@ -237,6 +237,7 @@ class PgpSignatureChecker {
signatureResultBuilder.setInsecure(true); signatureResultBuilder.setInsecure(true);
} }
signatureResultBuilder.setSignatureTimestamp(signature.getCreationTime());
signatureResultBuilder.setValidSignature(validSignature); signatureResultBuilder.setValidSignature(validSignature);
} }
@@ -271,6 +272,7 @@ class PgpSignatureChecker {
signatureResultBuilder.setInsecure(true); signatureResultBuilder.setInsecure(true);
} }
signatureResultBuilder.setSignatureTimestamp(messageSignature.getCreationTime());
signatureResultBuilder.setValidSignature(validSignature); signatureResultBuilder.setValidSignature(validSignature);
return true; return true;

2
extern/openpgp-api-lib vendored

Submodule extern/openpgp-api-lib updated: 9fac21e1b5...d0af1b5bae