From 5fef18514ad30a6c4e7107436602b3a11cbcbe59 Mon Sep 17 00:00:00 2001 From: tux-mind Date: Sun, 29 Nov 2015 19:19:55 +0100 Subject: [PATCH 1/3] use static ssl library and use it before libcrypto --- Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index cf057dd..2afae05 100644 --- a/Android.mk +++ b/Android.mk @@ -91,8 +91,8 @@ LOCAL_STATIC_LIBRARIES := \ libaprutil-1 \ libiconv\ libneon\ - libcrypto_static\ - libssl + libssl_static\ + libcrypto_static LOCAL_SHARED_LIBRARIES := \ libsqlite\ From 2c48dd9e8f28a4626705a1f29c9c64c9af60cc61 Mon Sep 17 00:00:00 2001 From: tux-mind Date: Sun, 29 Nov 2015 19:20:33 +0100 Subject: [PATCH 2/3] define ssl_cert_free as object-scoped --- hydra-rdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hydra-rdp.c b/hydra-rdp.c index 9b747bd..0b54672 100644 --- a/hydra-rdp.c +++ b/hydra-rdp.c @@ -896,7 +896,7 @@ SSL_CERT *ssl_cert_read(uint8 * data, uint32 len) { return d2i_X509(NULL, (D2I_X509_CONST unsigned char **) &data, len); } -void ssl_cert_free(SSL_CERT * cert) { +static void ssl_cert_free(SSL_CERT * cert) { X509_free(cert); } From 8b5956385e65bb0495301f9ff7a4eb08eb0ad07c Mon Sep 17 00:00:00 2001 From: tux-mind Date: Sun, 29 Nov 2015 19:44:25 +0100 Subject: [PATCH 3/3] disabled firebird: SIGSEGV on alloc.cpp:520 --- Android.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Android.mk b/Android.mk index 2afae05..2638e06 100644 --- a/Android.mk +++ b/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_CFLAGS:= -O3 -DLIBOPENSSL -DLIBFIREBIRD -DLIBIDN -DHAVE_PR29_H -DHAVE_PCRE \ +LOCAL_CFLAGS:= -O3 -DLIBOPENSSL -DLIBIDN -DHAVE_PR29_H -DHAVE_PCRE \ -DLIBNCP -DLIBPOSTGRES -DLIBSVN -DLIBSSH -DNO_RINDEX \ -DHAVE_MATH_H -DOPENSSL_NO_DEPRECATED -DNO_RSA_LEGACY \ -fdata-sections -ffunction-sections @@ -15,7 +15,6 @@ LOCAL_C_INCLUDES:= \ external/libidn/lib\ external/subversion/subversion/include\ external/apr/include\ - external/firebird/include\ external/libncp/include\ external/libpcre @@ -78,7 +77,6 @@ LOCAL_SRC_FILES:= \ sasl.c LOCAL_STATIC_LIBRARIES := \ - libfbclient \ libidn \ libncp \ libpcre \