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

Send encrypted messages

Browse Source
This commit is contained in:
James Booth
2015-03-24 23:34:24 +00:00
parent 551f7df1f7
commit eb5cb7b2f8
5 changed files with 109 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/xmpp/message.c
View File

@@ -49,6 +49,7 @@
#include "roster_list.h"
#include "xmpp/stanza.h"
#include "xmpp/xmpp.h"
#include "pgp/gpg.h"
#define HANDLE(ns, type, func) xmpp_handler_add(conn, func, ns, STANZA_NAME_MESSAGE, type, ctx)
@@ -104,7 +105,34 @@ message_send_chat(const char * const barejid, const char * const msg)
}
char *id = create_unique_id("msg");
xmpp_stanza_t *message = stanza_create_message(ctx, id, jid, STANZA_TYPE_CHAT, msg);
xmpp_stanza_t *message = NULL;
#ifdef HAVE_LIBGPGME
char *account_name = jabber_get_account_name();
ProfAccount *account = accounts_get_account(account_name);
if (account->pgp_keyid) {
Jid *jidp = jid_create(jid);
char *encrypted = p_gpg_encrypt(jidp->barejid, msg);
if (encrypted) {
message = stanza_create_message(ctx, id, jid, STANZA_TYPE_CHAT, "This message is encrypted.");
xmpp_stanza_t *x = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(x, STANZA_NAME_X);
xmpp_stanza_set_ns(x, STANZA_NS_ENCRYPTED);
xmpp_stanza_t *enc_st = xmpp_stanza_new(ctx);
xmpp_stanza_set_text(enc_st, encrypted);
xmpp_stanza_add_child(x, enc_st);
xmpp_stanza_release(enc_st);
xmpp_stanza_add_child(message, x);
xmpp_stanza_release(x);
free(encrypted);
} else {
message = stanza_create_message(ctx, id, jid, STANZA_TYPE_CHAT, msg);
}
}
#else
message = stanza_create_message(ctx, id, jid, STANZA_TYPE_CHAT, msg);
#endif
free(jid);
if (state) {

2
src/xmpp/presence.c
View File

@@ -232,7 +232,7 @@ presence_update(const resource_presence_t presence_type, const char * const msg,
char *account_name = jabber_get_account_name();
ProfAccount *account = accounts_get_account(account_name);
if (account->pgp_keyid) {
char *signed_status = p_gpg_sign_str(msg, account->pgp_keyid);
char *signed_status = p_gpg_sign(msg, account->pgp_keyid);
if (signed_status) {
xmpp_stanza_t *x = xmpp_stanza_new(ctx);

1
src/xmpp/stanza.h
View File

@@ -160,6 +160,7 @@
#define STANZA_NS_FORWARD "urn:xmpp:forward:0"
#define STANZA_NS_RECEIPTS "urn:xmpp:receipts"
#define STANZA_NS_SIGNED "jabber:x:signed"
#define STANZA_NS_ENCRYPTED "jabber:x:encrypted"
#define STANZA_DATAFORM_SOFTWARE "urn:xmpp:dataforms:softwareinfo"