From 3f8720d70f6b4497ef2369a1e7e9b8fbebb4f5bd Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Thu, 17 Feb 2022 20:57:52 +0100
Subject: [PATCH] build: remove support for old libsignal

Remove support for libsignal-protocol-c < 2.3.2.
Debian 10 uses 2.3.2, Debian 11 and 12 use 2.3.3.
openSUSE from 15.2 onward uses 2.3.3.
Fedora since 28 uses 2.3.2.

We should be good.
---
 configure.ac      |  9 +--------
 src/omemo/store.c | 12 ------------
 src/omemo/store.h |  8 --------
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2246adbf..f625c9c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -324,14 +324,7 @@ if test "x$enable_omemo" != xno; then
    AM_CONDITIONAL([BUILD_OMEMO], [true])
     PKG_CHECK_MODULES([libsignal], [libsignal-protocol-c >= 2.3.2],
         [LIBS="-lsignal-protocol-c $LIBS"],
-        [AC_MSG_NOTICE([libsignal >= 2.3.2 not found, checking for libsignal 2.3.x...])
-         PKG_CHECK_MODULES([libsignal], [libsignal-protocol-c >= 2.3.0],
-            [LIBS="-lsignal-protocol-c $LIBS"
-             AC_DEFINE([HAVE_LIBSIGNAL_LT_2_3_2], [1], [Have libsignal-protocol-c < 2.3.2])],
-            [AM_CONDITIONAL([BUILD_OMEMO], [false])
-             AS_IF([test "x$enable_omemo" = xyes],
-                   [AC_MSG_ERROR([libsignal-protocol-c is required for OMEMO support])],
-                   [AC_MSG_NOTICE([libsignal-protocol-c not found, OMEMO support not enabled])])])])
+        [AC_MSG_NOTICE([libsignal-protocol-c >= 2.3.2 not found, OMEMO support not enabled])])
 
     AC_CHECK_LIB([gcrypt], [gcry_md_extract],
         [LIBS="-lgcrypt $LIBS"],
diff --git a/src/omemo/store.c b/src/omemo/store.c
index d34ebf30..e0fc41ed 100644
--- a/src/omemo/store.c
+++ b/src/omemo/store.c
@@ -68,15 +68,9 @@ identity_key_store_new(identity_key_store_t* identity_key_store)
     identity_key_store->public = NULL;
 }
 
-#ifdef HAVE_LIBSIGNAL_LT_2_3_2
-int
-load_session(signal_buffer** record, const signal_protocol_address* address,
-             void* user_data)
-#else
 int
 load_session(signal_buffer** record, signal_buffer** user_record,
              const signal_protocol_address* address, void* user_data)
-#endif
 {
     GHashTable* session_store = (GHashTable*)user_data;
     GHashTable* device_store = NULL;
@@ -124,17 +118,11 @@ get_sub_device_sessions(signal_int_list** sessions, const char* name,
     return SG_SUCCESS;
 }
 
-#ifdef HAVE_LIBSIGNAL_LT_2_3_2
-int
-store_session(const signal_protocol_address* address, uint8_t* record,
-              size_t record_len, void* user_data)
-#else
 int
 store_session(const signal_protocol_address* address,
               uint8_t* record, size_t record_len,
               uint8_t* user_record, size_t user_record_len,
               void* user_data)
-#endif
 {
     GHashTable* session_store = (GHashTable*)user_data;
     GHashTable* device_store = NULL;
diff --git a/src/omemo/store.h b/src/omemo/store.h
index f84db5ed..bafe2576 100644
--- a/src/omemo/store.h
+++ b/src/omemo/store.h
@@ -68,11 +68,7 @@ void identity_key_store_new(identity_key_store_t* identity_key_store);
  * @param address the address of the remote client
  * @return 1 if the session was loaded, 0 if the session was not found, negative on failure
  */
-#ifdef HAVE_LIBSIGNAL_LT_2_3_2
-int load_session(signal_buffer** record, const signal_protocol_address* address, void* user_data);
-#else
 int load_session(signal_buffer** record, signal_buffer** user_record, const signal_protocol_address* address, void* user_data);
-#endif
 
 /**
  * Returns all known devices with active sessions for a recipient
@@ -94,11 +90,7 @@ int get_sub_device_sessions(signal_int_list** sessions, const char* name, size_t
  * @param record_len length of the serialized session record
  * @return 0 on success, negative on failure
  */
-#ifdef HAVE_LIBSIGNAL_LT_2_3_2
-int store_session(const signal_protocol_address* address, uint8_t* record, size_t record_len, void* user_data);
-#else
 int store_session(const signal_protocol_address* address, uint8_t* record, size_t record_len, uint8_t* user_record, size_t user_record_len, void* user_data);
-#endif
 
 /**
  * Determine whether there is a committed session record for a