X-Git-Url: http://git.datanom.net/securemail.git/blobdiff_plain/99dad5525028d89f6ef0ff91e2de3b1b251df6da..481494d3dde40f7b22f10e4d0c5b1511fb52b0ff:/user.py diff --git a/user.py b/user.py index fd3d397..64673c7 100644 --- a/user.py +++ b/user.py @@ -21,7 +21,6 @@ import pickle from db import DBInterface as DBI from cryptonize import Cryptonize from nacl.public import PublicKey -from nacl import __version__ as NACL_VERSION class NoSuchUser(Exception): pass @@ -38,13 +37,7 @@ class User: def store(self, key): crypto = Cryptonize() - if NACL_VERSION < "1.1.0": - from nacl.utils import random - from nacl.public import SecretBox - nonce = random(SecretBox.NONCE_SIZE) - cipher = crypto.symmetric_encrypt(key, pickle.dumps(self), nonce) - else: - cipher = crypto.symmetric_encrypt(key, pickle.dumps(self)) + cipher = crypto.symmetric_encrypt(key, pickle.dumps(self)) DBI.store_user(crypto.generate_hash(key), cipher) def load(self, key):