treewide: fix typos

autotests/util/testutil.py

@@ -1,5 +1,5 @@
 #! /usr/bin/python3
-# Rougly based on wpa_supplicant's mac80211_hwsim/tools/hwsim_test.c utility.
+# Roughly based on wpa_supplicant's mac80211_hwsim/tools/hwsim_test.c utility.
 import socket
 import fcntl
 import struct

doc/access-point-api.txt

@@ -1,4 +1,4 @@
-Access Point hiearchy
+Access Point hierarchy
 =====================
 
 Service		net.connman.iwd

doc/adhoc-api.txt

@@ -1,4 +1,4 @@
-Ad-Hoc hiearchy
+Ad-Hoc hierarchy
 ===============
 
 Service		net.connman.iwd

doc/features.txt

@@ -71,7 +71,7 @@ on open networks, by using ECDH to negotiate a PMK.
 
 - IWD supports SAE (Simultaneous Authentication of Equals). SAE is required for
 the WPA3 certification. SAE uses a Diffie-Hellman key exchange to produce the
-PMK thats used in the 4-way handshake. Support for hybrid WPA3/WPA2 AP's is
+PMK that's used in the 4-way handshake. Support for hybrid WPA3/WPA2 AP's is
 also implemented, where WPA3 is preferred.
 
 Wireless monitor

doc/network-api.txt

@@ -49,4 +49,4 @@ Properties	string Name [readonly]
 			Contains the path of the KnownNetwork object
 			corresponding to this Network.  If the network
 			is not provisioned or has not been connected to
-			before, the property is ommitted.
+			before, the property is omitted.

doc/station-api.txt

@@ -120,7 +120,7 @@ Methods		void Scan()
 			order.  The number and distance between requested
 			threshold values is a compromise between resolution
 			and the frequency of system wakeups and
-			context-switches that are going to be occuring to
+			context-switches that are going to be occurring to
 			update the client's signal meter.  Only one agent
 			can be registered at any time.
 

doc/wpa-auth.txt

@@ -91,7 +91,7 @@ Overall Process
   AP.
 
 - Once Message 3 is received from the AP, the STA sanity checks certain
-  paremeters (Key Replay Counter, ANonce, MIC).  The RSN received from the AP
+  parameters (Key Replay Counter, ANonce, MIC).  The RSN received from the AP
   is also checked against the one received in Message 3.  If everything checks
   out, then Message 4 is constructed and sent to the AP.
 

monitor/nlmon.c

@@ -2994,7 +2994,7 @@ static void print_p2p_status(unsigned int level, const char *label,
 		{ P2P_STATUS_FAIL_LIMIT_REACHED, "Fail; limit reached" },
 		{ P2P_STATUS_FAIL_INVALID_PARAMS, "Fail; invalid parameters" },
 		{ P2P_STATUS_FAIL_UNABLE_TO_ACCOMMODATE_REQUEST, "Fail; unable "
-			"to accomodate request" },
+			"to accommodate request" },
 		{ P2P_STATUS_FAIL_PREV_PROTOCOL_ERROR, "Fail; previous protocol"
 			" error, or distruptive behavior" },
 		{ P2P_STATUS_FAIL_NO_COMMON_CHANNELS, "Fail; no common "
@@ -3519,7 +3519,7 @@ static void print_p2p_advertised_svc_info(unsigned int level, const char *label,
 
 		print_attr(level, "%s:", label);
 
-		print_attr(level, "Servce advertisement: ID 0x%08x",
+		print_attr(level, "Service advertisement: ID 0x%08x",
 				l_get_le32(bytes + 0));
 		print_wsc_utf8_string(level + 1, "Service Name",
 					bytes + 6, bytes[6], 255);
@@ -4096,7 +4096,7 @@ static void print_public_action_frame(unsigned int level, const uint8_t *body,
 		[22] = "HCCA TXOP Advertisement",
 		[23] = "HCCA TXOP Response",
 		[24] = "Public Key",
-		[25] = "Channel Availabilty Query",
+		[25] = "Channel Availability Query",
 		[26] = "Channel Schedule Management",
 		[27] = "Contact Verification Signal",
 		[28] = "GDD Enablement Request",

monitor/pcap.c

@@ -148,7 +148,7 @@ struct pcap *pcap_create(const char *pathname)
 	}
 
 	if (len != PCAP_HDR_SIZE) {
-		fprintf(stderr, "Written PCAP header size mimatch\n");
+		fprintf(stderr, "Written PCAP header size mismatch\n");
 		goto failed;
 	}
 

plugins/sim_hardcoded.c

@@ -51,7 +51,7 @@ static struct hardcoded_sim *sim;
  * to - result of XOR array
  * a - array 1
  * b - array 2
- * len - size of aray
+ * len - size of array
  */
 #define XOR(to, a, b, len) \
 	for (i = 0; i < len; i++) { \

src/adhoc.c

@@ -227,7 +227,7 @@ static struct eapol_sm *adhoc_new_sm(struct sta_state *sta, bool authenticator,
 
 	handshake_state_set_event_func(hs, adhoc_handshake_event, sta);
 	handshake_state_set_ssid(hs, (void *)adhoc->ssid, strlen(adhoc->ssid));
-	/* we dont have the connecting peer rsn info, so just set ap == own */
+	/* we don't have the connecting peer rsn info, so just set ap == own */
 	handshake_state_set_authenticator_ie(hs, bss_rsne);
 	handshake_state_set_supplicant_ie(hs, bss_rsne);
 	handshake_state_set_pmk(hs, adhoc->pmk, 32);

src/anqputil.c

@@ -148,9 +148,9 @@ char **anqp_parse_nai_realms(const unsigned char *anqp, unsigned int len)
 		/*
 		 * The method list is a variable field, so the only way to
 		 * reliably increment anqp is by realm_len at the very end since
-		 * we dont know how many bytes parse_eap advanced (it does
+		 * we don't know how many bytes parse_eap advanced (it does
 		 * internal length checking so it should not overflow). We
-		 * cant incrementally advance anqp/len, hence the hardcoded
+		 * can't incrementally advance anqp/len, hence the hardcoded
 		 * length and pointer adjustments.
 		 */
 

src/eap-mschapv2.c

@@ -77,7 +77,7 @@ struct mschapv2_response {
 } __attribute__((packed));
 
 /**
- * Generate the asymetric start keys from our mschapv2 master key for MPPE
+ * Generate the asymmetric start keys from our mschapv2 master key for MPPE
  * This function is specified in:
  * https://tools.ietf.org/html/draft-ietf-pppext-mschapv2-keys-02
  *

src/eap-pwd.c

@@ -481,7 +481,7 @@ static void eap_pwd_handle_confirm(struct eap_state *eap,
 
 	/*
 	 * We just need to store clen/plen once. Since all these buffers are
-	 * created with enough bytes in mind we know these wont fail. Also, all
+	 * created with enough bytes in mind we know these won't fail. Also, all
 	 * scalar/point objects were created with the same curve, so it can be
 	 * safe to assume the return values will not change from what clen/plen
 	 * already are.

src/eap-sim.c

@@ -467,7 +467,7 @@ static void handle_challenge(struct eap_state *eap, const uint8_t *pkt,
 		case EAP_SIM_AT_IV:
 		case EAP_SIM_AT_ENCR_DATA:
 		case EAP_SIM_AT_MAC:
-			/* need a case for these so the default wont get hit */
+			/* need a case for these so the default won't get hit */
 			break;
 
 		default:

src/eap-tls-common.c

@@ -401,7 +401,7 @@ static int eap_tls_init_request_assembly(struct eap_state *eap,
 	len -= 4;
 
 	if (!tls_msg_len || tls_msg_len > EAP_TLS_PDU_MAX_LEN) {
-		l_warn("%s: Fragmented pkt size is outside of alowed"
+		l_warn("%s: Fragmented pkt size is outside of allowed"
 				" boundaries [1, %u]", eap_get_method_name(eap),
 							EAP_TLS_PDU_MAX_LEN);
 

src/eap-wsc.c

@@ -986,7 +986,7 @@ static void eap_wsc_handle_request(struct eap_state *eap,
 					wsc->rx_pdu_buf_len >
 							EAP_WSC_PDU_MAX_LEN) {
 				l_warn("Fragmented pkt size is outside of "
-					"alowed boundaries [1, %u]",
+					"allowed boundaries [1, %u]",
 					EAP_WSC_PDU_MAX_LEN);
 				return;
 			}

src/erp.c

@@ -296,7 +296,7 @@ static bool erp_derive_emsk_name(const uint8_t *session_id, size_t session_len,
 /*
  * RFC 6696 - Section 4.1 and 4.3 - rRK and rIK derivation
  *
- * All reauth keys form a hiearchy, and all ultimately are derived from the
+ * All reauth keys form a hierarchy, and all ultimately are derived from the
  * EMSK. All keys follow the rule:
  *
  * "The length of the <key> MUST be equal to the length of the parent key used

src/handshake.c

@@ -145,8 +145,8 @@ static bool handshake_state_setup_own_ciphers(struct handshake_state *s,
 	s->group_management_cipher = info->group_management_cipher;
 
 	/*
-	 * Dont set MFP for OSEN otherwise EAPoL will attempt to negotiate a
-	 * iGTK which is not allowe for OSEN.
+	 * Don't set MFP for OSEN otherwise EAPoL will attempt to negotiate a
+	 * iGTK which is not allowed for OSEN.
 	 */
 	if (!s->osen_ie)
 		s->mfp = info->mfpc;

src/hotspot.c

@@ -212,7 +212,7 @@ static const uint8_t *hotspot_match_roaming_consortium(
 						&rc3, &rc3_len) < 0)
 		return NULL;
 
-	/* rc1 is guarenteed to be set if the above returns success */
+	/* rc1 is guaranteed to be set if the above returns success */
 	if (rc1_len == config->rc_len && !memcmp(rc1, config->rc, rc1_len)) {
 		if (rc_len_out)
 			*rc_len_out = rc1_len;

src/ie.c

@@ -1585,7 +1585,7 @@ int ie_parse_bss_load_from_data(const uint8_t *data, uint8_t len,
 }
 
 /*
- * We have to store this mapping since basic rates dont come with a convenient
+ * We have to store this mapping since basic rates don't come with a convenient
  * MCS index. Rates are stored as they are encoded in the Supported Rates IE.
  * This does not include non 802.11g data rates, e.g. 1/2/4Mbps. This data was
  * taken from 802.11 Section 17.3.10.2 and Table 10-7.
@@ -1994,7 +1994,7 @@ static int ie_parse_vht_capability(struct ie_tlv_iter *vht_iter,
 	 * combinations (width, MCS, NSS), saving the highest data rate we find.
 	 *
 	 * We could calculate a maximum data rate separately for TX/RX, but
-	 * since this is only used for BSS ranking, the minumum between the
+	 * since this is only used for BSS ranking, the minimum between the
 	 * two should be good enough.
 	 */
 	for (width = sizeof(vht_width_map[0]) - 1; width >= 0; width--) {

src/manager.c

@@ -275,7 +275,7 @@ static void manager_get_interface_cb(struct l_genl_msg *msg, void *user_data)
 		return;
 
 	if (wiphy != state->id) {
-		l_debug("Wiphy attribute mis-match, wanted: %u, got %u",
+		l_debug("Wiphy attribute mismatch, wanted: %u, got %u",
 				state->id, wiphy);
 		return;
 	}
@@ -515,7 +515,7 @@ static void manager_new_wiphy_event(struct l_genl_msg *msg)
 	/*
 	 * Until fixed, a NEW_WIPHY event will not include all the information
 	 * that may be available, but a dump will. Because of this we do both
-	 * GET_WIPHY/GET_INTERFACE, same as we would during initalization.
+	 * GET_WIPHY/GET_INTERFACE, same as we would during initialization.
 	 */
 	msg = l_genl_msg_new_sized(NL80211_CMD_GET_WIPHY, 128);
 	l_genl_msg_append_attr(msg, NL80211_ATTR_SPLIT_WIPHY_DUMP, 0, NULL);

src/netdev.c

@@ -227,7 +227,7 @@ struct handshake_state *netdev_handshake_state_new(struct netdev *netdev)
 	nhs->netdev = netdev;
 	/*
 	 * Since GTK/IGTK are optional (NO_GROUP_TRAFFIC), we set them as
-	 * 'installed' upon initalization. If/When the gtk/igtk callback is
+	 * 'installed' upon initialization. If/When the gtk/igtk callback is
 	 * called they will get set to false until we have received a successful
 	 * callback from nl80211. From these callbacks we can check that all
 	 * the keys have been installed, and only then trigger the handshake
@@ -1536,7 +1536,7 @@ static void netdev_qos_map_cb(struct l_genl_msg *msg, void *user_data)
  * to let the kernel know is to receive the IE, then give it right back...
  *
  * The kernel/driver/firmware *could* simply obtain this information as the
- * frame comes in and not require userspace to forward it back... but thats a
+ * frame comes in and not require userspace to forward it back... but that's a
  * battle for another day.
  */
 static void netdev_send_qos_map_set(struct netdev *netdev,
@@ -2401,7 +2401,7 @@ static int netdev_connect_common(struct netdev *netdev,
 	netdev->handshake = hs;
 	netdev->sm = sm;
 	netdev->frequency = bss->frequency;
-	netdev->cur_rssi_low = false; /* Gets udpated on the 1st CQM event */
+	netdev->cur_rssi_low = false; /* Gets updated on the 1st CQM event */
 	netdev->cur_rssi = bss->signal_strength / 100;
 	netdev_rssi_level_init(netdev);
 

src/netdev.h

@@ -87,7 +87,7 @@ typedef void (*netdev_connect_cb_t)(struct netdev *netdev,
  * Notify function for netdev events. Depending on the event type, event_data
  * will have different meanings:
  *
- * NETDEV_EVENT_AUTHENTICATING - unsused
+ * NETDEV_EVENT_AUTHENTICATING - unused
  * NETDEV_EVENT_ASSOCIATING - unused
  * NETDEV_EVENT_LOST_BEACON - unused
  * NETDEV_EVENT_DISCONNECT_BY_AP - MMPDU_REASON_CODE

src/network.c

@@ -552,7 +552,7 @@ int network_autoconnect(struct network *network, struct scan_bss *bss)
 
 	if (!wiphy_select_cipher(wiphy, rsn.pairwise_ciphers) ||
 			!wiphy_select_cipher(wiphy, rsn.group_cipher)) {
-		l_debug("Cipher mis-match");
+		l_debug("Cipher mismatch");
 		ret = -ENETUNREACH;
 		goto close_settings;
 	}

src/sae.c

@@ -354,7 +354,7 @@ static bool sae_build_commit(struct sae_sm *sm, const uint8_t *addr1,
 
 	/*
 	 * Several cases require retransmitting the same commit message. The
-	 * anti-clogging code path requires this as well as the retransmition
+	 * anti-clogging code path requires this as well as the retransmission
 	 * timeout.
 	 */
 old_commit:

src/scan.c

@@ -879,7 +879,7 @@ static bool scan_parse_vendor_specific(struct scan_bss *bss, const void *data,
 
 /*
  * Fully parses the Advertisement Protocol Element. The only thing being looked
- * for is the ANQP protocol ID, but this could be burried behind several other
+ * for is the ANQP protocol ID, but this could be buried behind several other
  * advertisement tuples so the entire IE may need to be parsed.
  */
 static bool scan_parse_advertisement_protocol(struct scan_bss *bss,

src/station.c

@@ -678,7 +678,7 @@ static void station_handshake_event(struct handshake_state *hs,
 	case HANDSHAKE_EVENT_SETTING_KEYS_FAILED:
 	case HANDSHAKE_EVENT_EAP_NOTIFY:
 		/*
-		 * currently we dont care about any other events. The
+		 * currently we don't care about any other events. The
 		 * netdev_connect_cb will notify us when the connection is
 		 * complete.
 		 */
@@ -2068,7 +2068,7 @@ void station_ap_directed_roam(struct station *station,
 
 
 	if (req_mode & WNM_REQUEST_MODE_PREFERRED_CANDIDATE_LIST) {
-		l_debug("roam: AP sent a preffered candidate list");
+		l_debug("roam: AP sent a preferred candidate list");
 		station_neighbor_report_cb(station->netdev, 0, body + pos,
 				body_len - pos,station);
 	} else {
@@ -2162,7 +2162,7 @@ static bool station_retry_with_reason(struct station *station,
 					uint16_t reason_code)
 {
 	/*
-	 * We dont want to cause a retry and blacklist if the password was
+	 * We don't want to cause a retry and blacklist if the password was
 	 * incorrect. Otherwise we would just continue to fail.
 	 *
 	 * Other reason codes can be added here if its decided we want to

src/wsc.c

@@ -90,7 +90,7 @@ static struct l_dbus_message *wsc_error_walk_time_expired(
 	return l_dbus_message_new_error(msg,
 					IWD_WSC_INTERFACE ".WalkTimeExpired",
 					"No APs in PushButton mode found in "
-					"the alloted time");
+					"the allotted time");
 }
 
 static struct l_dbus_message *wsc_error_time_expired(struct l_dbus_message *msg)
@@ -98,7 +98,7 @@ static struct l_dbus_message *wsc_error_time_expired(struct l_dbus_message *msg)
 	return l_dbus_message_new_error(msg,
 					IWD_WSC_INTERFACE ".TimeExpired",
 					"No APs in PIN mode found in "
-					"the alloted time");
+					"the allotted time");
 }
 
 static void wsc_enrollee_connect_cb(struct netdev *netdev,

tools/hwsim.c

@@ -1353,7 +1353,7 @@ static bool interface_info_match_dst(const void *a, const void *b)
 /*
  * Process frames in a similar way to how the kernel built-in hwsim medium
  * does this, with an additional optimization for unicast frames and
- * additonal modifications to frames decided by user-configurable rules.
+ * additional modifications to frames decided by user-configurable rules.
  */
 static void process_frame(struct hwsim_frame *frame)
 {

unit/test-cmac-aes.c

@@ -149,8 +149,8 @@ int main(int argc, char *argv[])
 
 	l_test_add("/cmac-aes/Example 1", cmac_test, &example_1);
 	l_test_add("/cmac-aes/Example 2", cmac_test, &example_2);
-	l_test_add("/cmac-aes/Exmaple 3", cmac_test, &example_3);
-	l_test_add("/cmac-aes/Exmaple 4", cmac_test, &example_4);
+	l_test_add("/cmac-aes/Example 3", cmac_test, &example_3);
+	l_test_add("/cmac-aes/Example 4", cmac_test, &example_4);
 
 done:
 	return l_test_run();

unit/test-ie.c

@@ -78,7 +78,7 @@ static const unsigned char beacon_frame[] = {
 	0xff, 0xff, 0xc8, 0xd7, 0x19, 0x39, 0xbe, 0x77,
 	0xc8, 0xd7, 0x19, 0x39, 0xbe, 0x77, 0x50, 0xa2,
 
-	/* IEEE 802.11 wireless LAN managment frame
+	/* IEEE 802.11 wireless LAN management frame
 	 * - Fixed parameters (12 bytes)
 	 */
 	0x87, 0x81, 0x31, 0xe6, 0x29, 0x02, 0x00, 0x00,
@@ -742,11 +742,11 @@ int main(int argc, char *argv[])
 				ie_test_wpa_build_compact_info,
 				&ie_wpa_info_test_5);
 
-	l_test_add("/ie/Concatentation/WSC/Test Case 1",
+	l_test_add("/ie/Concatenation/WSC/Test Case 1",
 				ie_test_concat_wsc, &ie_tlv_concat_test_data_1);
-	l_test_add("/ie/Concatentation/WSC/Test Case 2",
+	l_test_add("/ie/Concatenation/WSC/Test Case 2",
 				ie_test_concat_wsc, &ie_tlv_concat_test_data_2);
-	l_test_add("/ie/Concatentation/WSC/Test Case 3",
+	l_test_add("/ie/Concatenation/WSC/Test Case 3",
 				ie_test_concat_wsc, &ie_tlv_concat_test_data_3);
 
 	l_test_add("/ie/Encapsulation/WSC/Test Case 1",

unit/test-sae.c

@@ -369,7 +369,7 @@ static void test_malformed_commit(const void *arg)
 
 	len = setup_auth_frame(frame, aa, 1, 0, aa_commit, sizeof(aa_commit));
 
-	/* dont send entire commit */
+	/* don't send entire commit */
 	assert(auth_proto_rx_authenticate(ap, (uint8_t *)frame, len - 20) != 0);
 
 	test_destruct(td);
@@ -394,7 +394,7 @@ static void test_malformed_confirm(const void *arg)
 	frame = alloca(sizeof(struct authenticate_frame) + sizeof(aa_confirm));
 	len = setup_auth_frame(frame, aa, 2, 0, aa_confirm, sizeof(aa_confirm));
 
-	/* dont send entire confirm */
+	/* don't send entire confirm */
 	assert(auth_proto_rx_authenticate(ap, (uint8_t *)frame, len - 10) != 0);
 
 	test_destruct(td);