mirror of
https://git.jabber.space/devs/cproof.git
synced 2026-07-21 22:06:21 +00:00
Sync with upstream profanity-im/profanity.
Major upstream changes incorporated:
Memory management
- Replace malloc+memset with g_new0 throughout codebase
- Adopt auto_gchar / auto_gcharv / auto_gerror / auto_jid cleanup macros
- Replace free() with g_free() for GAlloc'd memory
Editor rewrite
- Remove pthread-based async editor; use GChildWatch callback API
- New launch_editor(initial_content, callback, user_data) interface
- Proper signal handling (SIGINT, SIGTSTP, SIGPIPE reset in child)
- ui_suspend()/ui_resume() integration for TTY management
OMEMO improvements
- Dual backend support: libsignal-protocol-c and libomemo-c
- Proper pre-key removal after use (XEP-0384 compliance)
- Automatic pre-key regeneration when store drops below threshold
- New functions: omemo_is_device_active(), omemo_is_jid_trusted()
- omemo_get_jid_untrusted_fingerprints() for better error messages
- Fingerprint notifications on new device identity discovery
- Deterministic pre-key ID generation tracking max_pre_key_id
- omemo_trust_changed() UI updates on trust state changes
JID validation
- RFC 6122-compliant validation in jid_is_valid()
- Character-level checks (RFC 6122 forbidden chars: & ' / : < > @)
- Length limits: 1023 per component, 3071 total
- New jid_is_valid_user_jid() for user vs. service JID distinction
Database
- Schema migration v3: UNIQUE constraint on archive_id for deduplication
- Triggers for corrected message tracking (replaces_db_id / replaced_by_db_id)
- db_history_result_t return type, _truncate_datetime_suffix()
UI / console
- win_warn_needed() / win_warn_sent() warning deduplication hash table
- PAD_MIN_HEIGHT dynamic pad sizing with PAD_THRESHOLD auto-cleanup
- Spellcheck integration in input field with Unicode word detection
- cons_spellcheck_setting() for /settings ui output
- /[command]? shortcut for command help
Account config
- Account name sanitization for GKeyFile special chars ([ ] = # \n \r)
- Replace popen() with g_spawn_sync() for eval_password
- TLS policy: add "direct" option alongside legacy
Connection
- Port validation with g_assert (0–65535)
- SHA-256 certificate fingerprint support (XMPP_CERT_PUBKEY_FINGERPRINT_SHA256)
- "direct" TLS policy alias for legacy SSL
Common utilities
- str_xml_sanitize() for XML 1.0 illegal character removal
- string_matches_one_of() with formatted error messages
- valid_tls_policy_option() helper
- prof_date_time_format_iso8601() utility
- Improved strip_arg_quotes() with backslash unescaping
- prof_occurrences() uses g_slist_prepend + reverse for performance
PGP / OX
- Proper GPGME resource cleanup with goto-cleanup pattern
- g_string_free(xmppuri) leak fix in _ox_key_lookup
CSV export
- Use GString + g_file_set_contents instead of raw write() syscalls
Tests
- Restructured into subdirectories: command/, config/, xmpp/, ui/, omemo/, otr/, pgp/
- New test_cmd_ac.c for autocompleter unit tests
- Updated stubs for new UI suspend/resume functions
License headers
- Migrate to SPDX-3.0 identifiers (GPL-3.0-or-later WITH OpenSSL-exception)
────────────────────────────────────────────────────
cproof-specific preservations:
- XEP-0308 LMC: replace_id ?: id logic in message/stanza/omemo
- Force encryption: cmd_force_encryption, test_forced_encryption
- CWE-134: format string protection (cons_show("%s", ...))
- y_start_pos-based paging in window.c
- db_history_result_t return type, _truncate_datetime_suffix()
Merge-time fixes:
- common.c: format-security (-Werror) — cons_show(errmsg) → cons_show("%s", errmsg)
- database.c: null-deref guard — !msg->timestamp → msg && !msg->timestamp
- console.c: implicit size_t → int cast — (int)(maxlen + 1)
- tlscerts.c: %d for size_t — %zu
Build system:
- Kept autotools (Makefile.am, configure.ac); upstream uses Meson
- Restored deleted files: bootstrap.sh, autogen.sh, ax_valgrind_check.m4, configure-debug
- Updated Makefile.am test paths for subdirectory structure
- Added test_cmd_ac, test_forced_encryption to test sources
Functional tests:
- Use cproof version; upstream requires stbbr_for_xmlns from updated stabber
- Not yet available in devs/stabber fork
Closes #64
Merge author: jabber.developer2
Commits authors:
Michael Vetter <jubalh@iodoru.org>
& Steffen Jaeckel <s@jaeckel.eu>
467 lines
14 KiB
C
467 lines
14 KiB
C
/*
|
|
* ox.c
|
|
* vim: expandtab:ts=4:sts=4:sw=4
|
|
*
|
|
* Copyright (C) 2020 Stefan Kropp <stefan@debxwoody.de>
|
|
*
|
|
* SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <glib.h>
|
|
#include <assert.h>
|
|
|
|
#include "log.h"
|
|
#include "ui/ui.h"
|
|
#include "xmpp/connection.h"
|
|
#include "xmpp/stanza.h"
|
|
#include "xmpp/iq.h"
|
|
#include "pgp/ox.h"
|
|
|
|
#ifdef HAVE_LIBGPGME
|
|
|
|
#define KEYID_LENGTH 40
|
|
|
|
static void _ox_metadata_node__public_key(const char* const fingerprint);
|
|
static int _ox_metadata_result(xmpp_stanza_t* const stanza, void* const userdata);
|
|
|
|
static void _ox_request_public_key(const char* const jid, const char* const fingerprint);
|
|
static int _ox_public_key_result(xmpp_stanza_t* const stanza, void* const userdata);
|
|
|
|
/* Return Current Date and Time.
|
|
*
|
|
* XEP-0082: XMPP Date and Time Profiles
|
|
* https://xmpp.org/extensions/xep-0082.html
|
|
*
|
|
* According to ISO8601
|
|
* YYYY-MM-DDThh:mm:ssZ
|
|
*/
|
|
|
|
static char* _gettimestamp();
|
|
|
|
/*!
|
|
*
|
|
<pre>
|
|
<iq type='set' from='juliet@example.org/balcony' id='publish1'>
|
|
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
|
|
<publish node='urn:xmpp:openpgp:0:public-keys:123456789ABCDEF1234567891238484848484848'>
|
|
<item id='2020-01-21T10:46:21Z'>
|
|
<pubkey xmlns='urn:xmpp:openpgp:0'>
|
|
<data>
|
|
BASE64_OPENPGP_PUBLIC_KEY
|
|
</data>
|
|
</pubkey>
|
|
</item>
|
|
</publish>
|
|
</pubsub>
|
|
</iq>
|
|
</pre>
|
|
*
|
|
*/
|
|
|
|
gboolean
|
|
ox_announce_public_key(const char* const filename)
|
|
{
|
|
assert(filename);
|
|
|
|
cons_show("Announce OpenPGP Key for OX %s…", filename);
|
|
log_info("[OX] Announce OpenPGP Key of OX: %s", filename);
|
|
|
|
// key the key and the fingerprint via GnuPG from file
|
|
char* key = NULL;
|
|
char* fp = NULL;
|
|
p_ox_gpg_readkey(filename, &key, &fp);
|
|
|
|
if (!(key && fp)) {
|
|
cons_show("Error during OpenPGP OX announce. See log file for more information");
|
|
return FALSE;
|
|
}
|
|
|
|
log_info("[OX] Announce OpenPGP Key for Fingerprint: %s", fp);
|
|
xmpp_ctx_t* const ctx = connection_get_ctx();
|
|
char* id = connection_create_stanza_id();
|
|
xmpp_stanza_t* iq = xmpp_iq_new(ctx, STANZA_TYPE_SET, id);
|
|
xmpp_stanza_set_from(iq, xmpp_conn_get_jid(connection_get_conn()));
|
|
|
|
xmpp_stanza_t* pubsub = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(pubsub, STANZA_NAME_PUBSUB);
|
|
xmpp_stanza_set_ns(pubsub, XMPP_FEATURE_PUBSUB);
|
|
|
|
GString* node_name = g_string_new(STANZA_NS_OPENPGP_0_PUBLIC_KEYS);
|
|
g_string_append(node_name, ":");
|
|
g_string_append(node_name, fp);
|
|
|
|
xmpp_stanza_t* publish = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(publish, STANZA_NAME_PUBLISH);
|
|
xmpp_stanza_set_attribute(publish, STANZA_ATTR_NODE, node_name->str);
|
|
|
|
xmpp_stanza_t* item = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(item, STANZA_NAME_ITEM);
|
|
auto_char char* timestamp = _gettimestamp();
|
|
xmpp_stanza_set_attribute(item, STANZA_ATTR_ID, timestamp);
|
|
|
|
xmpp_stanza_t* pubkey = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(pubkey, STANZA_NAME_PUPKEY);
|
|
xmpp_stanza_set_ns(pubkey, STANZA_NS_OPENPGP_0);
|
|
|
|
xmpp_stanza_t* data = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(data, STANZA_NAME_DATA);
|
|
xmpp_stanza_t* keydata = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_text(keydata, key);
|
|
|
|
xmpp_stanza_add_child(data, keydata);
|
|
xmpp_stanza_add_child(pubkey, data);
|
|
xmpp_stanza_add_child(item, pubkey);
|
|
xmpp_stanza_add_child(publish, item);
|
|
xmpp_stanza_add_child(pubsub, publish);
|
|
xmpp_stanza_add_child(iq, pubsub);
|
|
|
|
if (connection_supports(XMPP_FEATURE_PUBSUB_PUBLISH_OPTIONS)) {
|
|
stanza_attach_publish_options(ctx, iq, "pubsub#access_model", "open");
|
|
} else {
|
|
log_debug("[OX] Cannot publish public key: no PUBSUB feature announced");
|
|
}
|
|
|
|
iq_send_stanza(iq);
|
|
xmpp_stanza_release(iq);
|
|
|
|
_ox_metadata_node__public_key(fp);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
/*!
|
|
* <pre>
|
|
|
|
<iq from='romeo@example.org/orchard'
|
|
to='juliet@example.org'
|
|
type='get'
|
|
id='getmeta'>
|
|
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
|
|
<items node='urn:xmpp:openpgp:0:public-keys'/>
|
|
</pubsub>
|
|
</iq>
|
|
|
|
* </pre>
|
|
*
|
|
*/
|
|
|
|
void
|
|
ox_discover_public_key(const char* const jid)
|
|
{
|
|
assert(jid && strlen(jid) > 0);
|
|
log_info("[OX] Discovering Public Key for %s", jid);
|
|
cons_show("Discovering Public Key for %s", jid);
|
|
// iq
|
|
xmpp_ctx_t* const ctx = connection_get_ctx();
|
|
char* id = connection_create_stanza_id();
|
|
xmpp_stanza_t* iq = xmpp_iq_new(ctx, STANZA_TYPE_GET, id);
|
|
xmpp_stanza_set_from(iq, xmpp_conn_get_jid(connection_get_conn()));
|
|
xmpp_stanza_set_to(iq, jid);
|
|
// pubsub
|
|
xmpp_stanza_t* pubsub = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(pubsub, STANZA_NAME_PUBSUB);
|
|
xmpp_stanza_set_ns(pubsub, XMPP_FEATURE_PUBSUB);
|
|
// items
|
|
xmpp_stanza_t* items = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(items, STANZA_NAME_ITEMS);
|
|
xmpp_stanza_set_attribute(items, STANZA_ATTR_NODE, STANZA_NS_OPENPGP_0_PUBLIC_KEYS);
|
|
|
|
xmpp_stanza_add_child(pubsub, items);
|
|
xmpp_stanza_add_child(iq, pubsub);
|
|
|
|
iq_id_handler_add(xmpp_stanza_get_id(iq), _ox_metadata_result, NULL, NULL);
|
|
iq_send_stanza(iq);
|
|
|
|
xmpp_stanza_release(iq);
|
|
}
|
|
|
|
void
|
|
ox_request_public_key(const char* const jid, const char* const fingerprint)
|
|
{
|
|
_ox_request_public_key(jid, fingerprint);
|
|
}
|
|
|
|
/*!
|
|
*
|
|
*
|
|
*
|
|
<pre>
|
|
<iq type='set' from='juliet@example.org/balcony' id='publish1'>
|
|
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
|
|
<publish node='urn:xmpp:openpgp:0:public-keys'>
|
|
<item>
|
|
<public-keys-list xmlns='urn:xmpp:openpgp:0'>
|
|
<pubkey-metadata
|
|
v4-fingerprint='1234512345678122ABCDE2222222222222222222'
|
|
date='2018-03-01T15:26:12Z'
|
|
/>
|
|
<pubkey-metadata
|
|
v4-fingerprint='1234ABCD1234409865ABCD234482728939483472'
|
|
date='1953-05-16T12:00:00Z'
|
|
/>
|
|
</public-keys-list>
|
|
</item>
|
|
</publish>
|
|
</pubsub>
|
|
</iq>
|
|
</pre>
|
|
*
|
|
*/
|
|
|
|
void
|
|
_ox_metadata_node__public_key(const char* const fingerprint)
|
|
{
|
|
log_info("Announce OpenPGP metadata: %s", fingerprint);
|
|
assert(fingerprint);
|
|
assert(strlen(fingerprint) == KEYID_LENGTH);
|
|
// iq
|
|
xmpp_ctx_t* const ctx = connection_get_ctx();
|
|
char* id = connection_create_stanza_id();
|
|
xmpp_stanza_t* iq = xmpp_iq_new(ctx, STANZA_TYPE_SET, id);
|
|
xmpp_stanza_set_from(iq, xmpp_conn_get_jid(connection_get_conn()));
|
|
// pubsub
|
|
xmpp_stanza_t* pubsub = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(pubsub, STANZA_NAME_PUBSUB);
|
|
xmpp_stanza_set_ns(pubsub, XMPP_FEATURE_PUBSUB);
|
|
// publish
|
|
xmpp_stanza_t* publish = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(publish, STANZA_NAME_PUBLISH);
|
|
xmpp_stanza_set_attribute(publish, STANZA_ATTR_NODE, STANZA_NS_OPENPGP_0_PUBLIC_KEYS);
|
|
// item
|
|
xmpp_stanza_t* item = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(item, STANZA_NAME_ITEM);
|
|
// public-keys-list
|
|
xmpp_stanza_t* publickeyslist = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(publickeyslist, STANZA_NAME_PUBLIC_KEYS_LIST);
|
|
xmpp_stanza_set_ns(publickeyslist, STANZA_NS_OPENPGP_0);
|
|
// pubkey-metadata
|
|
xmpp_stanza_t* pubkeymetadata = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(pubkeymetadata, STANZA_NAME_PUBKEY_METADATA);
|
|
xmpp_stanza_set_attribute(pubkeymetadata, STANZA_ATTR_V4_FINGERPRINT, fingerprint);
|
|
auto_char char* timestamp = _gettimestamp();
|
|
xmpp_stanza_set_attribute(pubkeymetadata, STANZA_ATTR_DATE, timestamp);
|
|
|
|
xmpp_stanza_add_child(publickeyslist, pubkeymetadata);
|
|
xmpp_stanza_add_child(item, publickeyslist);
|
|
xmpp_stanza_add_child(publish, item);
|
|
xmpp_stanza_add_child(pubsub, publish);
|
|
xmpp_stanza_add_child(iq, pubsub);
|
|
|
|
if (connection_supports(XMPP_FEATURE_PUBSUB_PUBLISH_OPTIONS)) {
|
|
stanza_attach_publish_options(ctx, iq, "pubsub#access_model", "open");
|
|
} else {
|
|
log_debug("[OX] Cannot publish public key: no PUBSUB feature announced");
|
|
}
|
|
|
|
iq_send_stanza(iq);
|
|
xmpp_stanza_release(iq);
|
|
}
|
|
|
|
static int
|
|
_ox_metadata_result(xmpp_stanza_t* const stanza, void* const userdata)
|
|
{
|
|
log_debug("[OX] Processing result %s's metadata.", (char*)userdata);
|
|
|
|
if (g_strcmp0(xmpp_stanza_get_type(stanza), "result") != 0) {
|
|
log_debug("[OX] Error: Unable to load metadata of user %s - Not a stanza result type", (char*)userdata);
|
|
return FALSE;
|
|
}
|
|
// pubsub
|
|
xmpp_stanza_t* pubsub = xmpp_stanza_get_child_by_name_and_ns(stanza, STANZA_NAME_PUBSUB, XMPP_FEATURE_PUBSUB);
|
|
if (!pubsub) {
|
|
cons_show("[OX] Error: No pubsub");
|
|
return FALSE;
|
|
}
|
|
|
|
xmpp_stanza_t* items = xmpp_stanza_get_child_by_name(pubsub, STANZA_NAME_ITEMS);
|
|
if (!items) {
|
|
cons_show("[OX] Error: No items");
|
|
return FALSE;
|
|
}
|
|
|
|
xmpp_stanza_t* item = xmpp_stanza_get_child_by_name(items, STANZA_NAME_ITEM);
|
|
if (!item) {
|
|
cons_show("[OX] Error: No item");
|
|
return FALSE;
|
|
}
|
|
|
|
xmpp_stanza_t* publickeyslist = xmpp_stanza_get_child_by_name_and_ns(item, STANZA_NAME_PUBLIC_KEYS_LIST, STANZA_NS_OPENPGP_0);
|
|
if (!publickeyslist) {
|
|
cons_show("[OX] Error: No publickeyslist");
|
|
return FALSE;
|
|
}
|
|
|
|
xmpp_stanza_t* pubkeymetadata = xmpp_stanza_get_children(publickeyslist);
|
|
|
|
while (pubkeymetadata) {
|
|
const char* fingerprint = xmpp_stanza_get_attribute(pubkeymetadata, STANZA_ATTR_V4_FINGERPRINT);
|
|
|
|
if (fingerprint) {
|
|
if (strlen(fingerprint) == KEYID_LENGTH) {
|
|
cons_show("%s", fingerprint);
|
|
} else {
|
|
cons_show("OX: Wrong char size of public key");
|
|
log_error("[OX] Wrong chat size of public key %s", fingerprint);
|
|
}
|
|
}
|
|
pubkeymetadata = xmpp_stanza_get_next(pubkeymetadata);
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
/*!
|
|
*
|
|
* <pre>
|
|
|
|
<iq from='romeo@example.org/orchard'
|
|
to='juliet@example.org'
|
|
type='get'
|
|
id='getpub'>
|
|
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
|
|
<items node='urn:xmpp:openpgp:0:public-keys:1234567890ABCDF12349ABCD1293848292983833'
|
|
max_items='1'/>
|
|
</pubsub>
|
|
</iq>
|
|
|
|
* </pre>
|
|
*/
|
|
|
|
void
|
|
_ox_request_public_key(const char* const jid, const char* const fingerprint)
|
|
{
|
|
assert(jid);
|
|
assert(fingerprint);
|
|
|
|
if (strlen(fingerprint) != KEYID_LENGTH) {
|
|
cons_show_error("Invalid fingerprint length %s for %s", fingerprint, jid);
|
|
return;
|
|
}
|
|
|
|
cons_show("Requesting Public Key %s for %s", fingerprint, jid);
|
|
log_info("[OX] Request %s's public key %s.", jid, fingerprint);
|
|
// iq
|
|
xmpp_ctx_t* const ctx = connection_get_ctx();
|
|
char* id = connection_create_stanza_id();
|
|
xmpp_stanza_t* iq = xmpp_iq_new(ctx, STANZA_TYPE_GET, id);
|
|
xmpp_stanza_set_from(iq, xmpp_conn_get_jid(connection_get_conn()));
|
|
xmpp_stanza_set_to(iq, jid);
|
|
// pubsub
|
|
xmpp_stanza_t* pubsub = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(pubsub, STANZA_NAME_PUBSUB);
|
|
xmpp_stanza_set_ns(pubsub, XMPP_FEATURE_PUBSUB);
|
|
// items
|
|
GString* node_name = g_string_new(STANZA_NS_OPENPGP_0_PUBLIC_KEYS);
|
|
g_string_append(node_name, ":");
|
|
g_string_append(node_name, fingerprint);
|
|
|
|
xmpp_stanza_t* items = xmpp_stanza_new(ctx);
|
|
xmpp_stanza_set_name(items, STANZA_NAME_ITEMS);
|
|
xmpp_stanza_set_attribute(items, STANZA_ATTR_NODE, node_name->str);
|
|
xmpp_stanza_set_attribute(items, "max_items", "1");
|
|
|
|
xmpp_stanza_add_child(pubsub, items);
|
|
xmpp_stanza_add_child(iq, pubsub);
|
|
|
|
iq_id_handler_add(xmpp_stanza_get_id(iq), _ox_public_key_result, NULL, NULL);
|
|
|
|
iq_send_stanza(iq);
|
|
xmpp_stanza_release(iq);
|
|
}
|
|
|
|
/*!
|
|
*
|
|
* <pre>
|
|
|
|
<iq from='juliet@example.org'
|
|
to='romeo@example.org/orchard'
|
|
type='result'
|
|
id='getpub'>
|
|
<pubsub xmlns='http://jabber.org/protocol/pubsub'>
|
|
<items node='urn:xmpp:openpgp:0:public-keys:123454678819283823ABCDEF1234566789001234'>
|
|
<item id='2020-01-21T10:46:21Z'>
|
|
<pubkey xmlns='urn:xmpp:openpgp:0'>
|
|
<data>
|
|
BASE64_OPENPGP_PUBLIC_KEY
|
|
</data>
|
|
</pubkey>
|
|
</item>
|
|
</items>
|
|
</pubsub>
|
|
</iq>
|
|
|
|
* </pre>
|
|
*/
|
|
|
|
int
|
|
_ox_public_key_result(xmpp_stanza_t* const stanza, void* const userdata)
|
|
{
|
|
log_debug("[OX] Processing result public key");
|
|
|
|
if (g_strcmp0(xmpp_stanza_get_type(stanza), "result") != 0) {
|
|
cons_show("Public Key import failed. Check log for details.");
|
|
log_error("[OX] Public Key response type is wrong");
|
|
return FALSE;
|
|
}
|
|
// pubsub
|
|
xmpp_stanza_t* pubsub = xmpp_stanza_get_child_by_name_and_ns(stanza, STANZA_NAME_PUBSUB, XMPP_FEATURE_PUBSUB);
|
|
if (!pubsub) {
|
|
cons_show("Public Key import failed. Check log for details.");
|
|
log_error("[OX] Public key request response failed: No <pubsub/>");
|
|
return FALSE;
|
|
}
|
|
|
|
xmpp_stanza_t* items = xmpp_stanza_get_child_by_name(pubsub, STANZA_NAME_ITEMS);
|
|
if (!items) {
|
|
cons_show("Public Key import failed. Check log for details.");
|
|
log_error("[OX] Public key request response failed: No <items/>");
|
|
return FALSE;
|
|
}
|
|
|
|
xmpp_stanza_t* item = xmpp_stanza_get_child_by_name(items, STANZA_NAME_ITEM);
|
|
if (!item) {
|
|
cons_show("Public Key import failed. Check log for details.");
|
|
log_error("[OX] Public key request response failed: No <item/>");
|
|
return FALSE;
|
|
}
|
|
|
|
xmpp_stanza_t* pubkey = xmpp_stanza_get_child_by_name_and_ns(item, STANZA_NAME_PUPKEY, STANZA_NS_OPENPGP_0);
|
|
if (!pubkey) {
|
|
cons_show("Public Key import failed. Check log for details.");
|
|
log_error("[OX] Public key request response failed: No <pubkey/>");
|
|
return FALSE;
|
|
}
|
|
|
|
xmpp_stanza_t* data = xmpp_stanza_get_child_by_name(pubkey, STANZA_NAME_DATA);
|
|
if (!data) {
|
|
log_error("[OX] No data");
|
|
}
|
|
|
|
auto_char char* base64_data = xmpp_stanza_get_text(data);
|
|
if (base64_data) {
|
|
log_debug("Key data: %s", base64_data);
|
|
|
|
if (p_ox_gpg_import(base64_data)) {
|
|
cons_show("Public Key imported");
|
|
} else {
|
|
cons_show("Public Key import failed. Check log for details.");
|
|
}
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
// Date and Time (XEP-0082)
|
|
char*
|
|
_gettimestamp()
|
|
{
|
|
GDateTime* dt = g_date_time_new_now_local();
|
|
gchar* datestr = g_date_time_format(dt, "%FT%TZ");
|
|
g_date_time_unref(dt);
|
|
return datestr;
|
|
}
|
|
|
|
#endif // HAVE_LIBGPGME
|