diff --git a/src/eapolutil.h b/src/eapolutil.h
index b26e6799..17ea992e 100644
--- a/src/eapolutil.h
+++ b/src/eapolutil.h
@@ -32,7 +32,7 @@ enum eapol_protocol_version {
 };
 
 /*
- * 802.1X-2010: Table 11-5—Descriptor Type value assignments
+ * 802.1X-2010: Table 11-5-Descriptor Type value assignments
  * The WPA key type of 254 comes from somewhere else.  Seems it is a legacy
  * value that might still be used by older implementations
  */
diff --git a/src/ft.c b/src/ft.c
index 835d7026..85d2d369 100644
--- a/src/ft.c
+++ b/src/ft.c
@@ -254,10 +254,10 @@ static int ft_tx_reassociate(struct ft_sm *ft)
 		 * MDE + FTE.
 		 *
 		 * 12.8.4: "If present, the RSNE shall be set as follows:
-		 * — Version field shall be set to 1.
-		 * — PMKID Count field shall be set to 1.
-		 * — PMKID field shall contain the PMKR1Name.
-		 * — All other fields shall be as specified in 8.4.2.27
+		 * - Version field shall be set to 1.
+		 * - PMKID Count field shall be set to 1.
+		 * - PMKID field shall contain the PMKR1Name.
+		 * - All other fields shall be as specified in 8.4.2.27
 		 *   and 11.5.3."
 		 */
 		if (ie_parse_rsne_from_data(hs->supplicant_ie,
@@ -287,14 +287,14 @@ static int ft_tx_reassociate(struct ft_sm *ft)
 
 		/*
 		 * 12.8.4: "If present, the FTE shall be set as follows:
-		 * — ANonce, SNonce, R0KH-ID, and R1KH-ID shall be set to
+		 * - ANonce, SNonce, R0KH-ID, and R1KH-ID shall be set to
 		 *   the values contained in the second message of this
 		 *   sequence.
-		 * — The Element Count field of the MIC Control field shall
+		 * - The Element Count field of the MIC Control field shall
 		 *   be set to the number of elements protected in this
 		 *   frame (variable).
 		 * [...]
-		 * — All other fields shall be set to 0."
+		 * - All other fields shall be set to 0."
 		 */
 
 		memset(&ft_info, 0, sizeof(ft_info));
@@ -389,11 +389,11 @@ static bool ft_verify_rsne(const uint8_t *rsne, const uint8_t *pmk_r0_name,
 	 *
 	 * 12.8.3: "The RSNE shall be present only if dot11RSNAActivated
 	 * is true. If present, the RSNE shall be set as follows:
-	 * — Version field shall be set to 1.
-	 * — PMKID Count field shall be set to 1.
-	 * — PMKID List field shall be set to the value contained in the
+	 * - Version field shall be set to 1.
+	 * - PMKID Count field shall be set to 1.
+	 * - PMKID List field shall be set to the value contained in the
 	 *   first message of this sequence.
-	 * — All other fields shall be identical to the contents of the
+	 * - All other fields shall be identical to the contents of the
 	 *   RSNE advertised by the AP in Beacon and Probe Response frames."
 	 */
 
@@ -429,15 +429,15 @@ static bool ft_parse_fte(struct handshake_state *hs,
 	 *
 	 * 12.8.3: "The FTE shall be present only if dot11RSNAActivated is
 	 * true. If present, the FTE shall be set as follows:
-	 * — R0KH-ID shall be identical to the R0KH-ID provided by the FTO
+	 * - R0KH-ID shall be identical to the R0KH-ID provided by the FTO
 	 *   in the first message.
-	 * — R1KH-ID shall be set to the R1KH-ID of the target AP, from
+	 * - R1KH-ID shall be set to the R1KH-ID of the target AP, from
 	 *   dot11FTR1KeyHolderID.
-	 * — ANonce shall be set to a value chosen randomly by the target AP,
+	 * - ANonce shall be set to a value chosen randomly by the target AP,
 	 *   following the recommendations of 11.6.5.
-	 * — SNonce shall be set to the value contained in the first message
+	 * - SNonce shall be set to the value contained in the first message
 	 *   of this sequence.
-	 * — All other fields shall be set to 0."
+	 * - All other fields shall be set to 0."
 	 */
 	uint8_t zeros[24] = {};
 	uint32_t kck_len = handshake_state_get_kck_len(hs);
@@ -608,10 +608,10 @@ static int ft_rx_associate(struct auth_proto *ap, const uint8_t *frame,
 	 *
 	 * 12.8.5: "The RSNE shall be present only if dot11RSNAActivated is
 	 * true. If present, the RSNE shall be set as follows:
-	 * — Version field shall be set to 1.
-	 * — PMKID Count field shall be set to 1.
-	 * — PMKID field shall contain the PMKR1Name
-	 * — All other fields shall be identical to the contents of the RSNE
+	 * - Version field shall be set to 1.
+	 * - PMKID Count field shall be set to 1.
+	 * - PMKID field shall contain the PMKR1Name
+	 * - All other fields shall be identical to the contents of the RSNE
 	 *   advertised by the target AP in Beacon and Probe Response frames."
 	 */
 	if (is_rsn) {
@@ -743,10 +743,10 @@ bool ft_build_authenticate_ies(struct handshake_state *hs,
 		 * MDE + FTE.
 		 *
 		 * 12.8.2: "If present, the RSNE shall be set as follows:
-		 * — Version field shall be set to 1.
-		 * — PMKID Count field shall be set to 1.
-		 * — PMKID List field shall contain the PMKR0Name.
-		 * — All other fields shall be as specified in 8.4.2.27
+		 * - Version field shall be set to 1.
+		 * - PMKID Count field shall be set to 1.
+		 * - PMKID List field shall contain the PMKR0Name.
+		 * - All other fields shall be as specified in 8.4.2.27
 		 *   and 11.5.3."
 		 */
 		if (ie_parse_rsne_from_data(hs->supplicant_ie,
@@ -772,12 +772,12 @@ bool ft_build_authenticate_ies(struct handshake_state *hs,
 
 		/*
 		 * 12.8.2: "If present, the FTE shall be set as follows:
-		 * — R0KH-ID shall be the value of R0KH-ID obtained by the
+		 * - R0KH-ID shall be the value of R0KH-ID obtained by the
 		 *   FTO during its FT initial mobility domain association
 		 *   exchange.
-		 * — SNonce shall be set to a value chosen randomly by the
+		 * - SNonce shall be set to a value chosen randomly by the
 		 *   FTO, following the recommendations of 11.6.5.
-		 * — All other fields shall be set to 0."
+		 * - All other fields shall be set to 0."
 		 */
 
 		memset(&ft_info, 0, sizeof(ft_info));
diff --git a/src/ie.c b/src/ie.c
index 46f7496e..0f430b98 100644
--- a/src/ie.c
+++ b/src/ie.c
@@ -740,7 +740,7 @@ static int parse_ciphers(const uint8_t *data, size_t len,
 	out_info->extended_key_id = test_bit(data + 1, 5);
 
 	/*
-	 * BIP—default group management cipher suite in an RSNA with
+	 * BIP-default group management cipher suite in an RSNA with
 	 * management frame protection enabled
 	 */
 	if (out_info->mfpc)
@@ -1931,7 +1931,7 @@ static int ie_parse_ht_capability_from_data(const uint8_t *data, uint8_t len,
  *
  * For simplicity, we are ignoring the Extended BSS BW support, per NOTE 11:
  *
- * NOTE 11—A receiving STA in which dot11VHTExtendedNSSCapable is false will
+ * NOTE 11-A receiving STA in which dot11VHTExtendedNSSCapable is false will
  * ignore the Extended NSS BW Support subfield and effectively evaluate this
  * table only at the entries where Extended NSS BW Support is 0.
  *
diff --git a/src/sae.c b/src/sae.c
index 98050483..a7a357f5 100644
--- a/src/sae.c
+++ b/src/sae.c
@@ -552,7 +552,7 @@ static int sae_process_commit(struct sae_sm *sm, const uint8_t *from,
 	/*
 	 * IEEE 802.11-2016 - Section 12.4.4.2.1 ECC group definition
 	 * ECC groups make use of a mapping function, F, that maps a
-	 * point (x, y) that satisfies the curve equation to its x-coordinate—
+	 * point (x, y) that satisfies the curve equation to its x-coordinate-
 	 * i.e., if P = (x, y) then F(P) = x.
 	 */
 	klen = l_ecc_point_get_x(k_point, k, sizeof(k));