From 6173e015f5e9b3751c94c03ac47fbdf8099cee24 Mon Sep 17 00:00:00 2001 From: DebXWoody Date: Tue, 29 Jun 2021 20:25:50 +0200 Subject: OX bug fixing * Don't decryption if there is no private key * Decryption error messages --- src/xmpp/message.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/xmpp') diff --git a/src/xmpp/message.c b/src/xmpp/message.c index 33e15e78..aad7107d 100644 --- a/src/xmpp/message.c +++ b/src/xmpp/message.c @@ -1463,28 +1463,29 @@ _handle_ox_chat(xmpp_stanza_t* const stanza, ProfMessage* message, gboolean is_m xmpp_stanza_t *p = xmpp_stanza_get_child_by_name(x, "payload"); if ( !p ) { log_warning("OX Stanza - no Payload"); + message->plain = "OX error: No payload found"; return; } xmpp_stanza_t *b = xmpp_stanza_get_child_by_name(p, "body"); if ( !b ) { log_warning("OX Stanza - no body"); + message->plain = "OX error: No paylod body found"; return; } message->plain = xmpp_stanza_get_text(b); - if(message->plain == NULL ) { - message->plain = xmpp_stanza_get_text(stanza); - } message->encrypted = xmpp_stanza_get_text(ox); - - if (message->plain == NULL) { + if(message->plain == NULL ) { message->plain = xmpp_stanza_get_text(stanza); } - message->encrypted = xmpp_stanza_get_text(ox); } else { + message->plain = "Unable to decrypt OX message (XEP-0373: OpenPGP for XMPP)"; log_warning("OX Stanza text to stanza failed"); } + } else { + message->plain = "Unable to decrypt OX message (XEP-0373: OpenPGP for XMPP)"; } } else { + message->plain = "OX stanza without openpgp name"; log_warning("OX Stanza without openpgp stanza"); } #endif // HAVE_LIBGPGME -- cgit 1.4.1-2-gfad0