Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding ability to build as a shared library #17

Merged
merged 18 commits into from
Jan 17, 2021
Merged

Adding ability to build as a shared library #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6914246
Add make install target, shared library and soname support
henry-nicolas2021 May 24, 2020
88b66ac
added pkgconfig suport
henry-nicolas2021 May 24, 2020
5c2fef5
no longer statically build against libsignal-protocol-c
henry-nicolas2021 May 24, 2020
b7db1bd
Autogenerate PKGCONFIG file through Makefile
henry-nicolas2021 May 25, 2020
cdcc606
pkgconfig file generation with correct Requires field
henry-nicolas2021 May 26, 2020
35a8f61
make linking options OS dependant
henry-nicolas2021 Jul 23, 2020
4fd1c1e
Merge branch 'master' into master
henry-nicolas Jul 23, 2020
42d83be
remove unused variable + cleanups
henry-nicolas2021 Jul 23, 2020
7f9844c
update version to reflect current master
henry-nicolas2021 Jul 23, 2020
7f726f7
cleanup axc.c following gkdr review
henry-nicolas Dec 4, 2020
648849e
align platform flags in Makefile
henry-nicolas2021 Dec 6, 2020
8a7f897
merge dev
henry-nicolas2021 Dec 6, 2020
54ecfc3
upgrade to libsignal-protocol-c v2.3.3
henry-nicolas2021 Dec 6, 2020
ab5efd0
gkdr feedback on unused variable
henry-nicolas2021 Dec 6, 2020
a9ed2e5
merge branch unused-var
henry-nicolas2021 Dec 9, 2020
1ffd384
conditional use of git sub-module
henry-nicolas2021 Dec 10, 2020
eb05259
Re-add the git-submodule for libsignal
henry-nicolas2021 Jan 6, 2021
594f0a2
support test target with both git submodule and linked shared lib
henry-nicolas2021 Jan 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 70 additions & 13 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ MKDIR = mkdir
MKDIR_P = mkdir -p
CMAKE ?= cmake
CMAKE_FLAGS = -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-fPIC
ARCH := $(shell gcc -print-multiarch)
VER_MAJ = 0
VERSION = 0.3.3

AX_DIR=./lib/libsignal-protocol-c
AX_BDIR=$(AX_DIR)/build/src
AX_PATH=$(AX_BDIR)/libsignal-protocol-c.a

PKG_CONFIG ?= pkg-config
GLIB_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags glib-2.0)
Expand All @@ -14,20 +21,20 @@ GLIB_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs glib-2.0)
SQLITE3_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags sqlite3)
SQLITE3_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs sqlite3)

SIGNAL_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags libsignal-protocol-c)
SIGNAL_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs libsignal-protocol-c)

LIBGCRYPT_CONFIG ?= libgcrypt-config
LIBGCRYPT_LDFLAGS ?= $(shell $(LIBGCRYPT_CONFIG) --libs)


SDIR = src
LDIR = lib
BDIR = build
TDIR = test
TFN = test_all
CDIR = coverage

AX_DIR=./lib/libsignal-protocol-c
AX_BDIR=$(AX_DIR)/build/src
AX_PATH=$(AX_BDIR)/libsignal-protocol-c.a

PKGCFG_C=$(GLIB_CFLAGS) \
$(SQLITE3_CFLAGS) \
$(LIBGCRYPT_CFLAGS)
Expand All @@ -36,17 +43,32 @@ PKGCFG_L=$(GLIB_LDFLAGS) \
$(SQLITE3_LDFLAGS) \
$(LIBGCRYPT_LDFLAGS)

HEADERS=-I$(AX_DIR)/src
CFLAGS += $(HEADERS) $(PKGCFG_C) -std=c11 -g -Wall -Wextra -Wpedantic \
-Wstrict-overflow -fno-strict-aliasing -funsigned-char \
-fno-builtin-memset
REQPKG=libsignal-protocol-c
REQPKG:=$(shell pkg-config --exists $(REQPKG) && echo '$(REQPKG)')
ifneq ($(REQPKG),)
PKGCFG_C += $(SIGNAL_CFLAGS)
PKGCFG_L += $(SIGNAL_LDFLAGS)
else
HEADERS=-I$(AX_DIR)/src
PKGCFG_C +=$(HEADERS)
PKGCFG_L +=$(AX_PATH)
endif

ifeq ($(PREFIX),)
PREFIX := /usr/local
endif

CPPFLAGS += -D_XOPEN_SOURCE=700 -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE -D_DEFAULT_SOURCE
TESTFLAGS=$(HEADERS) $(PKGCFG_C) -g -O0 --coverage
PICFLAGS=-fPIC $(CFLAGS)
LDFLAGS += -pthread -ldl $(PKGCFG_L) $(AX_PATH) -lm
CFLAGS += $(PKGCFG_C) -std=c11 -g -Wall -Wextra -Wpedantic \
-Wstrict-overflow -fno-strict-aliasing -funsigned-char \
-fno-builtin-memset -fstack-protector-strong -Wformat -Werror=format-security
TESTFLAGS=$(PKGCFG_C) -g -O0 --coverage -fstack-protector-strong -Wformat -Werror=format-security
LDFLAGS += -pthread -ldl $(PKGCFG_L) -lm
LDFLAGS_T= -lcmocka $(LDFLAGS)
PICFLAGS=-fPIC $(CFLAGS)


all: $(BDIR)/libaxc.a
all: $(BDIR)/libaxc.a shared

$(BDIR):
$(MKDIR_P) $@
Expand All @@ -73,15 +95,50 @@ $(BDIR)/libaxc.a: $(BDIR)/axc.o $(BDIR)/axc_crypto.o $(BDIR)/axc_store.o
$(BDIR)/libaxc-nt.a: $(BDIR)/axc-nt.o $(BDIR)/axc_crypto.o $(BDIR)/axc_store.o
$(AR) rcs $@ $^

$(BDIR)/libaxc.so: $(BDIR)
$(CC) -shared -Wl,-soname,libaxc.so.$(VER_MAJ) -o $@ $(PICFLAGS) $(SDIR)/axc.c $(SDIR)/axc_crypto.c $(SDIR)/axc_store.c $(LDFLAGS) $(CPPFLAGS)

$(BDIR)/libaxc.pc: $(BDIR)
echo 'prefix='$(PREFIX) > $@
echo 'exec_prefix=$${prefix}' >> $@
echo 'libdir=$${prefix}/lib/$(ARCH)' >> $@
echo 'includedir=$${prefix}/include' >> $@
echo 'Name: libaxc' >> $@
echo 'Version: ${VERSION}' >> $@
echo 'Description: client library for libsignal-protocol-c' >> $@
echo 'Requires: libsignal-protocol-c' >> $@
echo 'Cflags: -I$${includedir}/axc' >> $@
echo 'Libs: -L$${libdir} -laxc' >> $@

$(AX_PATH):
cd $(AX_DIR) && \
$(MKDIR_P) build && \
cd build && \
$(CMAKE) $(CMAKE_FLAGS) .. && \
$(MAKE)


shared: $(BDIR)/libaxc.so $(BDIR)/libaxc.pc


install: $(BDIR)
install -d $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/pkgconfig/
install -m 644 $(BDIR)/libaxc.a $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/libaxc.a
install -m 644 $(BDIR)/libaxc.so $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/libaxc.so.$(VERSION)
install -m 644 $(BDIR)/libaxc.pc $(DESTDIR)/$(PREFIX)/lib/$(ARCH)/pkgconfig/
install -d $(DESTDIR)/$(PREFIX)/include/axc/
install -m 644 $(SDIR)/axc.h $(DESTDIR)/$(PREFIX)/include/axc/
install -m 644 $(SDIR)/axc_crypto.h $(DESTDIR)/$(PREFIX)/include/axc/
install -m 644 $(SDIR)/axc_store.h $(DESTDIR)/$(PREFIX)/include/axc/


ifneq ($(REQPKG),)
.PHONY: test
test: test_store test_client
else
.PHONY: test
test: $(AX_PATH) test_store test_client
endif

.PHONY: test_store
test_store: $(SDIR)/axc_store.c $(SDIR)/axc_crypto.c $(TDIR)/test_store.c
Expand All @@ -91,7 +148,7 @@ test_store: $(SDIR)/axc_store.c $(SDIR)/axc_crypto.c $(TDIR)/test_store.c

.PHONY: test_client
test_client: $(SDIR)/axc.c $(SDIR)/axc_crypto.c $(SDIR)/axc_store.c $(TDIR)/test_client.c
$(CC) $(TESTFLAGS) -g $(HEADERS) -o $(TDIR)/$@.o $(SDIR)/axc_crypto.c $(TDIR)/test_client.c $(LDFLAGS_T)
$(CC) $(TESTFLAGS) -o $(TDIR)/$@.o $(SDIR)/axc_crypto.c $(TDIR)/test_client.c $(LDFLAGS_T)
-$(TDIR)/$@.o
mv *.g* $(TDIR)

Expand Down
2 changes: 1 addition & 1 deletion src/axc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include <glib.h>


#include "signal_protocol.h"
#include "key_helper.h"
#include "protocol.h"
Expand Down Expand Up @@ -1071,7 +1072,6 @@ int axc_pre_key_message_process(axc_buf * pre_key_msg_serialized_p, axc_address

pre_key_signal_message * pre_key_msg_p = (void *) 0;
uint32_t new_id = 0;
uint32_t pre_key_id = 0;
session_cipher * session_cipher_p = (void *) 0;
axc_buf * plaintext_p = (void *) 0;
signal_protocol_key_helper_pre_key_list_node * key_l_p = (void *) 0;
Expand Down