projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
59b5ab4
)
Use CRYPTO_memcmp in s3_cbc.c
author
Emilia Kasper
<emilia@openssl.org>
Mon, 8 Jun 2015 13:04:28 +0000
(15:04 +0200)
committer
Emilia Kasper
<emilia@openssl.org>
Mon, 8 Jun 2015 13:05:08 +0000
(15:05 +0200)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit
05627d57e55517eae21c251fe287760bd1137218
)
ssl/s3_cbc.c
patch
|
blob
|
history
diff --git
a/ssl/s3_cbc.c
b/ssl/s3_cbc.c
index 00b534f390ce98b855ba86b2bb4b658b7fd2c044..2fb71f277e9cfae99217ac4769c4e50fe37b1ebe 100644
(file)
--- 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;
}