diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 35262cb885..06a5ec53dc 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -8231,6 +8231,9 @@ int mbedtls_psa_ecjpake_read_round_one(
         }
     }
 
+    if ( input_offset != len )
+        return PSA_ERROR_INVALID_ARGUMENT;
+
     return( 0 );
 }
 
@@ -8286,6 +8289,9 @@ int mbedtls_psa_ecjpake_read_round_two(
         input_offset += length;
     }
 
+    if ( input_offset != len )
+        return PSA_ERROR_INVALID_ARGUMENT;
+
     return( 0 );
 }