diff --git a/library/pkcs7.c b/library/pkcs7.c
index 3481cbdb1b..5810506c34 100644
--- a/library/pkcs7.c
+++ b/library/pkcs7.c
@@ -704,9 +704,9 @@ static int mbedtls_pkcs7_data_or_hash_verify(mbedtls_pkcs7 *pkcs7,
      * failed to validate'.
      */
     for (signer = &pkcs7->signed_data.signers; signer; signer = signer->next) {
-        ret = mbedtls_pk_verify(&pk_cxt, md_alg, hash,
+        ret = mbedtls_pk_verify_restartable(&pk_cxt, md_alg, hash,
                                 mbedtls_md_get_size(md_info),
-                                signer->sig.p, signer->sig.len);
+                                signer->sig.p, signer->sig.len, NULL);
 
         if (ret == 0) {
             break;
diff --git a/library/ssl_tls12_server.c b/library/ssl_tls12_server.c
index 14b63aadbf..9faf74134e 100644
--- a/library/ssl_tls12_server.c
+++ b/library/ssl_tls12_server.c
@@ -3456,9 +3456,9 @@ static int ssl_parse_certificate_verify(mbedtls_ssl_context *ssl)
         }
     }
 
-    if ((ret = mbedtls_pk_verify(peer_pk,
+    if ((ret = mbedtls_pk_verify_restartable(peer_pk,
                                  md_alg, hash_start, hashlen,
-                                 ssl->in_msg + i, sig_len)) != 0) {
+                                 ssl->in_msg + i, sig_len, NULL)) != 0) {
         MBEDTLS_SSL_DEBUG_RET(1, "mbedtls_pk_verify", ret);
         return ret;
     }