diff options
| author |  jesopo | 2020-02-20 15:12:00 +0000 |
|---|---|---|
| committer | jesopo | 2020-02-20 15:12:00 +0000 |
| commit | 8a6270fc979f38af823a5454f95201e99d69b637 (patch) | |
| tree | b5e830fd7ca3e46f5453bd7f530b25764cebb4f8 /modules | |
| parent | add bin/bitbot-log to read/decrypt channel_log files (diff) | |
| signature | ||
`cryptography` is in requirements.txt; we dont need to check for it
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/fediverse/__init__.py | 3 | ||||
| -rw-r--r-- | modules/fediverse/ap_security.py | 17 |
2 files changed, 6 insertions, 14 deletions
diff --git a/modules/fediverse/__init__.py b/modules/fediverse/__init__.py index 02c26d7d..c1279eb7 100644 --- a/modules/fediverse/__init__.py +++ b/modules/fediverse/__init__.py @@ -27,9 +27,6 @@ class Module(ModuleManager.BaseModule): raise ValueError("`tls-key` not provided in bot config") if not "tls-certificate" in self.bot.config: raise ValueError("`tls-certificate` not provided in bot config") - if not ap_security.has_crypto: - raise ValueError("cyprography library is not installed " - "(https://pypi.org/project/cryptography/)") server_username, instance = ap_utils.split_username(server_username) self.server = ap_server.Server(self.bot, self.exports, diff --git a/modules/fediverse/ap_security.py b/modules/fediverse/ap_security.py index a466aaa5..219f4ff9 100644 --- a/modules/fediverse/ap_security.py +++ b/modules/fediverse/ap_security.py @@ -1,17 +1,12 @@ import base64, typing -try: - from cryptography import x509 - from cryptography.hazmat.primitives import hashes, serialization - from cryptography.hazmat.primitives.asymmetric import padding, rsa - from cryptography.hazmat.backends import default_backend +from cryptography import x509 +from cryptography.hazmat.primitives import hashes, serialization +from cryptography.hazmat.primitives.asymmetric import padding, rsa +from cryptography.hazmat.backends import default_backend - from cryptography.hazmat.primitives.serialization import Encoding - from cryptography.hazmat.primitives.serialization import PublicFormat - - has_crypto = True -except ModuleNotFoundError: - has_crypto = False +from cryptography.hazmat.primitives.serialization import Encoding +from cryptography.hazmat.primitives.serialization import PublicFormat SIGNATURE_FORMAT = ( "keyId=\"%s\",headers=\"%s\",signature=\"%s\",algorithm=\"rsa-sha256\"") |