summaryrefslogtreecommitdiff
path: root/slixmpp
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2021-03-11 20:54:31 +0100
committermathieui <mathieui@mathieui.net>2021-03-11 20:54:31 +0100
commit7ddcc3428fbc48814da301ce7cba9b1f855a0fa9 (patch)
tree3d45d0e333e3cde1a3349afc2c6a4061422b71ba /slixmpp
parentd77eb3a7e872c49b125f618ec5e48c50a92914ee (diff)
parent1cf6393b61bc87e26c066bbd89364c1221976764 (diff)
downloadslixmpp-7ddcc3428fbc48814da301ce7cba9b1f855a0fa9.tar.gz
slixmpp-7ddcc3428fbc48814da301ce7cba9b1f855a0fa9.tar.bz2
slixmpp-7ddcc3428fbc48814da301ce7cba9b1f855a0fa9.tar.xz
slixmpp-7ddcc3428fbc48814da301ce7cba9b1f855a0fa9.zip
Merge branch 'xep-0300-fixup' into 'master'
XEP-0300: small fixes See merge request poezio/slixmpp!151
Diffstat (limited to 'slixmpp')
-rw-r--r--slixmpp/plugins/xep_0300/hash.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/slixmpp/plugins/xep_0300/hash.py b/slixmpp/plugins/xep_0300/hash.py
index e3f97f1b..90491300 100644
--- a/slixmpp/plugins/xep_0300/hash.py
+++ b/slixmpp/plugins/xep_0300/hash.py
@@ -1,4 +1,3 @@
-
# Slixmpp: The Slick XMPP Library
# Copyright (C) 2017 Emmanuel Gil Peyrot
# This file is part of Slixmpp.
@@ -15,6 +14,9 @@ log = logging.getLogger(__name__)
class XEP_0300(BasePlugin):
+ """
+ XEP-0300: Use of Cryptographic Hash Functions in XMPP
+ """
name = 'xep_0300'
description = 'XEP-0300: Use of Cryptographic Hash Functions in XMPP'
@@ -22,7 +24,7 @@ class XEP_0300(BasePlugin):
stanza = stanza
default_config = {
'block_size': 1024 * 1024, # One MiB
- 'preferded': 'sha-256',
+ 'preferred': 'sha-256',
'enable_sha-1': False,
'enable_sha-256': True,
'enable_sha-512': True,
@@ -61,7 +63,7 @@ class XEP_0300(BasePlugin):
def plugin_end(self):
for namespace in self.enabled_hashes:
- self.xmpp['xep_0030'].del_feature(namespace)
+ self.xmpp['xep_0030'].del_feature(feature=namespace)
self.enabled_hashes.clear()
self.xmpp['xep_0030'].del_feature(feature=Hash.namespace)