diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-01-22 13:26:25 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-01-22 13:26:25 -0500 |
| commit | 44ae6cd19b952e927ec636d70e2c84d5b60b590b (patch) | |
| tree | e358b7def421ef7c2414e13897f4b124934efa1d /src | |
| parent | f0546c66551099b69a69b6d3db9b439aeb8bea08 (diff) | |
| parent | a418e96e08537e77b86c7eff8975e0c76b251797 (diff) | |
| download | cryptography-44ae6cd19b952e927ec636d70e2c84d5b60b590b.tar.gz cryptography-44ae6cd19b952e927ec636d70e2c84d5b60b590b.tar.bz2 cryptography-44ae6cd19b952e927ec636d70e2c84d5b60b590b.zip | |
Merge pull request #2682 from reaperhulk/fernet-change
fernet fix: ignore the timestamp entirely when no ttl is set
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptography/fernet.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/cryptography/fernet.py b/src/cryptography/fernet.py index 6fbe9f27..99eb10e5 100644 --- a/src/cryptography/fernet.py +++ b/src/cryptography/fernet.py @@ -91,8 +91,10 @@ class Fernet(object): if ttl is not None: if timestamp + ttl < current_time: raise InvalidToken - if current_time + _MAX_CLOCK_SKEW < timestamp: - raise InvalidToken + + if current_time + _MAX_CLOCK_SKEW < timestamp: + raise InvalidToken + h = HMAC(self._signing_key, hashes.SHA256(), backend=self._backend) h.update(data[:-32]) try: |