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

Add DryOxEncryption test

Browse source
This commit is contained in:
Paul Schaub 2018-06-21 15:20:04 +02:00
parent cdba5bdda9
commit ef00f50d79
3 changed files with 76 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/chat/OpenPgpContact.java
View file

@ -58,7 +58,7 @@ public class OpenPgpContact {
OpenPgpFingerprints contactsFingerprints) {
this.cryptoProvider = cryptoProvider;
this.jid = jid;
this.singingKey = cryptoProvider.getStore().getPrimaryOpenPgpKeyPairFingerprint();
this.singingKey = ourFingerprints.getActiveKeys().iterator().next();
this.ourFingerprints = ourFingerprints;
this.contactsFingerprints = contactsFingerprints;
}
@ -71,7 +71,7 @@ public class OpenPgpContact {
return contactsFingerprints;
}
public void addSignedEncryptedPayloadTo(Message message, List<ExtensionElement> payload)
public OpenPgpElement encryptAndSign(List<ExtensionElement> payload)
throws IOException, SmackOpenPgpException, MissingOpenPgpKeyPairException {
MultiMap<BareJid, OpenPgpV4Fingerprint> fingerprints = oursAndRecipientFingerprints();
@ -79,7 +79,6 @@ public class OpenPgpContact {
Collections.<Jid>singleton(getJid()),
payload);
OpenPgpElement encryptedPayload;
byte[] encryptedBytes;
// Encrypt the payload
@ -92,9 +91,14 @@ public class OpenPgpContact {
throw new AssertionError("Missing OpenPGP public key, even though this should not happen here.", e);
}
encryptedPayload = new OpenPgpElement(Base64.encodeToString(encryptedBytes));
return new OpenPgpElement(Base64.encodeToString(encryptedBytes));
}
public void addSignedEncryptedPayloadTo(Message message, List<ExtensionElement> payload)
throws IOException, SmackOpenPgpException, MissingOpenPgpKeyPairException {
// Add encrypted payload to message
OpenPgpElement encryptedPayload = encryptAndSign(payload);
message.addExtension(encryptedPayload);
// Add additional information to the message