Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vmj-qt
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
vmj-qt
Commits
02911c96
Commit
02911c96
authored
Jun 21, 2016
by
Dan Pascu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed race condition in accessing the ZRTP SAS for SMP verification
parent
55918558
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
sessions.py
blink/sessions.py
+1
-1
No files found.
blink/sessions.py
View file @
02911c96
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment