[Pkg-privacy-commits] [libotr] 100/225: Repair logic for copying master auth context to child

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository libotr.

commit a0996aa79176e32dc6287549d3778891efd7270b
Author: Ian Goldberg <iang at cs.uwaterloo.ca>
Date:   Fri Aug 24 10:04:41 2012 -0400

    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.
---
 ChangeLog     | 6 ++++++
 src/message.c | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 328c3bd..71f7cc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/src/message.c b/src/message.c
index a6c167d..8a28c8f 100644
--- a/src/message.c
+++ b/src/message.c
@@ -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 &&

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/libotr.git