devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-30 01:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1802 from H3rnand3zzz/pgp-fix

Browse Source 
Security fix of OTR, PGP and other
This commit is contained in:
Michael Vetter
2023-03-31 13:21:16 +02:00
committed by GitHub
parent 2093fe417f 407905cfc5
commit 2e1d5d03dc
4 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/event/server_events.c
View File

@@ -645,8 +645,8 @@ sv_ev_incoming_message(ProfMessage* message)
chatwin = wins_get_chat(looking_for_jid); chatwin = wins_get_chat(looking_for_jid);
if (!chatwin) { if (!chatwin) {
ProfWin* window = wins_new_chat(looking_for_jid); chatwin = chatwin_new(looking_for_jid);
chatwin = (ProfChatWin*)window; ProfWin* window = (ProfWin*)chatwin;
new_win = TRUE; new_win = TRUE;
if (prefs_get_boolean(PREF_MAM)) { if (prefs_get_boolean(PREF_MAM)) {
@@ -689,8 +689,7 @@ sv_ev_incoming_carbon(ProfMessage* message)
gboolean new_win = FALSE; gboolean new_win = FALSE;
ProfChatWin* chatwin = wins_get_chat(message->from_jid->barejid); ProfChatWin* chatwin = wins_get_chat(message->from_jid->barejid);
if (!chatwin) { if (!chatwin) {
ProfWin* window = wins_new_chat(message->from_jid->barejid); chatwin = chatwin_new(message->from_jid->barejid);
chatwin = (ProfChatWin*)window;
new_win = TRUE; new_win = TRUE;
#ifdef HAVE_OMEMO #ifdef HAVE_OMEMO

2
src/otr/otr.c
View File

@@ -151,7 +151,7 @@ cb_gone_secure(void* opdata, ConnContext* context)
{ {
ProfChatWin* chatwin = wins_get_chat(context->username); ProfChatWin* chatwin = wins_get_chat(context->username);
if (!chatwin) { if (!chatwin) {
chatwin = (ProfChatWin*)wins_new_chat(context->username); chatwin = chatwin_new(context->username);
} }
chatwin_otr_secured(chatwin, otr_is_trusted(context->username)); chatwin_otr_secured(chatwin, otr_is_trusted(context->username));

14
src/ui/core.c
View File

@@ -768,20 +768,18 @@ ui_print_system_msg_from_recipient(const char* const barejid, const char* messag
return; return;
ProfChatWin* chatwin = wins_get_chat(barejid); ProfChatWin* chatwin = wins_get_chat(barejid);
ProfWin* window = (ProfWin*)chatwin; if (chatwin == NULL) {
if (window == NULL) { chatwin = chatwin_new(barejid);
window = wins_new_chat(barejid); if (chatwin) {
if (window) { int num = wins_get_num((ProfWin*)chatwin);
chatwin = (ProfChatWin*)window;
int num = wins_get_num(window);
status_bar_active(num, WIN_CHAT, chatwin->barejid); status_bar_active(num, WIN_CHAT, chatwin->barejid);
} else { } else {
window = wins_get_console(); chatwin = (ProfChatWin*)wins_get_console();
status_bar_active(1, WIN_CONSOLE, "console"); status_bar_active(1, WIN_CONSOLE, "console");
} }
} }
win_println(window, THEME_DEFAULT, "-", "*%s %s", barejid, message); win_println((ProfWin*)chatwin, THEME_DEFAULT, "-", "*%s %s", barejid, message);
} }
void void

4
src/xmpp/message.c
View File

@@ -598,10 +598,6 @@ message_send_chat_otr(const char* const barejid, const char* const msg, gboolean
stanza_attach_state(ctx, message, state); stanza_attach_state(ctx, message, state);
} }
stanza_attach_carbons_private(ctx, message);
stanza_attach_hints_no_copy(ctx, message);
stanza_attach_hints_no_store(ctx, message);
if (request_receipt) { if (request_receipt) {
stanza_attach_receipt_request(ctx, message); stanza_attach_receipt_request(ctx, message);
} }