diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-14 19:25:43 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-14 19:25:43 +0200 |
| commit | 750ced4525463d3cdcd4aa2530bd3e088cc7dcc0 (patch) | |
| tree | 85935df171a0e8a8ed5f88f7fcf58d7747f2567b /OpenKeychain/src | |
| parent | 0f60bcbc3d2438a8822e9bc1c6d80f8d0b743e3d (diff) | |
| parent | 621978a7f501197d7f662c657f4bd6813391bab0 (diff) | |
| download | open-keychain-750ced4525463d3cdcd4aa2530bd3e088cc7dcc0.tar.gz open-keychain-750ced4525463d3cdcd4aa2530bd3e088cc7dcc0.tar.bz2 open-keychain-750ced4525463d3cdcd4aa2530bd3e088cc7dcc0.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java index bb692555e..fe84b3802 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java @@ -543,7 +543,8 @@ public class PgpKeyOperation { PGPPublicKey pKey = sKey.getPublicKey(); // expiry must not be in the past - if (change.mExpiry != null && new Date(change.mExpiry*1000).before(new Date())) { + if (change.mExpiry != null && change.mExpiry != 0 && + new Date(change.mExpiry*1000).before(new Date())) { log.add(LogLevel.ERROR, LogType.MSG_MF_SUBKEY_PAST_EXPIRY, indent + 1, PgpKeyHelper.convertKeyIdToHex(change.mKeyId)); return new EditKeyResult(EditKeyResult.RESULT_ERROR, log, null); |