From 82e35edff52d88dcd64a9bfc9d2c4c93f1341b78 Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 12 Apr 2015 04:49:13 +0200 Subject: Make early protocol auth mechanism generic, and add SRP Adds everything needed for SRP (and everything works too), but still deactivated, as protocol v25 init packets aren't final yet. Can be activated by changing the LATEST_PROTOCOL_VERSION header to 25 inside networkprotocol.h. --- build/android/jni/Android.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'build/android') diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 2b582051e..206c30ccf 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -208,6 +208,7 @@ LOCAL_SRC_FILES := \ jni/src/version.cpp \ jni/src/voxel.cpp \ jni/src/voxelalgorithms.cpp \ + jni/src/util/auth.cpp \ jni/src/util/base64.cpp \ jni/src/util/directiontables.cpp \ jni/src/util/numeric.cpp \ @@ -215,6 +216,7 @@ LOCAL_SRC_FILES := \ jni/src/util/serialize.cpp \ jni/src/util/sha1.cpp \ jni/src/util/string.cpp \ + jni/src/util/srp.cpp \ jni/src/util/timetaker.cpp \ jni/src/unittest/test.cpp \ jni/src/unittest/test_collision.cpp \ @@ -243,6 +245,8 @@ LOCAL_SRC_FILES := \ jni/src/client/clientlauncher.cpp \ jni/src/client/tile.cpp +# intentionally kept out (we already build openssl itself): jni/src/util/sha256.c + # Network LOCAL_SRC_FILES += \ jni/src/network/connection.cpp \ -- cgit v1.2.3