Commit a0996aa7 authored by Ian Goldberg's avatar Ian Goldberg

Repair logic for copying master auth context to child

Consider copying the master auth context to the child, even if the child
is already in ENCRYPTED, because we might be trying to refresh a private
conversation.
parent 85f60446
......@@ -3,6 +3,12 @@
* README:
* configure.ac: Release 4.0.0
2012-08-24
* src/message.c: Consider copying the master auth context to the
child, even if the child is already in ENCRYPTED, because we
might be trying to refresh a private conversation.
2012-08-22
* configure.ac: Use gcc and ld hardening flags, where possible.
......
......@@ -1027,8 +1027,7 @@ int otrl_message_receiving(OtrlUserState us, const OtrlMessageAppOps *ops,
if (ops->update_context_list) {
ops->update_context_list(opdata);
}
} else if (m_context != context && (context->msgstate !=
OTRL_MSGSTATE_ENCRYPTED || context->otr_offer == OFFER_SENT)) {
} else if (m_context != context) {
/* Switching from m_context to existing instance context */
if (msgtype == OTRL_MSGTYPE_DH_KEY && m_context->auth.authstate
== OTRL_AUTHSTATE_AWAITING_DHKEY &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment