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:
1e4a355
)
Use CRYPTO_memcmp in ssl3_record.c
author
Emilia Kasper
<emilia@openssl.org>
Fri, 29 May 2015 11:14:08 +0000
(13:14 +0200)
committer
Emilia Kasper
<emilia@openssl.org>
Mon, 8 Jun 2015 12:57:04 +0000
(14:57 +0200)
Reviewed-by: Rich Salz <rsalz@openssl.org>
ssl/record/ssl3_record.c
patch
|
blob
|
history
diff --git
a/ssl/record/ssl3_record.c
b/ssl/record/ssl3_record.c
index bae9490798c89db37d4c956a2c5d5d799080210e..dbec5f1fc2344289792b585e6f70926c453fb3c8 100644
(file)
--- a/
ssl/record/ssl3_record.c
+++ b/
ssl/record/ssl3_record.c
@@
-1072,7
+1072,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(RECORD_LAYER_get_read_sequence(&s->rlayer),
+ if ((
CRYPTO_
memcmp(RECORD_LAYER_get_read_sequence(&s->rlayer),
"\0\0\0\0\0\0\0\0", 8) == 0) &&
!(padding_length & 1)) {
s->s3->flags |= TLS1_FLAGS_TLS_PADDING_BUG;
@@
-1578,4
+1578,3
@@
int dtls1_get_record(SSL *s)
return (1);
}
-