Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- # Wash less spaces and colorized info
- --- a/wpsmon.c
- +++ b/wpsmon.c
- @@ -259,8 +259,8 @@
- if (!header_printed) {
- if (o_file_p == 0) {
- - cprintf(INFO, "BSSID Channel RSSI WPS Version WPS Locked ESSID\n");
- - cprintf(INFO, "--------------------------------------------------------------------------------------\n");
- + cprintf(INFO, "\033[1;33mBSSID Channel RSSI Version Locked ESSID\033[0m\n");
- + cprintf(INFO, "\033[1;32m----------------------------------------------------------------------\033[0m\n");
- header_printed = 1;
- }
- @@ -451,7 +451,7 @@
- if (o_file_p == 0) {
- - cprintf(INFO, "%17s %2d %.2d %d.%d %s %s\n", bssid, channel, rssi, (wps->version >> 4), (wps->version & 0x0F), lock_display, ssid);
- + cprintf(INFO, "%17s %2d %.2d %d.%d %s %s\n", bssid, channel, rssi, (wps->version >> 4), (wps->version & 0x0F), lock_display, ssid);
- } else {
- if (get_chipset_output == 1) {
- cprintf(INFO, "%17s|%2d|%.2d|%d.%d|%s|%s|%s|%s|%s\n", bssid, channel, rssi, (wps->version >> 4), (wps->version & 0x0F), lock_display, ssid, info_manufac, info_modelnum, info_modelserial);
- # Colorized M1 M2 M3 M4 M5 M6 M7 messages
- --- a/exchange.c
- +++ b/exchange.c
- @@ -84,7 +84,7 @@
- id_response_sent = 1;
- break;
- case M1:
- - cprintf(VERBOSE, "[+] Received M1 message\n");
- + cprintf(VERBOSE, "[+] Received \033[1;35mM1\033[0m message\n");
- if (id_response_sent && !m2_sent) {
- tx_type = SEND_M2;
- m2_sent = 1;
- @@ -94,7 +94,7 @@
- }
- break;
- case M3:
- - cprintf(VERBOSE, "[+] Received M3 message\n");
- + cprintf(VERBOSE, "[+] Received \033[1;35mM3\033[0m message\n");
- if (m2_sent && !m4_sent) {
- if (globule->pixie_loop == 1) {
- tx_type = SEND_WSC_NACK;
- @@ -111,7 +111,7 @@
- }
- break;
- case M5:
- - cprintf(VERBOSE, "[+] Received M5 message\n");
- + cprintf(VERBOSE, "[+] Received \033[1;35mM5\033[0m message\n");
- if (get_key_status() == KEY1_WIP) {
- set_key_status(KEY2_WIP);
- }
- @@ -124,7 +124,7 @@
- }
- break;
- case M7:
- - cprintf(VERBOSE, "[+] Received M7 message\n");
- + cprintf(VERBOSE, "[+] Received \033[1;35mM7\033[0m message\n");
- //bug fix made by flatr0ze
- if (!m6_sent) {
- tx_type = SEND_WSC_NACK;
- --- b/cracker.c
- +++ a/cracker.c
- @@ -87,12 +87,12 @@
- while (!reassociate()) {
- if (assoc_fail_count == MAX_ASSOC_FAILURES) {
- assoc_fail_count = 0;
- - cprintf(CRITICAL, "[!] WARNING: Failed to associate with %s (ESSID: %s)\n", bssid, get_ssid());
- + cprintf(CRITICAL, "[!] \033[1;31mWARNING\033[1;37m: Failed to associate with %s (ESSID: %s)\033[0m\n", bssid, get_ssid());
- } else {
- assoc_fail_count++;
- }
- }
- - cprintf(INFO, "[+] Associated with %s (ESSID: %s)\n", bssid, get_ssid());
- + cprintf(INFO, "[+] \033[1;32mAssociated with \033[1;33m%s (ESSID: %s)\033[0m\n", bssid, get_ssid());
- /* Used to calculate pin attempt rates */
- start_time = time(NULL);
- @@ -125,7 +125,7 @@
- * Verify that the AP is not locked before attempting the next pin.
- */
- while (get_ignore_locks() == 0 && is_wps_locked()) {
- - cprintf(WARNING, "[!] WARNING: Detected AP rate limiting, waiting %d seconds before re-checking\n", get_lock_delay());
- + cprintf(WARNING, "[!] \033[1;33mWARNING\033[1;37m: Detected AP rate limiting, waiting %d seconds before re-checking\033[0m\n", get_lock_delay());
- pcap_sleep(get_lock_delay());
- }
- @@ -143,7 +143,7 @@
- cprintf(CRITICAL, "[-] Failed to generate the next payload\n");
- break;
- } else {
- - cprintf(WARNING, "[+] Trying pin %s.\n", pin);
- + cprintf(WARNING, "[+] \033[1;32mTrying pin \033[1;36m%s\033[0m\n", pin);
- }
- /*
- @@ -154,7 +154,7 @@
- while (!reassociate()) {
- if (assoc_fail_count == MAX_ASSOC_FAILURES) {
- assoc_fail_count = 0;
- - cprintf(CRITICAL, "[!] WARNING: Failed to associate with %s (ESSID: %s)\n", bssid, get_ssid());
- + cprintf(CRITICAL, "[!] \033[1;33mWARNING\033[1;37m: Failed to associate with %s (ESSID: %s)\033[0m\n", bssid, get_ssid());
- } else {
- assoc_fail_count++;
- }
- @@ -211,7 +211,7 @@
- /* If we've had an excessive number of message failures in a row, print a warning */
- if (fail_count == WARN_FAILURE_COUNT) {
- - cprintf(WARNING, "[!] WARNING: %d failed connections in a row\n", fail_count);
- + cprintf(WARNING, "[!] \033[1;33mWARNING\033[1;37m: %d failed connections in a row\033[0m\n", fail_count);
- fail_count = 0;
- pcap_sleep(get_fail_delay());
- }
- @@ -387,7 +387,7 @@
- }
- - cprintf(INFO, "[+] %.2f%% complete. Elapsed time: %id%ih%im%is.\n", percentage, days, hours, minutes, seconds);
- + cprintf(INFO, "[+] \033[1;33m%.2f%% complete. Elapsed time: %id%ih%im%is.\033[0m\n", percentage, days, hours, minutes, seconds);
- if (last_display && attempts != last_attempts) {
- expected = ((now - last_display) / (attempts - last_attempts)) * (get_max_pin_attempts() - attempts);
- if (expected > 0) {
- --- a/wps/wps_registrar.c
- +++ b/wps/wps_registrar.c
- @@ -1521,7 +1521,7 @@
- case SEND_M2:
- if (wps_get_dev_password(wps) >= 0) {
- msg = wps_build_m2(wps);
- - cprintf(VERBOSE, "[+] Sending M2 message\n");
- + cprintf(VERBOSE, "[+] Sending \033[1;35mM2\033[0m message\n");
- *op_code = WSC_MSG;
- break;
- }
- @@ -1533,17 +1533,17 @@
- break;
- case SEND_M4:
- msg = wps_build_m4(wps);
- - cprintf(VERBOSE, "[+] Sending M4 message\n");
- + cprintf(VERBOSE, "[+] Sending \033[1;35mM4\033[0m message\n");
- *op_code = WSC_MSG;
- break;
- case SEND_M6:
- msg = wps_build_m6(wps);
- - cprintf(VERBOSE, "[+] Sending M6 message\n");
- + cprintf(VERBOSE, "[+] Sending \033[1;35mM6\033[0m message\n");
- *op_code = WSC_MSG;
- break;
- case SEND_M8:
- msg = wps_build_m8(wps);
- - cprintf(VERBOSE, "[+] Sending M8 message\n");
- + cprintf(VERBOSE, "[+] Sending \033[1;35mM8\033[0m message\n");
- *op_code = WSC_MSG;
- break;
- case RECV_DONE:
- @@ -2429,7 +2429,7 @@
- static enum wps_process_res wps_process_m3(struct wps_data *wps,
- const struct wpabuf *msg,
- struct wps_parse_attr *attr) {
- - wpa_printf(MSG_DEBUG, "WPS: Received M3");
- + wpa_printf(MSG_DEBUG, "WPS: Received \033[1;35mM3\033[0m");
- if (wps->state != RECV_M3) {
- wpa_printf(MSG_DEBUG, "WPS: Unexpected state (%d) for "
- --- a/wps/wps_enrollee.c
- +++ b/wps/wps_enrollee.c
- @@ -113,7 +113,7 @@
- wpa_hexdump(MSG_DEBUG, "WPS: Enrollee Nonce",
- wps->nonce_e, WPS_NONCE_LEN);
- - wpa_printf(MSG_DEBUG, "WPS: Building Message M1");
- + wpa_printf(MSG_DEBUG, "WPS: Building Message \033[1;35mM1\033[0m");
- msg = wpabuf_alloc(1000);
- if (msg == NULL)
- return NULL;
- @@ -146,7 +146,7 @@
- static struct wpabuf * wps_build_m3(struct wps_data *wps) {
- struct wpabuf *msg;
- - wpa_printf(MSG_DEBUG, "WPS: Building Message M3");
- + wpa_printf(MSG_DEBUG, "WPS: Building Message \033[1;35mM3\033[0m");
- if (wps->dev_password == NULL) {
- wpa_printf(MSG_DEBUG, "WPS: No Device Password available");
- @@ -174,7 +174,7 @@
- static struct wpabuf * wps_build_m5(struct wps_data *wps) {
- struct wpabuf *msg, *plain;
- - wpa_printf(MSG_DEBUG, "WPS: Building Message M5");
- + wpa_printf(MSG_DEBUG, "WPS: Building Message \033[1;35mM5\033[0m");
- plain = wpabuf_alloc(200);
- if (plain == NULL)
- @@ -261,7 +261,7 @@
- static struct wpabuf * wps_build_m7(struct wps_data *wps) {
- struct wpabuf *msg, *plain;
- - wpa_printf(MSG_DEBUG, "WPS: Building Message M7");
- + wpa_printf(MSG_DEBUG, "WPS: Building Message \033[1;35mM7\033[0m");
- plain = wpabuf_alloc(500 + wps->wps->ap_settings_len);
- if (plain == NULL)
- @@ -703,7 +703,7 @@
- const struct wpabuf *msg,
- struct wps_parse_attr *attr) {
- - wpa_printf(MSG_DEBUG, "WPS: Received M2");
- + wpa_printf(MSG_DEBUG, "WPS: Received \033[1;35mM2\033[0m");
- if (wps->state != RECV_M2) {
- wpa_printf(MSG_DEBUG, "WPS: Unexpected state (%d) for "
- @@ -798,7 +798,7 @@
- struct wpabuf *decrypted;
- struct wps_parse_attr eattr;
- - wpa_printf(MSG_DEBUG, "WPS: Received M4");
- + wpa_printf(MSG_DEBUG, "WPS: Received \033[1;35mM4\033[0m");
- if (wps->state != RECV_M4) {
- wpa_printf(MSG_DEBUG, "WPS: Unexpected state (%d) for "
- @@ -845,7 +845,7 @@
- struct wpabuf *decrypted;
- struct wps_parse_attr eattr;
- - wpa_printf(MSG_DEBUG, "WPS: Received M6");
- + wpa_printf(MSG_DEBUG, "WPS: Received \033[1;35mM6\033[0m");
- if (wps->state != RECV_M6) {
- wpa_printf(MSG_DEBUG, "WPS: Unexpected state (%d) for "
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement