aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-08-31 23:39:56 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-08-31 23:39:56 +0200
commite0be0f648ade84a83c7561c0521853447ca8b3da (patch)
tree3f10d083759b8064f33862caaa16e9e6228b8f31 /src
parent1d0eeef047c4938f4e25bc06f7e92e83aa46a4c4 (diff)
Add SIGNATURE_KEY_REVOKED, SIGNATURE_KEY_EXPIRED, rename SIGNATURE_PUB_KEY_UNKNOWN
Diffstat (limited to 'src')
-rw-r--r--src/org/openintents/openpgp/OpenPgpSignatureResult.java12
-rw-r--r--src/org/openintents/openpgp/util/OpenPgpApi.java6
2 files changed, 12 insertions, 6 deletions
diff --git a/src/org/openintents/openpgp/OpenPgpSignatureResult.java b/src/org/openintents/openpgp/OpenPgpSignatureResult.java
index 7a4d799d..23401a1d 100644
--- a/src/org/openintents/openpgp/OpenPgpSignatureResult.java
+++ b/src/org/openintents/openpgp/OpenPgpSignatureResult.java
@@ -37,12 +37,16 @@ public class OpenPgpSignatureResult implements Parcelable {
// generic error on signature verification
public static final int SIGNATURE_ERROR = 0;
- // successfully verified signature, with certified public key
+ // successfully verified signature, with certified key
public static final int SIGNATURE_SUCCESS_CERTIFIED = 1;
- // no public key was found for this signature verification
- public static final int SIGNATURE_UNKNOWN_PUB_KEY = 2;
- // successfully verified signature, but with uncertified public key
+ // no key was found for this signature verification
+ public static final int SIGNATURE_KEY_MISSING = 2;
+ // successfully verified signature, but with uncertified key
public static final int SIGNATURE_SUCCESS_UNCERTIFIED = 3;
+ // key has been revoked
+ public static final int SIGNATURE_KEY_REVOKED = 4;
+ // key is expired
+ public static final int SIGNATURE_KEY_EXPIRED = 5;
int status;
boolean signatureOnly;
diff --git a/src/org/openintents/openpgp/util/OpenPgpApi.java b/src/org/openintents/openpgp/util/OpenPgpApi.java
index 485d3710..a248a0e2 100644
--- a/src/org/openintents/openpgp/util/OpenPgpApi.java
+++ b/src/org/openintents/openpgp/util/OpenPgpApi.java
@@ -47,8 +47,10 @@ public class OpenPgpApi {
* - No changes to existing methods -> backward compatible
* - Introduction of ACTION_DECRYPT_METADATA, RESULT_METADATA, EXTRA_ORIGINAL_FILENAME, and OpenPgpMetadata parcel
* - Introduction of internal NFC extras: EXTRA_NFC_SIGNED_HASH, EXTRA_NFC_SIG_CREATION_TIMESTAMP
+ * 5:
+ * - OpenPgpSignatureResult: new SIGNATURE_KEY_REVOKED and SIGNATURE_KEY_EXPIRED
*/
- public static final int API_VERSION = 4;
+ public static final int API_VERSION = 5;
/**
* General extras
@@ -106,7 +108,7 @@ public class OpenPgpApi {
* Decrypts and verifies given input stream. This methods handles encrypted-only, signed-and-encrypted,
* and also signed-only input.
* <p/>
- * If OpenPgpSignatureResult.getStatus() == OpenPgpSignatureResult.SIGNATURE_UNKNOWN_PUB_KEY
+ * If OpenPgpSignatureResult.getStatus() == OpenPgpSignatureResult.SIGNATURE_KEY_MISSING
* in addition a PendingIntent is returned via RESULT_INTENT to download missing keys.
* <p/>
* optional extras: