vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-25 12:08:00 +01:00
Code Issues Releases Wiki Activity

Merge pull request #534 from vanitasvitae/bumpPGPainless

Browse source 
Bump pgpainless-core to 1.3.1
This commit is contained in:
Florian Schmaus 2022-07-31 10:02:59 +02:00 committed by GitHub
commit ccf60b018e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
smack-openpgp/build.gradle
View file

@ -8,7 +8,7 @@ dependencies {
api project(':smack-extensions') api project(':smack-extensions')
api project(':smack-experimental') api project(':smack-experimental')
api 'org.pgpainless:pgpainless-core:1.1.1' api 'org.pgpainless:pgpainless-core:1.3.1'
testImplementation "org.bouncycastle:bcprov-jdk15on:${bouncyCastleVersion}" testImplementation "org.bouncycastle:bcprov-jdk15on:${bouncyCastleVersion}"

4
smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/element/OpenPgpElement.java
View file

@ -26,6 +26,7 @@ import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smack.util.XmlStringBuilder; import org.jivesoftware.smack.util.XmlStringBuilder;
import org.jivesoftware.smack.util.stringencoder.Base64;
import org.jivesoftware.smackx.ox.util.Util; import org.jivesoftware.smackx.ox.util.Util;
/** /**
@ -51,7 +52,8 @@ public class OpenPgpElement implements ExtensionElement {
} }
public InputStream toInputStream() { public InputStream toInputStream() {
return new ByteArrayInputStream(base64EncodedOpenPgpMessage.getBytes(Util.UTF8)); return new ByteArrayInputStream(
Base64.decode(base64EncodedOpenPgpMessage.getBytes(Util.UTF8)));
} }
/** /**

5
smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/abstr/AbstractOpenPgpKeyStore.java
View file

@ -19,7 +19,6 @@ package org.jivesoftware.smackx.ox.store.abstr;
import java.io.IOException; import java.io.IOException;
import java.security.InvalidAlgorithmParameterException; import java.security.InvalidAlgorithmParameterException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
@ -247,7 +246,7 @@ public abstract class AbstractOpenPgpKeyStore implements OpenPgpKeyStore {
@Override @Override
public PGPSecretKeyRing generateKeyRing(BareJid owner) public PGPSecretKeyRing generateKeyRing(BareJid owner)
throws PGPException, NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException { throws PGPException, NoSuchAlgorithmException, InvalidAlgorithmParameterException {
return PGPainless.generateKeyRing().modernKeyRing("xmpp:" + owner.toString(), null); return PGPainless.generateKeyRing().modernKeyRing("xmpp:" + owner.toString());
} }
} }