All checks were successful
CI Code / Check spelling (push) Successful in 18s
CI Code / Check coding style (push) Successful in 34s
CI Code / Code Coverage (push) Successful in 2m36s
CI Code / Linux (debian) (push) Successful in 4m41s
CI Code / Linux (ubuntu) (push) Successful in 4m52s
CI Code / Linux (arch) (push) Successful in 5m40s
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>
173 lines
6.3 KiB
C
173 lines
6.3 KiB
C
/*
|
|
* crypto.h
|
|
* vim: expandtab:ts=4:sts=4:sw=4
|
|
*
|
|
* Copyright (C) 2019 Paul Fariello <paul@fariello.eu>
|
|
*
|
|
* SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception
|
|
*/
|
|
#include <stdio.h>
|
|
#include <stdbool.h>
|
|
#include "config.h"
|
|
|
|
#ifdef HAVE_LIBOMEMO_C
|
|
#include <omemo/signal_protocol_types.h>
|
|
#else
|
|
#include <signal/signal_protocol_types.h>
|
|
#endif
|
|
|
|
#include <gcrypt.h>
|
|
|
|
#define AES128_GCM_KEY_LENGTH 16
|
|
#define AES128_GCM_IV_LENGTH 12
|
|
#define AES128_GCM_TAG_LENGTH 16
|
|
|
|
int omemo_crypto_init(void);
|
|
/**
|
|
* Callback for a secure random number generator.
|
|
* This function shall fill the provided buffer with random bytes.
|
|
*
|
|
* @param data pointer to the output buffer
|
|
* @param len size of the output buffer
|
|
* @return 0 on success, negative on failure
|
|
*/
|
|
int omemo_random_func(uint8_t* data, size_t len, void* user_data);
|
|
|
|
/**
|
|
* Callback for an HMAC-SHA256 implementation.
|
|
* This function shall initialize an HMAC context with the provided key.
|
|
*
|
|
* @param hmac_context private HMAC context pointer
|
|
* @param key pointer to the key
|
|
* @param key_len length of the key
|
|
* @return 0 on success, negative on failure
|
|
*/
|
|
int omemo_hmac_sha256_init_func(void** hmac_context, const uint8_t* key, size_t key_len, void* user_data);
|
|
|
|
/**
|
|
* Callback for an HMAC-SHA256 implementation.
|
|
* This function shall update the HMAC context with the provided data
|
|
*
|
|
* @param hmac_context private HMAC context pointer
|
|
* @param data pointer to the data
|
|
* @param data_len length of the data
|
|
* @return 0 on success, negative on failure
|
|
*/
|
|
int omemo_hmac_sha256_update_func(void* hmac_context, const uint8_t* data, size_t data_len, void* user_data);
|
|
|
|
/**
|
|
* Callback for an HMAC-SHA256 implementation.
|
|
* This function shall finalize an HMAC calculation and populate the output
|
|
* buffer with the result.
|
|
*
|
|
* @param hmac_context private HMAC context pointer
|
|
* @param output buffer to be allocated and populated with the result
|
|
* @return 0 on success, negative on failure
|
|
*/
|
|
int omemo_hmac_sha256_final_func(void* hmac_context, signal_buffer** output, void* user_data);
|
|
|
|
/**
|
|
* Callback for an HMAC-SHA256 implementation.
|
|
* This function shall free the private context allocated in
|
|
* hmac_sha256_init_func.
|
|
*
|
|
* @param hmac_context private HMAC context pointer
|
|
*/
|
|
void omemo_hmac_sha256_cleanup_func(void* hmac_context, void* user_data);
|
|
|
|
/**
|
|
* Callback for a SHA512 message digest implementation.
|
|
* This function shall initialize a digest context.
|
|
*
|
|
* @param digest_context private digest context pointer
|
|
* @return 0 on success, negative on failure
|
|
*/
|
|
int omemo_sha512_digest_init_func(void** digest_context, void* user_data);
|
|
|
|
/**
|
|
* Callback for a SHA512 message digest implementation.
|
|
* This function shall update the digest context with the provided data.
|
|
*
|
|
* @param digest_context private digest context pointer
|
|
* @param data pointer to the data
|
|
* @param data_len length of the data
|
|
* @return 0 on success, negative on failure
|
|
*/
|
|
int omemo_sha512_digest_update_func(void* digest_context, const uint8_t* data, size_t data_len, void* user_data);
|
|
|
|
/**
|
|
* Callback for a SHA512 message digest implementation.
|
|
* This function shall finalize the digest calculation, populate the
|
|
* output buffer with the result, and prepare the context for reuse.
|
|
*
|
|
* @param digest_context private digest context pointer
|
|
* @param output buffer to be allocated and populated with the result
|
|
* @return 0 on success, negative on failure
|
|
*/
|
|
int omemo_sha512_digest_final_func(void* digest_context, signal_buffer** output, void* user_data);
|
|
|
|
/**
|
|
* Callback for a SHA512 message digest implementation.
|
|
* This function shall free the private context allocated in
|
|
* sha512_digest_init_func.
|
|
*
|
|
* @param digest_context private digest context pointer
|
|
*/
|
|
void omemo_sha512_digest_cleanup_func(void* digest_context, void* user_data);
|
|
|
|
/**
|
|
* Callback for an AES encryption implementation.
|
|
*
|
|
* @param output buffer to be allocated and populated with the ciphertext
|
|
* @param cipher specific cipher variant to use, either SG_CIPHER_AES_CTR_NOPADDING or SG_CIPHER_AES_CBC_PKCS5
|
|
* @param key the encryption key
|
|
* @param key_len length of the encryption key
|
|
* @param iv the initialization vector
|
|
* @param iv_len length of the initialization vector
|
|
* @param plaintext the plaintext to encrypt
|
|
* @param plaintext_len length of the plaintext
|
|
* @return 0 on success, negative on failure
|
|
*/
|
|
int omemo_encrypt_func(signal_buffer** output,
|
|
int cipher,
|
|
const uint8_t* key, size_t key_len,
|
|
const uint8_t* iv, size_t iv_len,
|
|
const uint8_t* plaintext, size_t plaintext_len,
|
|
void* user_data);
|
|
|
|
/**
|
|
* Callback for an AES decryption implementation.
|
|
*
|
|
* @param output buffer to be allocated and populated with the plaintext
|
|
* @param cipher specific cipher variant to use, either SG_CIPHER_AES_CTR_NOPADDING or SG_CIPHER_AES_CBC_PKCS5
|
|
* @param key the encryption key
|
|
* @param key_len length of the encryption key
|
|
* @param iv the initialization vector
|
|
* @param iv_len length of the initialization vector
|
|
* @param ciphertext the ciphertext to decrypt
|
|
* @param ciphertext_len length of the ciphertext
|
|
* @return 0 on success, negative on failure
|
|
*/
|
|
int omemo_decrypt_func(signal_buffer** output,
|
|
int cipher,
|
|
const uint8_t* key, size_t key_len,
|
|
const uint8_t* iv, size_t iv_len,
|
|
const uint8_t* ciphertext, size_t ciphertext_len,
|
|
void* user_data);
|
|
|
|
int aes128gcm_encrypt(unsigned char* ciphertext, size_t* ciphertext_len,
|
|
unsigned char* tag, size_t* tag_len,
|
|
const unsigned char* const plaintext, size_t plaintext_len,
|
|
const unsigned char* const iv, const unsigned char* const key);
|
|
|
|
int aes128gcm_decrypt(unsigned char* plaintext,
|
|
size_t* plaintext_len, const unsigned char* const ciphertext,
|
|
size_t ciphertext_len, const unsigned char* const iv, size_t iv_len,
|
|
const unsigned char* const key, const unsigned char* const tag);
|
|
|
|
gcry_error_t aes256gcm_crypt_file(FILE* in, FILE* out, off_t file_size,
|
|
unsigned char key[], unsigned char nonce[], gboolean encrypt);
|
|
|
|
char* aes256gcm_create_secure_fragment(unsigned char* key,
|
|
unsigned char* nonce);
|