devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

ox: make _ox_public_key_result safer

Browse Source
This commit is contained in:
Michael Vetter
2021-03-25 16:30:19 +01:00
parent 10df93ee3e
commit b584a1ecd0
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/xmpp/ox.c
View File

@@ -421,13 +421,23 @@ _ox_public_key_result(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void
log_error("[OX] Public key request response failed: No <pubkey/>"); log_error("[OX] Public key request response failed: No <pubkey/>");
return FALSE; return FALSE;
} }
xmpp_stanza_t* data = xmpp_stanza_get_child_by_name(pubkey, STANZA_NAME_DATA); xmpp_stanza_t* data = xmpp_stanza_get_child_by_name(pubkey, STANZA_NAME_DATA);
if (!data) {
log_error("[OX] No data");
}
char* base64_data = xmpp_stanza_get_text(data); char* base64_data = xmpp_stanza_get_text(data);
log_debug("Key data: %s", base64_data); if (base64_data) {
if (p_ox_gpg_import(base64_data)) { log_debug("Key data: %s", base64_data);
cons_show("Public Key imported");
} else { if (p_ox_gpg_import(base64_data)) {
cons_show("Public Key import failed. Check log for details."); cons_show("Public Key imported");
} else {
cons_show("Public Key import failed. Check log for details.");
}
free(base64_data);
} }
return FALSE; return FALSE;