Merge pull request #538 from animetauren/master

Updating hydra support for freedrdp 3
This commit is contained in:
van Hauser 2020-07-07 18:07:53 +02:00 committed by GitHub
commit df475f1900
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 202 additions and 107 deletions

10
hydra.c
View file

@ -117,7 +117,7 @@ extern int32_t service_oracle_sid_init(char *ip, int32_t sp, unsigned char optio
extern void service_sip(char *ip, int32_t sp, unsigned char options, char *miscptr, FILE *fp, int32_t port, char *hostname);
extern int32_t service_sip_init(char *ip, int32_t sp, unsigned char options, char *miscptr, FILE *fp, int32_t port, char *hostname);
#endif
#ifdef LIBFREERDP2
#ifdef LIBFREERDP
extern void service_rdp(char *ip, int32_t sp, unsigned char options, char *miscptr, FILE *fp, int32_t port, char *hostname);
extern int32_t service_rdp_init(char *ip, int32_t sp, unsigned char options, char *miscptr, FILE *fp, int32_t port, char *hostname);
#endif
@ -426,7 +426,7 @@ static const struct {
#endif
SERVICE(redis),
SERVICE(rexec),
#ifdef LIBFREERDP2
#ifdef LIBFREERDP
SERVICE3("rdp", rdp),
#endif
SERVICE(rlogin),
@ -2239,7 +2239,7 @@ int main(int argc, char *argv[]) {
strcat(unsupported, "SSL-services (ftps, sip, rdp, oracle-services, ...) ");
#endif
#ifndef LIBFREERDP2
#ifndef LIBFREERDP
// for rdp
SERVICES = hydra_string_replace(SERVICES, " rdp", "");
#endif
@ -2907,8 +2907,8 @@ int main(int argc, char *argv[]) {
}
if (strcmp(hydra_options.service, "rdp") == 0) {
#ifndef LIBFREERDP2
bail("Compiled without FREERDP2 support, module not available!");
#ifndef LIBFREERDP
bail("Compiled without FREERDP support, modules not available!");
#endif
}
if (strcmp(hydra_options.service, "pcnfs") == 0) {