projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Always duplicate the session on NewSessionTicket in TLSv1.3
[oweals/openssl.git]
/
ssl
/
statem
/
statem_dtls.c
diff --git
a/ssl/statem/statem_dtls.c
b/ssl/statem/statem_dtls.c
index 1bc82d1625a9f1d0e2ef3394d5d9d827074a0c81..b2ba35763a09b7b2d360f4ca4ad97fa5c1f0216b 100644
(file)
--- a/
ssl/statem/statem_dtls.c
+++ b/
ssl/statem/statem_dtls.c
@@
-214,6
+214,9
@@
int dtls1_do_write(SSL *s, int type)
else
len = s->init_num;
else
len = s->init_num;
+ if (len > s->max_send_fragment)
+ len = s->max_send_fragment;
+
/*
* XDTLS: this function is too long. split out the CCS part
*/
/*
* XDTLS: this function is too long. split out the CCS part
*/
@@
-788,7
+791,8
@@
static int dtls_get_reassembled_message(SSL *s, int *errtype, size_t *len)
return 0;
}
return 0;
}
- if (!s->server && s->d1->r_msg_hdr.frag_off == 0
+ if (!s->server
+ && s->d1->r_msg_hdr.frag_off == 0
&& s->statem.hand_state != TLS_ST_OK
&& wire[0] == SSL3_MT_HELLO_REQUEST) {
/*
&& s->statem.hand_state != TLS_ST_OK
&& wire[0] == SSL3_MT_HELLO_REQUEST) {
/*