|
0 |
Index: src/wps/wps_registrar.c
|
|
1 |
===================================================================
|
|
2 |
--- reaver/src/wps/wps_registrar.c (revision 119)
|
|
3 |
+++ reaver/src/wps/wps_registrar.c (working copy)
|
|
4 |
@@ -1695,6 +1695,16 @@
|
|
5 |
wpa_hexdump(MSG_DEBUG, "WPS: Enrollee Nonce",
|
|
6 |
wps->nonce_e, WPS_NONCE_LEN);
|
|
7 |
|
|
8 |
+ printf("[P] E-Nonce: ");
|
|
9 |
+ int pixiecnt = 0;
|
|
10 |
+ for (; pixiecnt < WPS_NONCE_LEN; pixiecnt++) {
|
|
11 |
+ printf("%02x", wps->nonce_e[pixiecnt]);
|
|
12 |
+ if (pixiecnt != WPS_NONCE_LEN - 1) {
|
|
13 |
+ printf(":");
|
|
14 |
+ }
|
|
15 |
+ }
|
|
16 |
+ printf("\n");
|
|
17 |
+
|
|
18 |
return 0;
|
|
19 |
}
|
|
20 |
|
|
21 |
@@ -1753,6 +1763,16 @@
|
|
22 |
os_memcpy(wps->peer_hash1, e_hash1, WPS_HASH_LEN);
|
|
23 |
wpa_hexdump(MSG_DEBUG, "WPS: E-Hash1", wps->peer_hash1, WPS_HASH_LEN);
|
|
24 |
|
|
25 |
+ printf("[P] E-Hash1: ");
|
|
26 |
+ int pixiecnt = 0;
|
|
27 |
+ for (; pixiecnt < WPS_HASH_LEN; pixiecnt++) {
|
|
28 |
+ printf("%02x", wps->peer_hash1[pixiecnt]);
|
|
29 |
+ if (pixiecnt != WPS_HASH_LEN - 1) {
|
|
30 |
+ printf(":");
|
|
31 |
+ }
|
|
32 |
+ }
|
|
33 |
+ printf("\n");
|
|
34 |
+
|
|
35 |
return 0;
|
|
36 |
}
|
|
37 |
|
|
38 |
@@ -1767,6 +1787,16 @@
|
|
39 |
os_memcpy(wps->peer_hash2, e_hash2, WPS_HASH_LEN);
|
|
40 |
wpa_hexdump(MSG_DEBUG, "WPS: E-Hash2", wps->peer_hash2, WPS_HASH_LEN);
|
|
41 |
|
|
42 |
+ printf("[P] E-Hash2: ");
|
|
43 |
+ int pixiecnt = 0;
|
|
44 |
+ for (; pixiecnt < WPS_HASH_LEN; pixiecnt++) {
|
|
45 |
+ printf("%02x", wps->peer_hash2[pixiecnt]);
|
|
46 |
+ if (pixiecnt != WPS_HASH_LEN - 1) {
|
|
47 |
+ printf(":");
|
|
48 |
+ }
|
|
49 |
+ }
|
|
50 |
+ printf("\n");
|
|
51 |
+
|
|
52 |
return 0;
|
|
53 |
}
|
|
54 |
|
|
55 |
@@ -1899,6 +1929,16 @@
|
|
56 |
if (wps->dh_pubkey_e == NULL)
|
|
57 |
return -1;
|
|
58 |
|
|
59 |
+ printf("[P] PKE: ");
|
|
60 |
+ int pixiecnt = 0;
|
|
61 |
+ for (; pixiecnt < 192; pixiecnt++) {
|
|
62 |
+ printf("%02x", pk[pixiecnt]);
|
|
63 |
+ if (pixiecnt != 191) {
|
|
64 |
+ printf(":");
|
|
65 |
+ }
|
|
66 |
+ }
|
|
67 |
+ printf("\n");
|
|
68 |
+
|
|
69 |
return 0;
|
|
70 |
}
|
|
71 |
|
|
72 |
Index: src/wps/wps_dev_attr.c
|
|
73 |
===================================================================
|
|
74 |
--- reaver/src/wps/wps_dev_attr.c (revision 119)
|
|
75 |
+++ reaver/src/wps/wps_dev_attr.c (working copy)
|
|
76 |
@@ -186,6 +186,13 @@
|
|
77 |
|
|
78 |
wpa_hexdump_ascii(MSG_DEBUG, "WPS: Manufacturer", str, str_len);
|
|
79 |
|
|
80 |
+ printf("[P] WPS Manufacturer: ");
|
|
81 |
+ int pixiecnt = 0;
|
|
82 |
+ for (; pixiecnt < str_len; pixiecnt++) {
|
|
83 |
+ printf("%c", (char *) str[pixiecnt]);
|
|
84 |
+ }
|
|
85 |
+ printf("\n");
|
|
86 |
+
|
|
87 |
os_free(dev->manufacturer);
|
|
88 |
dev->manufacturer = os_malloc(str_len + 1);
|
|
89 |
if (dev->manufacturer == NULL)
|
|
90 |
@@ -228,6 +235,13 @@
|
|
91 |
|
|
92 |
wpa_hexdump_ascii(MSG_DEBUG, "WPS: Model Number", str, str_len);
|
|
93 |
|
|
94 |
+ printf("[P] WPS Model Number: ");
|
|
95 |
+ int pixiecnt = 0;
|
|
96 |
+ for (; pixiecnt < str_len; pixiecnt++) {
|
|
97 |
+ printf("%c", (char *) str[pixiecnt]);
|
|
98 |
+ }
|
|
99 |
+ printf("\n");
|
|
100 |
+
|
|
101 |
os_free(dev->model_number);
|
|
102 |
dev->model_number = os_malloc(str_len + 1);
|
|
103 |
if (dev->model_number == NULL)
|
|
104 |
Index: src/wps/wps_common.c
|
|
105 |
===================================================================
|
|
106 |
--- reaver/src/wps/wps_common.c (revision 119)
|
|
107 |
+++ reaver/src/wps/wps_common.c (working copy)
|
|
108 |
@@ -126,6 +126,16 @@
|
|
109 |
wps->keywrapkey, WPS_KEYWRAPKEY_LEN);
|
|
110 |
wpa_hexdump_key(MSG_DEBUG, "WPS: EMSK", wps->emsk, WPS_EMSK_LEN);
|
|
111 |
|
|
112 |
+ printf("[P] AuthKey: ");
|
|
113 |
+ int pixiecnt = 0;
|
|
114 |
+ for (; pixiecnt < WPS_AUTHKEY_LEN; pixiecnt++) {
|
|
115 |
+ printf("%02x", wps->authkey[pixiecnt]);
|
|
116 |
+ if (pixiecnt != WPS_AUTHKEY_LEN - 1) {
|
|
117 |
+ printf(":");
|
|
118 |
+ }
|
|
119 |
+ }
|
|
120 |
+ printf("\n");
|
|
121 |
+
|
|
122 |
return 0;
|
|
123 |
}
|
|
124 |
|