From e9f427084d30904d1880eca44707752e059effc6 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Tue, 21 Apr 2020 19:52:05 +0200 Subject: [PATCH] Bump pgpainless to 0.0.1-alpha11 and depend on bcprov in tests --- smack-openpgp/build.gradle | 4 +++- .../jivesoftware/smackx/ox/PainlessOpenPgpProviderTest.java | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/smack-openpgp/build.gradle b/smack-openpgp/build.gradle index 665f141d2..9ca9dc3fc 100644 --- a/smack-openpgp/build.gradle +++ b/smack-openpgp/build.gradle @@ -8,7 +8,9 @@ dependencies { compile project(':smack-extensions') compile project(':smack-experimental') - compile 'org.pgpainless:pgpainless-core:0.0.1-alpha7' + api 'org.pgpainless:pgpainless-core:0.0.1-alpha11' + + testImplementation "org.bouncycastle:bcprov-jdk15on:1.65" testCompile project(path: ":smack-core", configuration: "testRuntime") testCompile group: 'commons-io', name: 'commons-io', version: "$commonsIoVersion" diff --git a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PainlessOpenPgpProviderTest.java b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PainlessOpenPgpProviderTest.java index 34b0c564b..0a2c6de53 100644 --- a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PainlessOpenPgpProviderTest.java +++ b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PainlessOpenPgpProviderTest.java @@ -138,7 +138,7 @@ public class PainlessOpenPgpProviderTest extends SmackTestSuite { OpenPgpV4Fingerprint decryptionFingerprint = decrypted.getMetadata().getDecryptionFingerprint(); assertTrue(bobSelf.getSecretKeys().contains(decryptionFingerprint.getKeyId())); - assertTrue(decrypted.getMetadata().getVerifiedSignaturesFingerprints().contains(aliceFingerprint)); + assertTrue(decrypted.getMetadata().getVerifiedSignatureKeyFingerprints().contains(aliceFingerprint)); assertEquals(OpenPgpMessage.State.signcrypt, decrypted.getState()); SigncryptElement decryptedSignCrypt = (SigncryptElement) decrypted.getOpenPgpContentElement(); @@ -158,7 +158,7 @@ public class PainlessOpenPgpProviderTest extends SmackTestSuite { decryptionFingerprint = decrypted.getMetadata().getDecryptionFingerprint(); assertTrue(bobSelf.getSecretKeys().contains(decryptionFingerprint.getKeyId())); - assertTrue(decrypted.getMetadata().getVerifiedSignaturesFingerprints().isEmpty()); + assertTrue(decrypted.getMetadata().getVerifiedSignatureKeyFingerprints().isEmpty()); assertEquals(OpenPgpMessage.State.crypt, decrypted.getState()); CryptElement decryptedCrypt = (CryptElement) decrypted.getOpenPgpContentElement(); @@ -177,7 +177,7 @@ public class PainlessOpenPgpProviderTest extends SmackTestSuite { decrypted = bobProvider.decryptAndOrVerify(encrypted.getElement(), bobSelf, aliceForBob); assertNull(decrypted.getMetadata().getDecryptionFingerprint()); - assertTrue(decrypted.getMetadata().getVerifiedSignaturesFingerprints().contains(aliceFingerprint)); + assertTrue(decrypted.getMetadata().getVerifiedSignatureKeyFingerprints().contains(aliceFingerprint)); assertEquals(OpenPgpMessage.State.sign, decrypted.getState()); SignElement decryptedSign = (SignElement) decrypted.getOpenPgpContentElement();