Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gajim-plugins
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
56
Issues
56
List
Boards
Labels
Service Desk
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gajim
gajim-plugins
Commits
af4664de
Commit
af4664de
authored
Nov 02, 2018
by
Philipp Hörist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[openpgp] Fix some errors
parent
eb80f10c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
openpgp/modules/openpgp.py
openpgp/modules/openpgp.py
+3
-3
openpgp/modules/pgp_keylist.py
openpgp/modules/pgp_keylist.py
+1
-1
openpgp/modules/util.py
openpgp/modules/util.py
+1
-1
No files found.
openpgp/modules/openpgp.py
View file @
af4664de
...
...
@@ -109,9 +109,9 @@ class ContactData:
@
property
def
userid
(
self
):
if
self
.
_
jid
is
None
:
if
self
.
jid
is
None
:
raise
ValueError
(
'JID not set'
)
return
'xmpp:%s'
%
self
.
_
jid
return
'xmpp:%s'
%
self
.
jid
@
property
def
default_trust
(
self
):
...
...
@@ -185,7 +185,7 @@ class ContactData:
try
:
keydata
=
self
.
_key_store
[
fingerprint
]
except
KeyError
:
log
.
warning
(
'Set public key on unknown fingerprint'
,
log
.
warning
(
'Set public key on unknown fingerprint
: %s %s
'
,
self
.
jid
,
fingerprint
)
else
:
keydata
.
has_pubkey
=
True
...
...
openpgp/modules/pgp_keylist.py
View file @
af4664de
...
...
@@ -95,7 +95,7 @@ class PGPKeylist(AbstractPEPModule):
else
:
timestamp
=
parse_datetime
(
date
,
epoch
=
True
)
if
timestamp
is
None
:
raise
StanzaMalformed
(
'Invalid date timestamp: %s'
,
date
)
raise
StanzaMalformed
(
'Invalid date timestamp: %s'
%
date
)
keylist
.
append
(
Key
(
attrs
[
'v4-fingerprint'
],
int
(
timestamp
)))
...
...
openpgp/modules/util.py
View file @
af4664de
...
...
@@ -207,7 +207,7 @@ def get_info_message():
return
'[This message is *encrypted* with OpenPGP (See :XEP:`0373`]'
def
add_additional_data
(
data
,
fingerprint
,
trust
):
def
add_additional_data
(
data
,
fingerprint
):
data
[
'encrypted'
]
=
{
'name'
:
ENCRYPTION_NAME
,
'fingerprint'
:
fingerprint
}
...
...
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