From 0e6ef089db031b18524aac7209fa2dda38d950c9 Mon Sep 17 00:00:00 2001 From: Lukas Schwaighofer Date: Wed, 26 Jul 2017 01:22:11 +0200 Subject: [PATCH] fix various spelling and typography errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit taken from Debian; the changes were authored by: * Julián Moreno Patiño * Daniel Echeverry --- CHANGES | 2 +- hydra-gtk/make_xhydra.sh | 2 +- hydra-gtk/src/interface.c | 2 +- hydra-gtk/xhydra.glade | 2 +- hydra-http-form.c | 4 ++-- hydra-http.c | 2 +- hydra-ldap.c | 2 +- hydra-mod.c | 2 +- hydra-pop3.c | 2 +- hydra-smtp-enum.c | 2 +- hydra-smtp.c | 2 +- hydra-snmp.c | 2 +- hydra.1 | 4 ++-- hydra.c | 6 +++--- ntlm.c | 2 +- web/CHANGES | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/CHANGES b/CHANGES index 604b0ff..3adf655 100644 --- a/CHANGES +++ b/CHANGES @@ -39,7 +39,7 @@ Release 8.4 * New protocol: rpcap - thanks to Petar Kaleychev * New command line options: -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-ssh: initial check for password auth support now uses login supplied * Fixed dpl4hydra to be able to update from the web again diff --git a/hydra-gtk/make_xhydra.sh b/hydra-gtk/make_xhydra.sh index cf4b8c0..04f4a3a 100755 --- a/hydra-gtk/make_xhydra.sh +++ b/hydra-gtk/make_xhydra.sh @@ -1,7 +1,7 @@ #!/bin/bash PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome/lib/pkgconfig 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 test -e Makefile || { echo "Error: configure wasnt happy. Analyse this:" diff --git a/hydra-gtk/src/interface.c b/hydra-gtk/src/interface.c index 1ad52f4..d93b52a 100644 --- a/hydra-gtk/src/interface.c +++ b/hydra-gtk/src/interface.c @@ -913,7 +913,7 @@ GtkWidget *create_wndMain(void) { gtk_widget_set_name(entTelnet, "entTelnet"); gtk_widget_show(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"); gtk_widget_set_name(label36, "label36"); diff --git a/hydra-gtk/xhydra.glade b/hydra-gtk/xhydra.glade index fab45dd..57df9ac 100644 --- a/hydra-gtk/xhydra.glade +++ b/hydra-gtk/xhydra.glade @@ -2340,7 +2340,7 @@ addresses and/or DNS names. True - Insert the return string for a succesfull login + Insert the return string for a successful login True True True diff --git a/hydra-http-form.c b/hydra-http-form.c index 363e115..1d7e1f4 100644 --- a/hydra-http-form.c +++ b/hydra-http-form.c @@ -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, "^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 (getcookie) { 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) { // proxy with authentication add_header(&ptr_head, "Host", webtarget, HEADER_TYPE_DEFAULT); diff --git a/hydra-http.c b/hydra-http.c index 862bb68..7c8db46 100644 --- a/hydra-http.c +++ b/hydra-http.c @@ -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); 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) 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); diff --git a/hydra-ldap.c b/hydra-ldap.c index a2100c5..ff90d2e 100644 --- a/hydra-ldap.c +++ b/hydra-ldap.c @@ -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" "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" - "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); } diff --git a/hydra-mod.c b/hydra-mod.c index 88229a1..42b9c3b 100644 --- a/hydra-mod.c +++ b/hydra-mod.c @@ -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_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); #if OPENSSL_VERSION_NUMBER < 0x10100000L SSL_CTX_set_tmp_rsa_callback(sslContext, ssl_temp_rsa_cb); diff --git a/hydra-pop3.c b/hydra-pop3.c index 38897d0..fe07eed 100644 --- a/hydra-pop3.c +++ b/hydra-pop3.c @@ -620,7 +620,7 @@ int32_t service_pop3_init(char *ip, int32_t sp, unsigned char options, char *mis #endif 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); diff --git a/hydra-smtp-enum.c b/hydra-smtp-enum.c index c7dccf2..ebcd379 100644 --- a/hydra-smtp-enum.c +++ b/hydra-smtp-enum.c @@ -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) hydra_child_exit(2); 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); } // while (strstr(buf, "220 ") == NULL) { diff --git a/hydra-smtp.c b/hydra-smtp.c index 17df421..b27ec0f 100644 --- a/hydra-smtp.c +++ b/hydra-smtp.c @@ -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) hydra_child_exit(2); 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); hydra_child_exit(2); } diff --git a/hydra-snmp.c b/hydra-snmp.c index f3235e0..5ffc4ef 100644 --- a/hydra-snmp.c +++ b/hydra-snmp.c @@ -301,7 +301,7 @@ int32_t start_snmp(int32_t s, char *ip, int32_t port, unsigned char options, cha i += 2; } else { 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; } diff --git a/hydra.1 b/hydra.1 index 12e2e7c..5d87264 100644 --- a/hydra.1 +++ b/hydra.1 @@ -92,7 +92,7 @@ tried on all logins, then the next password. exit after the first found login/password pair (per host if \-M) .TP .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 .B \-M FILE server list for parallel attacks, one entry per line @@ -130,7 +130,7 @@ verbose mode / show login+pass combination for each attempt debug mode .TP .B \-I -ignore an existing restore file (dont wait 10 seconds) +ignore an existing restore file (don't wait 10 seconds) .TP .B \-h, \-\-help Show summary of options. diff --git a/hydra.c b/hydra.c index b6e21dd..f068807 100644 --- a/hydra.c +++ b/hydra.c @@ -516,7 +516,7 @@ void help(int32_t ext) { "[service://server[:PORT][/OPT]]\n"); PRINT_NORMAL(ext, "\nOptions:\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 " -S perform an SSL connect\n" #endif @@ -2434,7 +2434,7 @@ int32_t main(int32_t argc, char *argv[]) { #endif 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) 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) - 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++) if (hydra_heads[i]->active == HEAD_ACTIVE && hydra_heads[i]->pid > 0) hydra_kill_head(i, 1, 3); diff --git a/ntlm.c b/ntlm.c index 19e54f4..00df4c8 100644 --- a/ntlm.c +++ b/ntlm.c @@ -1321,7 +1321,7 @@ void dumpAuthChallenge(FILE * fp, tSmbNtlmAuthChallenge * challenge) { fprintf(fp, " Flags = %08x\n", IVAL(&challenge->flags, 0)); fprintf(fp, " Challenge = "); 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) { diff --git a/web/CHANGES b/web/CHANGES index 6eee16c..3ae374b 100644 --- a/web/CHANGES +++ b/web/CHANGES @@ -34,7 +34,7 @@ Release 8.4 * New protocol: rpcap - thanks to Petar Kaleychev * New command line options: -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-ssh: initial check for password auth support now uses login supplied * Fixed dpl4hydra to be able to update from the web again