Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gajim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eta
gajim
Commits
8707d511
Commit
8707d511
authored
18 years ago
by
junglecow
Browse files
Options
Downloads
Patches
Plain Diff
- More accurate description of None outcome of _check_fingerprint
- Check for presence of PyOpenSSL in fingerprint check. Fixes #2841.
parent
cf291c3c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/common/connection.py
+6
-2
6 additions, 2 deletions
src/common/connection.py
with
6 additions
and
2 deletions
src/common/connection.py
+
6
−
2
View file @
8707d511
...
...
@@ -448,7 +448,7 @@ class Connection(ConnectionHandlers):
return
if
fpr_good
==
None
:
log
.
warning
(
_
(
"
No fingerprint in database
for %s. Connection could be insecure.
"
),
hostname
)
log
.
warning
(
_
(
"
Unable to check fingerprint
for %s. Connection could be insecure.
"
),
hostname
)
if
fpr_good
==
True
:
log
.
info
(
"
Fingerprint found and matched for %s.
"
,
hostname
)
...
...
@@ -458,7 +458,11 @@ class Connection(ConnectionHandlers):
return
True
def
_check_fingerprint
(
self
,
con
,
con_type
):
fpr_good
=
None
# None: No fpr in database, False: mismatch, True: match
fpr_good
=
None
# None: Unable to check fpr, False: mismatch, True: match
# FIXME: not tidy
import
common.xmpp.transports_nb
if
not
common
.
xmpp
.
transports_nb
.
USE_PYOPENSSL
:
return
None
# FIXME: find a more permanent place for loading servers.xml
servers_xml
=
os
.
path
.
join
(
gajim
.
DATA_DIR
,
'
other
'
,
'
servers.xml
'
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment