diff options
author | Damir Jelić <poljar@termina.org.uk> | 2019-04-10 15:18:07 +0200 |
---|---|---|
committer | Damir Jelić <poljar@termina.org.uk> | 2019-04-10 15:18:07 +0200 |
commit | 086133f39a175a72ea7c898c708fed38b8dbd36b (patch) | |
tree | f335cf726acafae819d1b824c6b23186eddaa9df /python/olm/__init__.py | |
parent | c79d9282dcb9946144905a93ec9b5f14b17cc30c (diff) | |
parent | 54cb52e05e0d715c9e3c71ffeff05050732dea41 (diff) |
Merge branch 'python-sas'
Diffstat (limited to 'python/olm/__init__.py')
-rw-r--r-- | python/olm/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/python/olm/__init__.py b/python/olm/__init__.py index 7b7423b..d92b0ab 100644 --- a/python/olm/__init__.py +++ b/python/olm/__init__.py @@ -21,7 +21,7 @@ Olm Python bindings | © Copyright 2015-2017 by OpenMarket Ltd | © Copyright 2018 by Damir Jelić """ -from .utility import ed25519_verify, OlmVerifyError +from .utility import ed25519_verify, OlmVerifyError, OlmHashError, sha256 from .account import Account, OlmAccountError from .session import ( Session, @@ -43,3 +43,4 @@ from .pk import ( PkEncryptionError, PkDecryptionError ) +from .sas import Sas, OlmSasError |