commit 09bff867916af9694d66c2fea917d192f7dd1a25
author Alex Gaynor <alex.gaynor@gmail.com> Fri Nov 22 17:27:08 2013 -0800
committer Alex Gaynor <alex.gaynor@gmail.com> Fri Nov 22 17:27:08 2013 -0800
tree dbd0d0290ffd61779b3e9c8ce60369173633ccad
parent 56e78a942e71faac27d1b6451d6c409ee559a1f1

Handle another error case

cryptography/fernet.py

diff --git a/cryptography/fernet.py b/cryptography/fernet.py
index efa13b8..aa46b36 100644
--- a/cryptography/fernet.py
+++ b/cryptography/fernet.py
@@ -129,7 +129,11 @@
         decryptor = Cipher(
             algorithms.AES(self.encryption_key), modes.CBC(iv), self.backend
         ).decryptor()
-        plaintext_padded = decryptor.update(ciphertext) + decryptor.finalize()
+        plaintext_padded = decryptor.update(ciphertext)
+        try:
+            plaintext_padded += decryptor.finalize()
+        except ValueError:
+            raise InvalidToken
         unpadder = padding.PKCS7(algorithms.AES.block_size).unpadder()
 
         unpadded = unpadder.update(plaintext_padded)