diff --git a/library/x509.c b/library/x509.c
index f74d474..b49ecf3 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -548,9 +548,16 @@
  * but never the other way. (In particular, we don't do Unicode normalisation
  * or space folding.)
  *
+ * Further, this function allows to pass a callback to be triggered for every
+ * pair of well-formed and equal entries in the two input name lists.
+ *
  * Returns:
- * - 0 if both sequences are well-formed and present the same X.509 name.
- * - 1 if a difference was detected.
+ * - 0 if both sequences are well-formed, present the same X.509 name,
+ *   and the callback (if provided) hasn't returned a non-zero value
+ *   on any of the name components.
+ * - 1 if a difference was detected in the name components.
+ * - A non-zero error code if the abort callback returns a non-zero value.
+ *   In this case, the returned error code is the error code from the callback.
  * - A negative error code if a parsing error occurred in either
  *   of the two buffers.
  *
@@ -558,7 +565,11 @@
  * ASN.1 encoded X.509 name by calling it with equal parameters.
  */
 int mbedtls_x509_name_cmp_raw( mbedtls_x509_buf_raw const *a,
-                               mbedtls_x509_buf_raw const *b )
+                               mbedtls_x509_buf_raw const *b,
+                               int (*abort_check)( void *ctx,
+                                             mbedtls_x509_buf *oid,
+                                             mbedtls_x509_buf *val ),
+                               void *abort_check_ctx )
 {
     int ret;
 
@@ -597,6 +608,13 @@
         if( ( set_a == p_a ) != ( set_b == p_b ) )
             return( 1 );
 
+        if( abort_check != NULL )
+        {
+            ret = abort_check( abort_check_ctx, &oid_a, &val_a );
+            if( ret != 0 )
+                return( ret );
+        }
+
         if( p_a == end_a && p_b == end_b )
             break;
     }