diff --git a/src/asymmetric_cipher.c b/src/asymmetric_cipher.c
index 3256fd28..5655d185 100644
--- a/src/asymmetric_cipher.c
+++ b/src/asymmetric_cipher.c
@@ -271,7 +271,7 @@ p11prov_tls_constant_time_depadding(struct p11prov_rsaenc_ctx *encctx,
         return RET_OSSL_ERR;
     }
 
-    cond = constant_equal(*out_size, 2 + length);
+    cond = constant_equal(*out_size, length);
 
     ver_cond = constant_equal(buf[0], encctx->tls_padding.client_ver_major);
     ver_cond &= constant_equal(buf[1], encctx->tls_padding.client_ver_minor);
@@ -286,7 +286,7 @@ p11prov_tls_constant_time_depadding(struct p11prov_rsaenc_ctx *encctx,
     }
     cond &= ver_cond;
 
-    constant_select_buf(cond, length, out, buf + 2, randbuf);
+    constant_select_buf(cond, length, out, buf, randbuf);
 
     *out_size = length;
     *ret_cond = cond;