|
| 1 | +From 9a501e6ecdaf65d28362e5888a0529fb734a353e Mon Sep 17 00:00:00 2001 |
| 2 | +From: Leon Adomaitis <leon@adomaitis.de> |
| 3 | +Date: Fri, 27 Mar 2026 02:18:55 +0100 |
| 4 | +Subject: [PATCH] fix(omemo): add missing includes for libomemo-c builds |
| 5 | + |
| 6 | +Signed-off-by: Leon Adomaitis <leon@adomaitis.de> |
| 7 | +--- |
| 8 | + src/omemo/crypto.h | 7 +++++++ |
| 9 | + src/omemo/store.c | 2 +- |
| 10 | + src/omemo/store.h | 8 ++++++-- |
| 11 | + 3 files changed, 14 insertions(+), 3 deletions(-) |
| 12 | + |
| 13 | +diff --git a/src/omemo/crypto.h b/src/omemo/crypto.h |
| 14 | +index 313fcf4ac166..8bca9794e299 100644 |
| 15 | +--- a/src/omemo/crypto.h |
| 16 | ++++ b/src/omemo/crypto.h |
| 17 | +@@ -8,7 +8,14 @@ |
| 18 | + */ |
| 19 | + #include <stdio.h> |
| 20 | + #include <stdbool.h> |
| 21 | ++#include "config.h" |
| 22 | ++ |
| 23 | ++#ifdef HAVE_LIBOMEMO_C |
| 24 | ++#include <omemo/signal_protocol_types.h> |
| 25 | ++#else |
| 26 | + #include <signal/signal_protocol_types.h> |
| 27 | ++#endif |
| 28 | ++ |
| 29 | + #include <gcrypt.h> |
| 30 | + |
| 31 | + #define AES128_GCM_KEY_LENGTH 16 |
| 32 | +diff --git a/src/omemo/store.c b/src/omemo/store.c |
| 33 | +index 3630076e0b2f..761e9b0e0b2f 100644 |
| 34 | +--- a/src/omemo/store.c |
| 35 | ++++ b/src/omemo/store.c |
| 36 | +@@ -7,6 +7,7 @@ |
| 37 | + * SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception |
| 38 | + */ |
| 39 | + #include <glib.h> |
| 40 | ++#include "config.h" |
| 41 | + |
| 42 | + #ifdef HAVE_LIBOMEMO_C |
| 43 | + #include <omemo/signal_protocol.h> |
| 44 | +@@ -14,7 +15,6 @@ |
| 45 | + #include <signal/signal_protocol.h> |
| 46 | + #endif |
| 47 | + |
| 48 | +-#include "config.h" |
| 49 | + #include "log.h" |
| 50 | + #include "omemo/omemo.h" |
| 51 | + #include "omemo/store.h" |
| 52 | +diff --git a/src/omemo/store.h b/src/omemo/store.h |
| 53 | +index 99d1678892dd..23378d76c95c 100644 |
| 54 | +--- a/src/omemo/store.h |
| 55 | ++++ b/src/omemo/store.h |
| 56 | +@@ -6,10 +6,14 @@ |
| 57 | + * |
| 58 | + * SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception |
| 59 | + */ |
| 60 | +-#include <signal/signal_protocol.h> |
| 61 | +- |
| 62 | + #include "config.h" |
| 63 | + |
| 64 | ++#ifdef HAVE_LIBOMEMO_C |
| 65 | ++#include <omemo/signal_protocol.h> |
| 66 | ++#else |
| 67 | ++#include <signal/signal_protocol.h> |
| 68 | ++#endif |
| 69 | ++ |
| 70 | + #define OMEMO_STORE_GROUP_IDENTITY "identity" |
| 71 | + #define OMEMO_STORE_GROUP_PREKEYS "prekeys" |
| 72 | + #define OMEMO_STORE_GROUP_SIGNED_PREKEYS "signed_prekeys" |
| 73 | +-- |
| 74 | +2.53.0 |
| 75 | + |
0 commit comments