moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-15 13:25:06 -05:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dominik Schürmann 2015-03-15 19:35:12 +01:00
commit d824ec3bc9
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java
View File

@ -536,6 +536,12 @@ public class PgpKeyOperationTest {
expiry, modified.getPublicKey(keyId).getUnsafeExpiryTimeForTesting().getTime() / 1000); expiry, modified.getPublicKey(keyId).getUnsafeExpiryTimeForTesting().getTime() / 1000);
Assert.assertEquals("modified key must have same flags as before", Assert.assertEquals("modified key must have same flags as before",
ring.getPublicKey(keyId).getKeyUsage(), modified.getPublicKey(keyId).getKeyUsage()); ring.getPublicKey(keyId).getKeyUsage(), modified.getPublicKey(keyId).getKeyUsage());
Date date = modified.canonicalize(new OperationLog(), 0).getPublicKey().getExpiryTime();
Assert.assertNotNull("modified key must have an expiry date", date);
Assert.assertEquals("modified key must have expected expiry date",
expiry, date.getTime() / 1000);
} }
{ {

19
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedPublicKey.java
View File

@ -126,27 +126,28 @@ public class CanonicalizedPublicKey extends UncachedPublicKey {
// the getValidSeconds method is unreliable for master keys. we need to iterate all // the getValidSeconds method is unreliable for master keys. we need to iterate all
// user ids, then use the most recent certification from a non-revoked user id // user ids, then use the most recent certification from a non-revoked user id
if (isMasterKey()) { if (isMasterKey()) {
Date latestCreation = null;
seconds = 0; seconds = 0;
long masterKeyId = getKeyId();
Date latestCreation = null;
for (byte[] rawUserId : getUnorderedRawUserIds()) { for (byte[] rawUserId : getUnorderedRawUserIds()) {
Iterator<WrappedSignature> sigs = getSignaturesForRawId(rawUserId); Iterator<WrappedSignature> sigs = getSignaturesForRawId(rawUserId);
while (sigs.hasNext()) {
// there is always a certification, so this call is safe
WrappedSignature sig = sigs.next(); WrappedSignature sig = sigs.next();
if (sig.getKeyId() != masterKeyId) {
// we know a user id has at most two sigs: one certification, one revocation. continue;
// if the sig is a revocation, or there is another sig (which is a revocation), }
// the data in this uid is not relevant if (sig.isRevocation()) {
if (sig.isRevocation() || sigs.hasNext()) {
continue; continue;
} }
// this is our revocation, UNLESS there is a newer certificate!
if (latestCreation == null || latestCreation.before(sig.getCreationTime())) { if (latestCreation == null || latestCreation.before(sig.getCreationTime())) {
latestCreation = sig.getCreationTime(); latestCreation = sig.getCreationTime();
seconds = sig.getKeyExpirySeconds(); seconds = sig.getKeyExpirySeconds();
} }
}
} }
} else { } else {
seconds = mPublicKey.getValidSeconds(); seconds = mPublicKey.getValidSeconds();