From a4cadf78faabc157e5db00e42302d495bba432c0 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Tue, 7 Jul 2020 13:53:30 +0200 Subject: Revert "Apply coding style" This reverts commit 9b55f2dec0ea27a9ce4856e303425e12f866cea2. Sorting the includes creates some problems. --- src/omemo/omemo.h | 57 +++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 29 deletions(-) (limited to 'src/omemo/omemo.h') diff --git a/src/omemo/omemo.h b/src/omemo/omemo.h index f56bdd68..740654a2 100644 --- a/src/omemo/omemo.h +++ b/src/omemo/omemo.h @@ -34,11 +34,11 @@ */ #include -#include "config/account.h" #include "ui/ui.h" +#include "config/account.h" #define OMEMO_ERR_UNSUPPORTED_CRYPTO -10000 -#define OMEMO_ERR_GCRYPT -20000 +#define OMEMO_ERR_GCRYPT -20000 typedef enum { PROF_OMEMOPOLICY_MANUAL, @@ -48,9 +48,8 @@ typedef enum { typedef struct omemo_context_t omemo_context; -typedef struct omemo_key -{ - unsigned char* data; +typedef struct omemo_key { + unsigned char *data; size_t length; gboolean prekey; uint32_t device_id; @@ -59,39 +58,39 @@ typedef struct omemo_key void omemo_init(void); void omemo_close(void); -void omemo_on_connect(ProfAccount* account); +void omemo_on_connect(ProfAccount *account); void omemo_on_disconnect(void); -void omemo_generate_crypto_materials(ProfAccount* account); -void omemo_key_free(omemo_key_t* key); +void omemo_generate_crypto_materials(ProfAccount *account); +void omemo_key_free(omemo_key_t *key); void omemo_publish_crypto_materials(void); uint32_t omemo_device_id(void); -void omemo_identity_key(unsigned char** output, size_t* length); -void omemo_signed_prekey(unsigned char** output, size_t* length); -void omemo_signed_prekey_signature(unsigned char** output, size_t* length); -void omemo_prekeys(GList** prekeys, GList** ids, GList** lengths); -void omemo_set_device_list(const char* const jid, GList* device_list); -GKeyFile* omemo_identity_keyfile(void); +void omemo_identity_key(unsigned char **output, size_t *length); +void omemo_signed_prekey(unsigned char **output, size_t *length); +void omemo_signed_prekey_signature(unsigned char **output, size_t *length); +void omemo_prekeys(GList **prekeys, GList **ids, GList **lengths); +void omemo_set_device_list(const char *const jid, GList * device_list); +GKeyFile *omemo_identity_keyfile(void); void omemo_identity_keyfile_save(void); -GKeyFile* omemo_trust_keyfile(void); +GKeyFile *omemo_trust_keyfile(void); void omemo_trust_keyfile_save(void); -GKeyFile* omemo_sessions_keyfile(void); +GKeyFile *omemo_sessions_keyfile(void); void omemo_sessions_keyfile_save(void); -char* omemo_format_fingerprint(const char* const fingerprint); -char* omemo_own_fingerprint(gboolean formatted); -void omemo_trust(const char* const jid, const char* const fingerprint); -void omemo_untrust(const char* const jid, const char* const fingerprint); -GList* omemo_known_device_identities(const char* const jid); -gboolean omemo_is_trusted_identity(const char* const jid, const char* const fingerprint); -char* omemo_fingerprint_autocomplete(const char* const search_str, gboolean previous, void* context); +char *omemo_format_fingerprint(const char *const fingerprint); +char *omemo_own_fingerprint(gboolean formatted); +void omemo_trust(const char *const jid, const char *const fingerprint); +void omemo_untrust(const char *const jid, const char *const fingerprint); +GList *omemo_known_device_identities(const char *const jid); +gboolean omemo_is_trusted_identity(const char *const jid, const char *const fingerprint); +char *omemo_fingerprint_autocomplete(const char *const search_str, gboolean previous, void *context); void omemo_fingerprint_autocomplete_reset(void); -gboolean omemo_automatic_start(const char* const recipient); +gboolean omemo_automatic_start(const char *const recipient); void omemo_start_sessions(void); -void omemo_start_session(const char* const barejid); -void omemo_start_muc_sessions(const char* const roomjid); -void omemo_start_device_session(const char* const jid, uint32_t device_id, GList* prekeys, uint32_t signed_prekey_id, const unsigned char* const signed_prekey, size_t signed_prekey_len, const unsigned char* const signature, size_t signature_len, const unsigned char* const identity_key, size_t identity_key_len); +void omemo_start_session(const char *const barejid); +void omemo_start_muc_sessions(const char *const roomjid); +void omemo_start_device_session(const char *const jid, uint32_t device_id, GList *prekeys, uint32_t signed_prekey_id, const unsigned char *const signed_prekey, size_t signed_prekey_len, const unsigned char *const signature, size_t signature_len, const unsigned char *const identity_key, size_t identity_key_len); gboolean omemo_loaded(void); -char* omemo_on_message_send(ProfWin* win, const char* const message, gboolean request_receipt, gboolean muc, const char* const replace_id); -char* omemo_on_message_recv(const char* const from, uint32_t sid, const unsigned char* const iv, size_t iv_len, GList* keys, const unsigned char* const payload, size_t payload_len, gboolean muc, gboolean* trusted); +char * omemo_on_message_send(ProfWin *win, const char *const message, gboolean request_receipt, gboolean muc, const char *const replace_id); +char * omemo_on_message_recv(const char *const from, uint32_t sid, const unsigned char *const iv, size_t iv_len, GList *keys, const unsigned char *const payload, size_t payload_len, gboolean muc, gboolean *trusted); -- cgit 1.4.1-2-gfad0