Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes issues encountered during 1.4.0 rc.1 testing #1898

Merged
merged 11 commits into from Aug 30, 2019
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Next

communication: fixes session resume with the current mbedtls version

That's what we get for messing with the mbedtls ssl context directly.
  • Loading branch information...
avtolstoy committed Aug 29, 2019
commit 580cfaf08736b11a83e87c8e17380fc368cfef4e
@@ -54,7 +54,7 @@ void SessionPersist::prepare_save(const uint8_t* random, uint32_t keys_checksum,
{
this->keys_checksum = keys_checksum;
in_epoch = context->in_epoch;
memcpy(out_ctr, context->out_ctr, 8);
memcpy(out_ctr, context->cur_out_ctr, 8);
memcpy(randbytes, random, sizeof(randbytes));
this->next_coap_id = next_id;
save_session(context->session);
@@ -70,7 +70,7 @@ void SessionPersist::update(mbedtls_ssl_context* context, save_fn_t saver, messa
{
if (context->state == MBEDTLS_SSL_HANDSHAKE_OVER)
{
memcpy(out_ctr, context->out_ctr, 8);
memcpy(out_ctr, context->cur_out_ctr, 8);
this->next_coap_id = next_id;
save_this_with(saver);
}
@@ -116,7 +116,7 @@ auto SessionPersist::restore(mbedtls_ssl_context* context, bool renegotiate, uin
if (!renegotiate) {
context->state = MBEDTLS_SSL_HANDSHAKE_WRAPUP;
context->in_epoch = in_epoch;
memcpy(context->out_ctr, &out_ctr, sizeof(out_ctr));
memcpy(context->cur_out_ctr, &out_ctr, sizeof(out_ctr));
memcpy(context->handshake->randbytes, randbytes, sizeof(randbytes));
context->transform_negotiate->ciphersuite_info = mbedtls_ssl_ciphersuite_from_id(ciphersuite);
if (!context->transform_negotiate->ciphersuite_info)
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.