From 9e37522bddc7c5a048aca7fc60153b6f10ce8f44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 13 Sep 2014 19:05:53 +0200 Subject: Get certificates by raw user ids, be more liberal about accepted user id encodings --- .../sufficientlysecure/keychain/pgp/WrappedSignature.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedSignature.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedSignature.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedSignature.java index f24259ba7..4d4c0e5d1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedSignature.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedSignature.java @@ -187,8 +187,16 @@ public class WrappedSignature { } } - public boolean verifySignature(UncachedPublicKey key, String uid) throws PgpGeneralException { - return verifySignature(key.getPublicKey(), uid); + boolean verifySignature(PGPPublicKey key, byte[] rawUserId) throws PgpGeneralException { + try { + return mSig.verifyCertification(rawUserId, key); + } catch (PGPException e) { + throw new PgpGeneralException("Error!", e); + } + } + + public boolean verifySignature(UncachedPublicKey key, byte[] rawUserId) throws PgpGeneralException { + return verifySignature(key.getPublicKey(), rawUserId); } public boolean verifySignature(CanonicalizedPublicKey key, String uid) throws PgpGeneralException { return verifySignature(key.getPublicKey(), uid); -- cgit v1.2.3