From 37cb5c4c78880b5b4737cffdaa4ead76506a3843 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 2 Oct 2014 19:23:08 +0200 Subject: make getSignId a secret key operation, and respect unavailable keys This one should remedy #811, but waiting for a test --- .../keychain/pgp/CanonicalizedKeyRing.java | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java index 554899843..f43cbbeef 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java @@ -78,7 +78,7 @@ public abstract class CanonicalizedKeyRing extends KeyRing { public long getEncryptId() throws PgpGeneralException { for(CanonicalizedPublicKey key : publicKeyIterator()) { - if(key.canEncrypt()) { + if (key.canEncrypt() && key.isValid()) { return key.getKeyId(); } } @@ -94,24 +94,6 @@ public abstract class CanonicalizedKeyRing extends KeyRing { } } - public long getSignId() throws PgpGeneralException { - for(CanonicalizedPublicKey key : publicKeyIterator()) { - if(key.canSign()) { - return key.getKeyId(); - } - } - throw new PgpGeneralException("No valid signing key found!"); - } - - public boolean hasSign() throws PgpGeneralException { - try { - getSignId(); - return true; - } catch (PgpGeneralException e) { - return false; - } - } - public void encode(OutputStream stream) throws IOException { getRing().encode(stream); } -- cgit v1.2.3