projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Don't change the state of the ETM flags until CCS processing
[openssl.git]
/
ssl
/
statem
/
extensions_clnt.c
diff --git
a/ssl/statem/extensions_clnt.c
b/ssl/statem/extensions_clnt.c
index ea379199e04019a46c938c4a52ea2c4236b7ed83..09780a949548136ff58ac861cbcaf676a20aa6b5 100644
(file)
--- a/
ssl/statem/extensions_clnt.c
+++ b/
ssl/statem/extensions_clnt.c
@@
-1172,7
+1172,7
@@
int tls_parse_stoc_etm(SSL *s, PACKET *pkt, unsigned int context, X509 *x,
if (!(s->options & SSL_OP_NO_ENCRYPT_THEN_MAC)
&& s->s3->tmp.new_cipher->algorithm_mac != SSL_AEAD
&& s->s3->tmp.new_cipher->algorithm_enc != SSL_RC4)
- s->
s3->flags |= TLS1_FLAGS_ENCRYPT_THEN_MAC
;
+ s->
ext.use_etm = 1
;
return 1;
}