diff --git a/native/compile-native.sh b/native/compile-native.sh index f37c9fdd..c342e782 100755 --- a/native/compile-native.sh +++ b/native/compile-native.sh @@ -8,7 +8,7 @@ echo "Compiling mbedtls" echo "Compiling zlib" (cd zlib && CFLAGS=-fPIC ./configure --static && make) -CXX="g++ -shared -fPIC -Wl,--wrap=memcpy -O3 -Wall -Werror -I$JAVA_HOME/include/ -I$JAVA_HOME/include/linux/" +CXX="g++ -shared -fPIC -O3 -Wall -Werror -I$JAVA_HOME/include/ -I$JAVA_HOME/include/linux/" $CXX -Imbedtls/include src/main/c/NativeCipherImpl.cpp -o src/main/resources/native-cipher.so mbedtls/library/libmbedcrypto.a $CXX -Izlib src/main/c/NativeCompressImpl.cpp -o src/main/resources/native-compress.so zlib/libz.a diff --git a/native/mbedtls b/native/mbedtls index 8c892249..2ca6c285 160000 --- a/native/mbedtls +++ b/native/mbedtls @@ -1 +1 @@ -Subproject commit 8c89224991adff88d53cd380f42a2baa36f91454 +Subproject commit 2ca6c285a0dd3f33982dd57299012dacab1ff206 diff --git a/native/src/main/c/NativeCipherImpl.cpp b/native/src/main/c/NativeCipherImpl.cpp index 9de328ea..cfe5f089 100644 --- a/native/src/main/c/NativeCipherImpl.cpp +++ b/native/src/main/c/NativeCipherImpl.cpp @@ -4,12 +4,6 @@ #include #include "net_md_5_bungee_jni_cipher_NativeCipherImpl.h" -// Support for CentOS 6 -__asm__(".symver memcpy,memcpy@GLIBC_2.2.5"); -extern "C" void *__wrap_memcpy(void *dest, const void *src, size_t n) { - return memcpy(dest, src, n); -} - typedef unsigned char byte; struct crypto_context { diff --git a/native/src/main/c/NativeCompressImpl.cpp b/native/src/main/c/NativeCompressImpl.cpp index b490ede5..4b93a56a 100644 --- a/native/src/main/c/NativeCompressImpl.cpp +++ b/native/src/main/c/NativeCompressImpl.cpp @@ -4,12 +4,6 @@ #include #include "net_md_5_bungee_jni_zlib_NativeCompressImpl.h" -// Support for CentOS 6 -__asm__(".symver memcpy,memcpy@GLIBC_2.2.5"); -extern "C" void *__wrap_memcpy(void *dest, const void *src, size_t n) { - return memcpy(dest, src, n); -} - typedef unsigned char byte; static jfieldID consumedID; diff --git a/native/src/main/resources/native-cipher.so b/native/src/main/resources/native-cipher.so index 088321f3..843f7f7a 100755 Binary files a/native/src/main/resources/native-cipher.so and b/native/src/main/resources/native-cipher.so differ diff --git a/native/src/main/resources/native-compress.so b/native/src/main/resources/native-compress.so index 4158e87b..408192d5 100755 Binary files a/native/src/main/resources/native-compress.so and b/native/src/main/resources/native-compress.so differ diff --git a/native/zlib b/native/zlib index 4e4e4c4f..92530568 160000 --- a/native/zlib +++ b/native/zlib @@ -1 +1 @@ -Subproject commit 4e4e4c4fbdad9dd034d8f05e2312bf845f0d4d15 +Subproject commit 92530568d2c128b4432467b76a3b54d93d6350bd