Merge pull request #4 from tux-mind/master

make hydra compile under the android ndk

Android.mk

@@ -0,0 +1,104 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_CFLAGS:= -O3 -DLIBOPENSSL -DLIBFIREBIRD -DLIBIDN -DHAVE_PR29_H -DHAVE_PCRE \
+               -DLIBMYSQLCLIENT -DLIBNCP -DLIBPOSTGRES -DLIBSVN -DLIBSSH -DNO_RINDEX \
+               -DHAVE_MATH_H -DHAVE_MYSQL_H -DOPENSSL_NO_DEPRECATED -fdata-sections \
+               -ffunction-sections
+
+LOCAL_LDFLAGS:=-Wl,--gc-sections
+
+LOCAL_C_INCLUDES:= \
+	$(LOCAL_PATH)\
+	external/openssl/include\
+	external/libssh/include\
+	external/libidn/lib\
+	external/libmysqlclient/include\
+	external/subversion/subversion/include\
+	external/apr/include\
+	external/firebird/include\
+	external/libncp/include\
+	external/libpcre
+	
+LOCAL_SRC_FILES:= \
+	bfg.c\
+	crc32.c\
+	d3des.c\
+	hmacmd5.c\
+	hydra-afp.c\
+	hydra-asterisk.c\
+	hydra.c\
+	hydra-cisco.c\
+	hydra-cisco-enable.c\
+	hydra-cvs.c\
+	hydra-firebird.c\
+	hydra-ftp.c\
+	hydra-http.c\
+	hydra-http-form.c\
+	hydra-http-proxy.c\
+	hydra-http-proxy-urlenum.c\
+	hydra-icq.c\
+	hydra-imap.c\
+	hydra-irc.c\
+	hydra-ldap.c\
+	hydra-mod.c\
+	hydra-mssql.c\
+	hydra-mysql.c\
+	hydra-ncp.c\
+	hydra-nntp.c\
+	hydra-oracle.c\
+	hydra-oracle-listener.c\
+	hydra-oracle-sid.c\
+	hydra-pcanywhere.c\
+	hydra-pcnfs.c\
+	hydra-pop3.c\
+	hydra-postgres.c\
+	hydra-rdp.c\
+	hydra-redis.c\
+	hydra-rexec.c\
+	hydra-rlogin.c\
+	hydra-rsh.c\
+	hydra-s7-300.c\
+	hydra-sapr3.c\
+	hydra-sip.c\
+	hydra-smb.c\
+	hydra-smtp.c\
+	hydra-smtp-enum.c\
+	hydra-snmp.c\
+	hydra-socks5.c\
+	hydra-ssh.c\
+	hydra-sshkey.c\
+	hydra-svn.c\
+	hydra-teamspeak.c\
+	hydra-telnet.c\
+	hydra-vmauthd.c\
+	hydra-vnc.c\
+	hydra-xmpp.c\
+	ntlm.c\
+	sasl.c
+
+LOCAL_STATIC_LIBRARIES := \
+	libfbclient \
+	libidn \
+	libmysqlclient \
+	libncp \
+	libpcre \
+	libpcrecpp \
+	libpcreposix \
+	libpq \
+	libssh \
+	libsvn_client-1 \
+	libapr-1 \
+	libaprutil-1 \
+	libiconv\
+	libneon
+						
+LOCAL_SHARED_LIBRARIES := \
+	libcrypto\
+	libssl\
+	libsqlite\
+	libexpat
+					
+LOCAL_MODULE:= hydra
+
+include $(BUILD_EXECUTABLE)

hydra-mysql.c

@@ -22,8 +22,13 @@ void service_mysql(char *ip, int sp, unsigned char options, char *miscptr, FILE
 
 #ifndef LIBMYSQLCLIENT
 #else
-
+#if defined(HAVE_MYSQL_MYSQL_H)
 #include <mysql/mysql.h>
+#elif defined(HAVE_MYSQL_H)
+#include <mysql.h>
+#else
+#error libmysqlclient found, but no usable headers available
+#endif
 MYSQL *mysql = NULL;
 #endif
 

hydra.c

@@ -264,7 +264,9 @@ typedef struct {
 
 // external vars 
 extern char HYDRA_EXIT[5];
+#if !defined(ANDROID) && !defined(__BIONIC__)
 extern int errno;
+#endif
 extern int debug;
 extern int verbose;
 extern int waittime;