diff --git a/src/eap-ttls.c b/src/eap-ttls.c
index a363dbb2..672a47c6 100644
--- a/src/eap-ttls.c
+++ b/src/eap-ttls.c
@@ -375,7 +375,7 @@ static bool avp_iter_next(struct avp_iter *iter)
 
 	len -= TTLS_AVP_HEADER_LEN;
 
-	if (len > end - start)
+	if ((ptrdiff_t) len > end - start)
 		return false;
 
 	if (flags & TTLS_AVP_FLAG_V) {
diff --git a/src/erp.c b/src/erp.c
index 7c11db46..5af18fda 100644
--- a/src/erp.c
+++ b/src/erp.c
@@ -114,8 +114,8 @@ static bool erp_tlv_iter_next(struct erp_tlv_iter *iter)
 {
 	const unsigned char *tlv = iter->tlv + iter->pos;
 	const unsigned char *end = iter->tlv + iter->max;
-	unsigned int tag;
-	unsigned int len;
+	uint8_t tag;
+	uint8_t len;
 
 	if (end - tlv < 2)
 		return false;