From 9bfaf674b18629776abeae28ce45e059c6c62e93 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Sat, 24 Jun 2023 11:10:10 +0200 Subject: [PATCH 1/2] Bump BC to 1.73 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index eda9ed85c..992de41c6 100644 --- a/build.gradle +++ b/build.gradle @@ -148,7 +148,7 @@ allprojects { smackMinAndroidSdk = 19 junitVersion = '5.7.1' commonsIoVersion = '2.6' - bouncyCastleVersion = '1.71' + bouncyCastleVersion = '1.73' guavaVersion = '30.1-jre' mockitoVersion = '3.7.7' orgReflectionsVersion = '0.9.11' From 430795bb9ef17e5e426a97871d7acf4fcbd5a014 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Sat, 24 Jun 2023 11:10:24 +0200 Subject: [PATCH 2/2] Bump PGPainless to 1.5.3 --- smack-openpgp/build.gradle | 2 +- .../jivesoftware/smackx/ox/crypto/PainlessOpenPgpProvider.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/smack-openpgp/build.gradle b/smack-openpgp/build.gradle index cde598465..65484bde3 100644 --- a/smack-openpgp/build.gradle +++ b/smack-openpgp/build.gradle @@ -8,7 +8,7 @@ dependencies { api project(':smack-extensions') api project(':smack-experimental') - api 'org.pgpainless:pgpainless-core:1.3.1' + api 'org.pgpainless:pgpainless-core:1.5.3' testImplementation "org.bouncycastle:bcprov-jdk18on:${bouncyCastleVersion}" diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/crypto/PainlessOpenPgpProvider.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/crypto/PainlessOpenPgpProvider.java index 2fa3bbe77..304e3e006 100644 --- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/crypto/PainlessOpenPgpProvider.java +++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/crypto/PainlessOpenPgpProvider.java @@ -220,7 +220,7 @@ public class PainlessOpenPgpProvider implements OpenPgpProvider { cipherStream.close(); plainText.close(); - OpenPgpMetadata info = cipherStream.getResult(); + OpenPgpMetadata info = cipherStream.getMetadata().toLegacyMetadata(); OpenPgpMessage.State state; if (info.isSigned()) {