Merge pull request #82 from tux-mind/patch-1

use static version of the ssl library
This commit is contained in:
van Hauser 2015-11-30 08:34:40 +01:00
commit fe116d716c
2 changed files with 4 additions and 6 deletions

View file

@ -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 \
@ -91,8 +89,8 @@ LOCAL_STATIC_LIBRARIES := \
libaprutil-1 \
libiconv\
libneon\
libcrypto_static\
libssl
libssl_static\
libcrypto_static
LOCAL_SHARED_LIBRARIES := \
libsqlite\

View file

@ -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);
}