fix various spelling and typography errors

taken from Debian; the changes were authored by:
* Julián Moreno Patiño <julian@debian.org>
* Daniel Echeverry <epsilon77@gmail.com>
This commit is contained in:
Lukas Schwaighofer 2017-07-26 01:22:11 +02:00
parent 21ae638382
commit 0e6ef089db
16 changed files with 20 additions and 20 deletions

View file

@ -39,7 +39,7 @@ Release 8.4
* New protocol: rpcap - thanks to Petar Kaleychev <petar.kaleychev@gmail.com> * New protocol: rpcap - thanks to Petar Kaleychev <petar.kaleychev@gmail.com>
* New command line options: * New command line options:
-y : disables -x 1aA interpretation, thanks to crondaemon for the patch -y : disables -x 1aA interpretation, thanks to crondaemon for the patch
-I : ignore an existing hydra.restore file (dont wait for 10 seconds) -I : ignore an existing hydra.restore file (don't wait for 10 seconds)
* hydra-svn: works now with the current libsvn version * hydra-svn: works now with the current libsvn version
* hydra-ssh: initial check for password auth support now uses login supplied * hydra-ssh: initial check for password auth support now uses login supplied
* Fixed dpl4hydra to be able to update from the web again * Fixed dpl4hydra to be able to update from the web again

View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome/lib/pkgconfig PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome/lib/pkgconfig
export PKG_CONFIG_PATH export PKG_CONFIG_PATH
echo "Trying to compile xhydra now (hydra gtk gui) - dont worry if this fails, this is really optional ..." echo "Trying to compile xhydra now (hydra gtk gui) - don't worry if this fails, this is really optional ..."
./configure > /dev/null 2> errors ./configure > /dev/null 2> errors
test -e Makefile || { test -e Makefile || {
echo "Error: configure wasnt happy. Analyse this:" echo "Error: configure wasnt happy. Analyse this:"

View file

@ -913,7 +913,7 @@ GtkWidget *create_wndMain(void) {
gtk_widget_set_name(entTelnet, "entTelnet"); gtk_widget_set_name(entTelnet, "entTelnet");
gtk_widget_show(entTelnet); gtk_widget_show(entTelnet);
gtk_container_add(GTK_CONTAINER(alignment1), entTelnet); gtk_container_add(GTK_CONTAINER(alignment1), entTelnet);
gtk_tooltips_set_tip(tooltips, entTelnet, "Insert the return string for a succesfull login", NULL); gtk_tooltips_set_tip(tooltips, entTelnet, "Insert the return string for a successful login", NULL);
label36 = gtk_label_new("Telnet - Successful Login String"); label36 = gtk_label_new("Telnet - Successful Login String");
gtk_widget_set_name(label36, "label36"); gtk_widget_set_name(label36, "label36");

View file

@ -2340,7 +2340,7 @@ addresses and/or DNS names.</property>
<child> <child>
<widget class="GtkEntry" id="entTelnet"> <widget class="GtkEntry" id="entTelnet">
<property name="visible">True</property> <property name="visible">True</property>
<property name="tooltip" translatable="yes">Insert the return string for a succesfull login</property> <property name="tooltip" translatable="yes">Insert the return string for a successful login</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="editable">True</property> <property name="editable">True</property>
<property name="visibility">True</property> <property name="visibility">True</property>

View file

@ -612,7 +612,7 @@ int32_t start_http_form(int32_t s, char *ip, int32_t port, unsigned char options
hdrrep(&ptr_head, "^USER^", clogin); hdrrep(&ptr_head, "^USER^", clogin);
hdrrep(&ptr_head, "^PASS^", cpass); hdrrep(&ptr_head, "^PASS^", cpass);
/* again: no snprintf to be portable. dont worry, buffer cant overflow */ /* again: no snprintf to be portable. don't worry, buffer cant overflow */
if (use_proxy == 1 && proxy_authentication[selected_proxy] != NULL) { if (use_proxy == 1 && proxy_authentication[selected_proxy] != NULL) {
if (getcookie) { if (getcookie) {
memset(proxy_string, 0, sizeof(proxy_string)); memset(proxy_string, 0, sizeof(proxy_string));
@ -1199,7 +1199,7 @@ ptr_header_node initialize(char *ip, unsigned char options, char *miscptr) {
} }
} }
/* again: no snprintf to be portable. dont worry, buffer cant overflow */ /* again: no snprintf to be portable. don't worry, buffer cant overflow */
if (use_proxy == 1 && proxy_authentication[selected_proxy] != NULL) { if (use_proxy == 1 && proxy_authentication[selected_proxy] != NULL) {
// proxy with authentication // proxy with authentication
add_header(&ptr_head, "Host", webtarget, HEADER_TYPE_DEFAULT); add_header(&ptr_head, "Host", webtarget, HEADER_TYPE_DEFAULT);

View file

@ -36,7 +36,7 @@ int32_t start_http(int32_t s, char *ip, int32_t port, unsigned char options, cha
sprintf(buffer2, "%.50s:%.50s", login, pass); sprintf(buffer2, "%.50s:%.50s", login, pass);
hydra_tobase64((unsigned char *) buffer2, strlen(buffer2), sizeof(buffer2)); hydra_tobase64((unsigned char *) buffer2, strlen(buffer2), sizeof(buffer2));
/* again: no snprintf to be portable. dont worry, buffer cant overflow */ /* again: no snprintf to be portable. don't worry, buffer cant overflow */
if (use_proxy == 1 && proxy_authentication[selected_proxy] != NULL) if (use_proxy == 1 && proxy_authentication[selected_proxy] != NULL)
sprintf(buffer, "%s http://%s:%d%.250s HTTP/1.1\r\nHost: %s\r\nConnection: close\r\nAuthorization: Basic %s\r\nProxy-Authorization: Basic %s\r\nUser-Agent: Mozilla/4.0 (Hydra)\r\n%s\r\n", sprintf(buffer, "%s http://%s:%d%.250s HTTP/1.1\r\nHost: %s\r\nConnection: close\r\nAuthorization: Basic %s\r\nProxy-Authorization: Basic %s\r\nUser-Agent: Mozilla/4.0 (Hydra)\r\n%s\r\n",
type, webtarget, webport, miscptr, webtarget, buffer2, proxy_authentication[selected_proxy], header); type, webtarget, webport, miscptr, webtarget, buffer2, proxy_authentication[selected_proxy], header);

View file

@ -466,6 +466,6 @@ void usage_ldap(const char* service) {
"Special notes for Simple method has 3 operation modes: anonymous, (no user no pass),\n" "Special notes for Simple method has 3 operation modes: anonymous, (no user no pass),\n"
"unauthenticated (user but no pass), user/pass authenticated (user and pass).\n" "unauthenticated (user but no pass), user/pass authenticated (user and pass).\n"
"So don't forget to set empty string as user/pass to test all modes.\n" "So don't forget to set empty string as user/pass to test all modes.\n"
"Hint: to authenticate to a windows active directy ldap, this is usually\n" "Hint: to authenticate to a windows active directory ldap, this is usually\n"
" cn=^USER^,cn=users,dc=foo,dc=bar,dc=com for domain foo.bar.com\n\n", service); " cn=^USER^,cn=users,dc=foo,dc=bar,dc=com for domain foo.bar.com\n\n", service);
} }

View file

@ -534,7 +534,7 @@ int32_t internal__hydra_connect_to_ssl(int32_t socket, char *hostname) {
// SSL_CTX_set_options(sslContext, SSL_OP_NO_SSLv2); // SSL_CTX_set_options(sslContext, SSL_OP_NO_SSLv2);
// SSL_CTX_set_options(sslContext, SSL_OP_NO_TLSv1); // SSL_CTX_set_options(sslContext, SSL_OP_NO_TLSv1);
/* we set the default verifiers and dont care for the results */ /* we set the default verifiers and don't care for the results */
(void) SSL_CTX_set_default_verify_paths(sslContext); (void) SSL_CTX_set_default_verify_paths(sslContext);
#if OPENSSL_VERSION_NUMBER < 0x10100000L #if OPENSSL_VERSION_NUMBER < 0x10100000L
SSL_CTX_set_tmp_rsa_callback(sslContext, ssl_temp_rsa_cb); SSL_CTX_set_tmp_rsa_callback(sslContext, ssl_temp_rsa_cb);

View file

@ -620,7 +620,7 @@ int32_t service_pop3_init(char *ip, int32_t sp, unsigned char options, char *mis
#endif #endif
if (hydra_send(sock, quit_str, strlen(quit_str), 0) < 0) { if (hydra_send(sock, quit_str, strlen(quit_str), 0) < 0) {
//we dont care if the server is not receiving the quit msg //we don't care if the server is not receiving the quit msg
} }
hydra_disconnect(sock); hydra_disconnect(sock);

View file

@ -182,7 +182,7 @@ void service_smtp_enum(char *ip, int32_t sp, unsigned char options, char *miscpt
if ((buf = hydra_receive_line(sock)) == NULL) if ((buf = hydra_receive_line(sock)) == NULL)
hydra_child_exit(2); hydra_child_exit(2);
if (strstr(buf, "220") == NULL) { if (strstr(buf, "220") == NULL) {
hydra_report(stderr, "Warning: SMTP does not allow to connect: %s\n", buf); hydra_report(stderr, "Warning: SMTP does not allow connecting: %s\n", buf);
hydra_child_exit(2); hydra_child_exit(2);
} }
// while (strstr(buf, "220 ") == NULL) { // while (strstr(buf, "220 ") == NULL) {

View file

@ -290,7 +290,7 @@ void service_smtp(char *ip, int32_t sp, unsigned char options, char *miscptr, FI
if ((buf = hydra_receive_line(sock)) == NULL) if ((buf = hydra_receive_line(sock)) == NULL)
hydra_child_exit(2); hydra_child_exit(2);
if (strstr(buf, "220") == NULL) { if (strstr(buf, "220") == NULL) {
hydra_report(stderr, "[WARNING] SMTP does not allow to connect: %s\n", buf); hydra_report(stderr, "[WARNING] SMTP does not allow connecting: %s\n", buf);
free(buf); free(buf);
hydra_child_exit(2); hydra_child_exit(2);
} }

View file

@ -301,7 +301,7 @@ int32_t start_snmp(int32_t s, char *ip, int32_t port, unsigned char options, cha
i += 2; i += 2;
} else { } else {
buffer[i + 1] = 8; buffer[i + 1] = 8;
memcpy(buffer + i + 2, salt, 8); // uninitialized and we dont care memcpy(buffer + i + 2, salt, 8); // uninitialized and we don't care
i += 10; i += 10;
} }

View file

@ -92,7 +92,7 @@ tried on all logins, then the next password.
exit after the first found login/password pair (per host if \-M) exit after the first found login/password pair (per host if \-M)
.TP .TP
.B \-F .B \-F
exit after the first found login/password pair for any host (for usage with -M) exit after the first found login/password pair for any host (for usage with \-M)
.TP .TP
.B \-M FILE .B \-M FILE
server list for parallel attacks, one entry per line server list for parallel attacks, one entry per line
@ -130,7 +130,7 @@ verbose mode / show login+pass combination for each attempt
debug mode debug mode
.TP .TP
.B \-I .B \-I
ignore an existing restore file (dont wait 10 seconds) ignore an existing restore file (don't wait 10 seconds)
.TP .TP
.B \-h, \-\-help .B \-h, \-\-help
Show summary of options. Show summary of options.

View file

@ -516,7 +516,7 @@ void help(int32_t ext) {
"[service://server[:PORT][/OPT]]\n"); "[service://server[:PORT][/OPT]]\n");
PRINT_NORMAL(ext, "\nOptions:\n"); PRINT_NORMAL(ext, "\nOptions:\n");
PRINT_EXTEND(ext, " -R restore a previous aborted/crashed session\n" PRINT_EXTEND(ext, " -R restore a previous aborted/crashed session\n"
" -I ignore an existing restore file (dont wait 10 seconds)\n" " -I ignore an existing restore file (don't wait 10 seconds)\n"
#ifdef LIBOPENSSL #ifdef LIBOPENSSL
" -S perform an SSL connect\n" " -S perform an SSL connect\n"
#endif #endif
@ -2434,7 +2434,7 @@ int32_t main(int32_t argc, char *argv[]) {
#endif #endif
if (debug) if (debug)
printf("[DEBUG] Ouput color flag is %d\n", colored_output); printf("[DEBUG] Output color flag is %d\n", colored_output);
if (hydra_options.restore && argc > 2 + debug + verbose) if (hydra_options.restore && argc > 2 + debug + verbose)
fprintf(stderr, "[WARNING] options after -R are now honored (since v8.6)\n"); fprintf(stderr, "[WARNING] options after -R are now honored (since v8.6)\n");
@ -4037,7 +4037,7 @@ int32_t main(int32_t argc, char *argv[]) {
} }
if (debug) if (debug)
printf("[DEBUG] killing all remaining childs now that might be stuck\n"); printf("[DEBUG] killing all remaining children now that might be stuck\n");
for (i = 0; i < hydra_options.max_use; i++) for (i = 0; i < hydra_options.max_use; i++)
if (hydra_heads[i]->active == HEAD_ACTIVE && hydra_heads[i]->pid > 0) if (hydra_heads[i]->active == HEAD_ACTIVE && hydra_heads[i]->pid > 0)
hydra_kill_head(i, 1, 3); hydra_kill_head(i, 1, 3);

2
ntlm.c
View file

@ -1321,7 +1321,7 @@ void dumpAuthChallenge(FILE * fp, tSmbNtlmAuthChallenge * challenge) {
fprintf(fp, " Flags = %08x\n", IVAL(&challenge->flags, 0)); fprintf(fp, " Flags = %08x\n", IVAL(&challenge->flags, 0));
fprintf(fp, " Challenge = "); fprintf(fp, " Challenge = ");
dumpRaw(fp, challenge->challengeData, 8); dumpRaw(fp, challenge->challengeData, 8);
fprintf(fp, " Uncomplete!! parse optional parameters\n"); fprintf(fp, " Incomplete!! parse optional parameters\n");
} }
void dumpAuthResponse(FILE * fp, tSmbNtlmAuthResponse * response) { void dumpAuthResponse(FILE * fp, tSmbNtlmAuthResponse * response) {

View file

@ -34,7 +34,7 @@ Release 8.4
* New protocol: rpcap - thanks to Petar Kaleychev <petar.kaleychev@gmail.com> * New protocol: rpcap - thanks to Petar Kaleychev <petar.kaleychev@gmail.com>
* New command line options: * New command line options:
-y : disables -x 1aA interpretation, thanks to crondaemon for the patch -y : disables -x 1aA interpretation, thanks to crondaemon for the patch
-I : ignore an existing hydra.restore file (dont wait for 10 seconds) -I : ignore an existing hydra.restore file (don't wait for 10 seconds)
* hydra-svn: works now with the current libsvn version * hydra-svn: works now with the current libsvn version
* hydra-ssh: initial check for password auth support now uses login supplied * hydra-ssh: initial check for password auth support now uses login supplied
* Fixed dpl4hydra to be able to update from the web again * Fixed dpl4hydra to be able to update from the web again