From 27b402f57c25051130c08047fb49840f40bdb00d Mon Sep 17 00:00:00 2001 From: ameba23 Date: Tue, 20 Jul 2021 11:41:17 +0200 Subject: [PATCH] Log warning on failure to set handshake public key --- .../HandshakeKeyExchangeManagerImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/briar-core/src/main/java/org/briarproject/briar/handshakekeyexchange/HandshakeKeyExchangeManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/handshakekeyexchange/HandshakeKeyExchangeManagerImpl.java index dd5bfd6b2..5a6d9010c 100644 --- a/briar-core/src/main/java/org/briarproject/briar/handshakekeyexchange/HandshakeKeyExchangeManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/handshakekeyexchange/HandshakeKeyExchangeManagerImpl.java @@ -29,6 +29,7 @@ import org.briarproject.briar.api.conversation.DeletionResult; import org.briarproject.briar.api.handshakekeyexchange.HandshakeKeyExchangeManager; import org.briarproject.briar.client.ConversationClientImpl; +import java.security.GeneralSecurityException; import java.util.ArrayList; import java.util.Collection; import java.util.Map; @@ -163,8 +164,14 @@ public class HandshakeKeyExchangeManagerImpl extends ConversationClientImpl } LOG.info("Adding contact's handshake public key"); PublicKey handshakePublicKey = new AgreementPublicKey(body.getRaw(0)); - contactManager - .setHandshakePublicKey(txn, contactId, handshakePublicKey); + + try { + contactManager + .setHandshakePublicKey(txn, contactId, handshakePublicKey); + } catch (GeneralSecurityException e) { + LOG.warning("Security exception when adding remote handshake public key"); + e.printStackTrace(); + } return false; }