diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2019-10-24 21:10:46 +0000 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2019-10-24 21:10:46 +0000 |
| commit | 25ae05fdc0e5627b6e53c17c2c55a987117d9cfb (patch) | |
| tree | 902725a128204593fdb209ca9563fa7deb6edb7a /lib/constate.c | |
| parent | e4a7db34259295ebb32a0255215471323948efbb (diff) | |
| parent | cad80e6184135ea65f6f46a9abf9c1534486deab (diff) | |
| download | gnutls-tmp-draft-ietf-quic-tls-23.tar.gz | |
Merge branch 'remove-guint64' into 'master'tmp-draft-ietf-quic-tls-23
lib: drop gnutls_uint64 usage as sequence number
See merge request gnutls/gnutls!1102
Diffstat (limited to 'lib/constate.c')
| -rw-r--r-- | lib/constate.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/constate.c b/lib/constate.c index fc307debc3..51943ede69 100644 --- a/lib/constate.c +++ b/lib/constate.c @@ -981,10 +981,12 @@ _gnutls_epoch_setup_next(gnutls_session_t session, unsigned null_epoch, record_p (*slot)->mac = NULL; } - if (IS_DTLS(session)) - _gnutls_write_uint16(session->security_parameters.epoch_next, - UINT64DATA((*slot)->write. - sequence_number)); + if (IS_DTLS(session)) { + uint64_t seq = (*slot)->write.sequence_number; + seq &= UINT64_C(0xffffffffffff); + seq |= ((uint64_t)session->security_parameters.epoch_next) << 48; + (*slot)->write.sequence_number = seq; + } finish: if (newp != NULL) |