aboutsummaryrefslogtreecommitdiff
path: root/android/olm-sdk/src/main/jni/Android.mk
diff options
context:
space:
mode:
authorValere <valeref@matrix.org>2019-03-26 14:30:19 +0100
committerValere <valeref@matrix.org>2019-04-10 12:24:00 +0200
commitc9369a4383714c8656fc0ee72965e46476a56691 (patch)
tree97c3c69d68c43fc6e29590c938db56461216a34a /android/olm-sdk/src/main/jni/Android.mk
parentebc156e7c272e08e375c3e704651b179541e078b (diff)
E2E: SAS Verification (olm)
Fix / missing free() on some errors Added doc regarding string encoding for keys cleaning
Diffstat (limited to 'android/olm-sdk/src/main/jni/Android.mk')
-rw-r--r--android/olm-sdk/src/main/jni/Android.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/android/olm-sdk/src/main/jni/Android.mk b/android/olm-sdk/src/main/jni/Android.mk
index 0d98f69..101346b 100644
--- a/android/olm-sdk/src/main/jni/Android.mk
+++ b/android/olm-sdk/src/main/jni/Android.mk
@@ -41,6 +41,7 @@ $(SRC_ROOT_DIR)/src/ratchet.cpp \
$(SRC_ROOT_DIR)/src/session.cpp \
$(SRC_ROOT_DIR)/src/utility.cpp \
$(SRC_ROOT_DIR)/src/pk.cpp \
+$(SRC_ROOT_DIR)/src/sas.c \
$(SRC_ROOT_DIR)/src/ed25519.c \
$(SRC_ROOT_DIR)/src/error.c \
$(SRC_ROOT_DIR)/src/inbound_group_session.c \
@@ -57,7 +58,8 @@ olm_inbound_group_session.cpp \
olm_outbound_group_session.cpp \
olm_utility.cpp \
olm_manager.cpp \
-olm_pk.cpp
+olm_pk.cpp \
+olm_sas.cpp
LOCAL_LDLIBS := -llog