From b84c9a8fb6b14b219bf6daf6240d3b89e7d4bfca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 22 Dec 2015 13:31:55 +0100 Subject: Update spongycastle to 1.53 --- .../java/org/sufficientlysecure/keychain/pgp/WrappedSignature.java | 5 +++-- 1 file changed, 3 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 c6fad1a73..65604f58f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedSignature.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedSignature.java @@ -30,6 +30,7 @@ import org.spongycastle.openpgp.PGPPublicKey; import org.spongycastle.openpgp.PGPSignature; import org.spongycastle.openpgp.PGPSignatureList; import org.spongycastle.openpgp.PGPUserAttributeSubpacketVector; +import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; @@ -131,7 +132,7 @@ public class WrappedSignature { SignatureSubpacketTags.REVOCATION_REASON); // For some reason, this is missing in SignatureSubpacketInputStream:146 if (!(p instanceof RevocationReason)) { - p = new RevocationReason(false, p.getData()); + p = new RevocationReason(false, false, p.getData()); } return ((RevocationReason) p).getRevocationDescription(); } @@ -222,7 +223,7 @@ public class WrappedSignature { } public static WrappedSignature fromBytes(byte[] data) { - PGPObjectFactory factory = new PGPObjectFactory(data); + PGPObjectFactory factory = new PGPObjectFactory(data, new JcaKeyFingerprintCalculator()); PGPSignatureList signatures = null; try { if ((signatures = (PGPSignatureList) factory.nextObject()) == null || signatures.isEmpty()) { -- cgit v1.2.3