Stowage/pycryptodome
2
0
Fork 0
mirror of https://github.com/Legrandin/pycryptodome.git synced 2025-12-08 05:19:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rebase on master (SIV)

Browse source
This commit is contained in:
Legrandin 2015-12-23 23:27:02 +01:00
parent e467994ade
commit e5fb0a2e2b
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/Crypto/Cipher/_mode_siv.py
View file

@ -89,7 +89,7 @@ class SivMode(object):
self.block_size = factory.block_size
self._factory = factory
self.nonce = nonce
self._nonce = nonce
self._cipher_params = kwargs
if len(key) not in (32, 48, 64):
@ -102,6 +102,10 @@ class SivMode(object):
if len(nonce) == 0:
raise ValueError("When provided, the nonce must be non-empty")
#: Public attribute is only available in case of non-deterministic
#: encryption
self.nonce = nonce
subkey_size = len(key) // 2
self._mac_tag = None # Cache for MAC tag
@ -148,7 +152,7 @@ class SivMode(object):
is not equivalent to:
>>> cipher.update(b"built")
>>> c.update(b"insecurely")
>>> cipher.update(b"insecurely")
If there is no associated data, this method must not be called.
@ -195,7 +199,7 @@ class SivMode(object):
self._next = [self.digest]
if self.nonce:
if self._nonce:
self._kdf.update(self.nonce)
self._kdf.update(plaintext)
@ -342,7 +346,7 @@ class SivMode(object):
plaintext = self._cipher.decrypt(ciphertext)
if self.nonce:
if self._nonce:
self._kdf.update(self.nonce)
if plaintext:
self._kdf.update(plaintext)
@ -372,7 +376,9 @@ def _create_siv_cipher(factory, **kwargs):
nonce : byte string
For deterministic encryption, it is not present.
Otherwise, it is value that must never be reused.
Otherwise, it is a value that must never be reused
for encrypting message under this key.
There are no restrictions on its length,
but it is recommended to use at least 16 bytes.
"""