diff --git a/library/constant_time.c b/library/constant_time.c
index 9b2a477..f1dbd04 100644
--- a/library/constant_time.c
+++ b/library/constant_time.c
@@ -54,7 +54,7 @@
 static int local_err_translation(psa_status_t status)
 {
     return psa_status_to_mbedtls(status, psa_to_ssl_errors,
-                                 sizeof(psa_to_ssl_errors),
+                                 ARRAY_LENGTH(psa_to_ssl_errors),
                                  psa_generic_status_to_mbedtls);
 }
 #define PSA_TO_MBEDTLS_ERR(status) local_err_translation(status)
diff --git a/library/lmots.c b/library/lmots.c
index a3bfff8..4ef2c51 100644
--- a/library/lmots.c
+++ b/library/lmots.c
@@ -50,7 +50,7 @@
 static int local_err_translation(psa_status_t status)
 {
     return psa_status_to_mbedtls(status, psa_to_lms_errors,
-                                 sizeof(psa_to_lms_errors),
+                                 ARRAY_LENGTH(psa_to_lms_errors),
                                  psa_generic_status_to_mbedtls);
 }
 #define PSA_TO_MBEDTLS_ERR(status) local_err_translation(status)
diff --git a/library/lms.c b/library/lms.c
index 5059570..823ce09 100644
--- a/library/lms.c
+++ b/library/lms.c
@@ -51,7 +51,7 @@
 static int local_err_translation(psa_status_t status)
 {
     return psa_status_to_mbedtls(status, psa_to_lms_errors,
-                                 sizeof(psa_to_lms_errors),
+                                 ARRAY_LENGTH(psa_to_lms_errors),
                                  psa_generic_status_to_mbedtls);
 }
 #define PSA_TO_MBEDTLS_ERR(status) local_err_translation(status)
diff --git a/library/ssl_cookie.c b/library/ssl_cookie.c
index 371edce..098aced 100644
--- a/library/ssl_cookie.c
+++ b/library/ssl_cookie.c
@@ -42,7 +42,7 @@
 static int local_err_translation(psa_status_t status)
 {
     return psa_status_to_mbedtls(status, psa_to_ssl_errors,
-                                 sizeof(psa_to_ssl_errors),
+                                 ARRAY_LENGTH(psa_to_ssl_errors),
                                  psa_generic_status_to_mbedtls);
 }
 #define PSA_TO_MBEDTLS_ERR(status) local_err_translation(status)
diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index f190657..e905023 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -54,7 +54,7 @@
 static int local_err_translation(psa_status_t status)
 {
     return psa_status_to_mbedtls(status, psa_to_ssl_errors,
-                                 sizeof(psa_to_ssl_errors),
+                                 ARRAY_LENGTH(psa_to_ssl_errors),
                                  psa_generic_status_to_mbedtls);
 }
 #define PSA_TO_MBEDTLS_ERR(status) local_err_translation(status)
diff --git a/library/ssl_ticket.c b/library/ssl_ticket.c
index 54c00cc..1adaa07 100644
--- a/library/ssl_ticket.c
+++ b/library/ssl_ticket.c
@@ -36,7 +36,7 @@
 static int local_err_translation(psa_status_t status)
 {
     return psa_status_to_mbedtls(status, psa_to_ssl_errors,
-                                 sizeof(psa_to_ssl_errors),
+                                 ARRAY_LENGTH(psa_to_ssl_errors),
                                  psa_generic_status_to_mbedtls);
 }
 #define PSA_TO_MBEDTLS_ERR(status) local_err_translation(status)
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index fc44dbe..9f3b3be 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -56,7 +56,7 @@
 static int local_err_translation(psa_status_t status)
 {
     return psa_status_to_mbedtls(status, psa_to_ssl_errors,
-                                 sizeof(psa_to_ssl_errors),
+                                 ARRAY_LENGTH(psa_to_ssl_errors),
                                  psa_generic_status_to_mbedtls);
 }
 #define PSA_TO_MBEDTLS_ERR(status) local_err_translation(status)
@@ -64,7 +64,7 @@
 static int local_md_translation(psa_status_t status)
 {
     return psa_status_to_mbedtls(status, psa_to_md_errors,
-                                 sizeof(psa_to_md_errors),
+                                 ARRAY_LENGTH(psa_to_md_errors),
                                  psa_generic_status_to_mbedtls);
 }
 #define PSA_TO_MD_ERR(status) local_md_translation(status)
diff --git a/library/ssl_tls12_client.c b/library/ssl_tls12_client.c
index ade68a9..28f9cdb 100644
--- a/library/ssl_tls12_client.c
+++ b/library/ssl_tls12_client.c
@@ -39,7 +39,7 @@
 static int local_err_translation(psa_status_t status)
 {
     return psa_status_to_mbedtls(status, psa_to_ssl_errors,
-                                 sizeof(psa_to_ssl_errors),
+                                 ARRAY_LENGTH(psa_to_ssl_errors),
                                  psa_generic_status_to_mbedtls);
 }
 #define PSA_TO_MBEDTLS_ERR(status) local_err_translation(status)
diff --git a/library/ssl_tls12_server.c b/library/ssl_tls12_server.c
index 03f9eea..9e122d6 100644
--- a/library/ssl_tls12_server.c
+++ b/library/ssl_tls12_server.c
@@ -41,7 +41,7 @@
 static int local_err_translation(psa_status_t status)
 {
     return psa_status_to_mbedtls(status, psa_to_ssl_errors,
-                                 sizeof(psa_to_ssl_errors),
+                                 ARRAY_LENGTH(psa_to_ssl_errors),
                                  psa_generic_status_to_mbedtls);
 }
 #define PSA_TO_MBEDTLS_ERR(status) local_err_translation(status)
diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index 64d905c..eb733b3 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -40,7 +40,7 @@
 static int local_err_translation(psa_status_t status)
 {
     return psa_status_to_mbedtls(status, psa_to_ssl_errors,
-                                 sizeof(psa_to_ssl_errors),
+                                 ARRAY_LENGTH(psa_to_ssl_errors),
                                  psa_generic_status_to_mbedtls);
 }
 #define PSA_TO_MBEDTLS_ERR(status) local_err_translation(status)
diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c
index 48e6f76..e58c3e5 100644
--- a/library/ssl_tls13_generic.c
+++ b/library/ssl_tls13_generic.c
@@ -44,7 +44,7 @@
 static int local_err_translation(psa_status_t status)
 {
     return psa_status_to_mbedtls(status, psa_to_ssl_errors,
-                                 sizeof(psa_to_ssl_errors),
+                                 ARRAY_LENGTH(psa_to_ssl_errors),
                                  psa_generic_status_to_mbedtls);
 }
 #define PSA_TO_MBEDTLS_ERR(status) local_err_translation(status)
diff --git a/library/ssl_tls13_keys.c b/library/ssl_tls13_keys.c
index 08d10a3..81daf0a 100644
--- a/library/ssl_tls13_keys.c
+++ b/library/ssl_tls13_keys.c
@@ -41,7 +41,7 @@
 static int local_err_translation(psa_status_t status)
 {
     return psa_status_to_mbedtls(status, psa_to_ssl_errors,
-                                 sizeof(psa_to_ssl_errors),
+                                 ARRAY_LENGTH(psa_to_ssl_errors),
                                  psa_generic_status_to_mbedtls);
 }
 #define PSA_TO_MBEDTLS_ERR(status) local_err_translation(status)