Commit 02911c96 authored by Dan Pascu's avatar Dan Pascu

Fixed race condition in accessing the ZRTP SAS for SMP verification

parent 55918558
...@@ -1256,7 +1256,7 @@ class SMPVerificationHandler(object): ...@@ -1256,7 +1256,7 @@ class SMPVerificationHandler(object):
self.chat_stream.encryption.smp_abort() self.chat_stream.encryption.smp_abort()
return return
audio_stream = self.audio_stream audio_stream = self.audio_stream
if audio_stream.encryption.active and audio_stream.encryption.type == 'ZRTP': if audio_stream.encryption.active and audio_stream.encryption.type == 'ZRTP' and audio_stream.encryption.zrtp.sas is not None:
self.chat_stream.encryption.smp_answer(audio_stream.encryption.zrtp.sas) self.chat_stream.encryption.smp_answer(audio_stream.encryption.zrtp.sas)
if self.blink_session.info.streams.chat.smp_status not in (SMPVerification.Succeeded, SMPVerification.Failed): if self.blink_session.info.streams.chat.smp_status not in (SMPVerification.Succeeded, SMPVerification.Failed):
self.blink_session.info.streams.chat.smp_status = SMPVerification.InProgress self.blink_session.info.streams.chat.smp_status = SMPVerification.InProgress
......
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