MultiCraftProject
/
MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mobile: add SSL support

master
MoNTE48 2021-09-17 10:24:47 +02:00
parent 3e36fcbc4a
commit d3e0c28c54
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
build/android/native/jni/Android.mk
View File

@ -4,7 +4,7 @@ LOCAL_PATH := $(call my-dir)/..
include $(CLEAR_VARS)
LOCAL_MODULE := Curl
LOCAL_SRC_FILES := deps/Android/Curl/${NDK_TOOLCHAIN_VERSION}_nossl/$(APP_ABI)/libcurl.a
LOCAL_SRC_FILES := deps/Android/Curl/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libcurl.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
@ -27,6 +27,21 @@ LOCAL_MODULE := LuaJIT
LOCAL_SRC_FILES := deps/Android/LuaJIT/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libluajit.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := mbedTLS
LOCAL_SRC_FILES := deps/Android/mbedTLS/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libmbedtls.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := mbedx509
LOCAL_SRC_FILES := deps/Android/mbedTLS/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libmbedx509.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := mbedcrypto
LOCAL_SRC_FILES := deps/Android/mbedTLS/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libmbedcrypto.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := OpenAL
LOCAL_SRC_FILES := deps/Android/OpenAL-Soft/${NDK_TOOLCHAIN_VERSION}/$(APP_ABI)/libopenal.a
@ -232,7 +247,7 @@ LOCAL_SRC_FILES += ../../../lib/jsoncpp/jsoncpp.cpp
# Lua UTF-8 Lib
LOCAL_SRC_FILES += ../../../lib/luautf8/lutf8lib.c
LOCAL_STATIC_LIBRARIES += Curl Gettext Freetype Irrlicht LevelDB OpenAL Vorbis LuaJIT android_native_app_glue $(PROFILER_LIBS)
LOCAL_STATIC_LIBRARIES += Curl Gettext Freetype Irrlicht LevelDB OpenAL mbedTLS mbedx509 mbedcrypto Vorbis LuaJIT android_native_app_glue $(PROFILER_LIBS)
LOCAL_LDLIBS := -lEGL -lGLESv1_CM -lGLESv2 -landroid -lOpenSLES

6
build/iOS/deps/libcurl.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash -e
. sdk.sh
CURL_VERSION=7.75.0
CURL_VERSION=7.79.0
if [ ! -d libcurl-src ]; then
wget https://curl.haxx.se/download/curl-$CURL_VERSION.tar.gz
@ -18,10 +18,10 @@ CFLAGS="$IOS_FLAGS" \
--enable-hidden-symbols --disable-dependency-tracking \
--disable-ares --disable-cookies --disable-crypto-auth --disable-manual \
--disable-proxy --disable-unix-sockets --without-libidn --without-librtmp \
--without-ssl --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp \
--disable-ftp --disable-ldap --disable-ldaps --disable-rtsp \
--disable-dict --disable-telnet --disable-tftp --disable-pop3 \
--disable-imap --disable-smtp --disable-gopher --disable-sspi \
--disable-libcurl-option
--disable-libcurl-option --with-secure-transport
make -j
mkdir -p ../libcurl/{lib,include}

4
src/serverlist.cpp
View File

@ -70,13 +70,13 @@ std::vector<ServerListSpec> getLocal()
std::vector<ServerListSpec> getOnline(const std::string &url)
{
std::ostringstream geturl;
const std::string list = base64_decode("OjMwMDAvc2VydmVybGlzdC5qc29u");
const std::string list = base64_decode("bGlzdF9wcm9k");
u16 proto_version_min = g_settings->getFlag("send_pre_v25_init") ?
CLIENT_PROTOCOL_VERSION_MIN_LEGACY : CLIENT_PROTOCOL_VERSION_MIN;
geturl << url <<
list << "?proto_version_min=" << proto_version_min <<
"/" << list << "?proto_version_min=" << proto_version_min <<
"&proto_version_max=" << CLIENT_PROTOCOL_VERSION_MAX;
Json::Value root = fetchJsonValue(geturl.str(), NULL);