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