From 337aa4a1106e07f6c7fb003b5de7526fa6a79caf Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 7 May 2021 22:55:20 +0200 Subject: [PATCH] consider Config.REQUIRE_RTP_VERIFICATION on decrypt. fail as future --- .../conversations/xmpp/jingle/JingleRtpConnection.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java index af1e05497..c933439e7 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java @@ -322,8 +322,10 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web Log.d(Config.LOGTAG, id.account.getJid().asBareJid() + ": received verifiable DTLS fingerprint via " + omemoVerification); return omemoVerifiedPayload.getPayload(); }, MoreExecutors.directExecutor()); - } else if (expectVerification) { - throw new SecurityException("DTLS fingerprint was unexpectedly not verifiable"); + } else if (Config.REQUIRE_RTP_VERIFICATION || expectVerification) { + return Futures.immediateFailedFuture( + new SecurityException("DTLS fingerprint was unexpectedly not verifiable") + ); } else { return Futures.immediateFuture(receivedContentMap); }