From ba5693686e7bc408c2fcdb4d258e9410028dcfb4 Mon Sep 17 00:00:00 2001 From: Emilia Kasper Date: Mon, 8 Jun 2015 15:04:28 +0200 Subject: [PATCH] Use CRYPTO_memcmp in s3_cbc.c Reviewed-by: Rich Salz (cherry picked from commit 05627d57e55517eae21c251fe287760bd1137218) --- ssl/s3_cbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c index 00b534f390..2fb71f277e 100644 --- a/ssl/s3_cbc.c +++ b/ssl/s3_cbc.c @@ -149,7 +149,7 @@ int tls1_cbc_remove_padding(const SSL *s, */ if ((s->options & SSL_OP_TLS_BLOCK_PADDING_BUG) && !s->expand) { /* First packet is even in size, so check */ - if ((memcmp(s->s3->read_sequence, "\0\0\0\0\0\0\0\0", 8) == 0) && + if ((CRYPTO_memcmp(s->s3->read_sequence, "\0\0\0\0\0\0\0\0", 8) == 0) && !(padding_length & 1)) { s->s3->flags |= TLS1_FLAGS_TLS_PADDING_BUG; } -- 2.25.1