raise an error if you unicode

1 files changed, 6 insertions, 0 deletions

diff --git a/cryptography/hazmat/primitives/padding.py b/cryptography/hazmat/primitives/padding.py
index 5c7c7e91..86ea26e3 100644
--- a/cryptography/hazmat/primitives/padding.py
+++ b/cryptography/hazmat/primitives/padding.py
@@ -47,6 +47,9 @@ class _PKCS7PaddingContext(object):
         if self._buffer is None:
             raise ValueError("Context was already finalized")
 
+        if isinstance(data, six.text_type):
+            raise TypeError("Unicode-objects must be encoded before padding")
+
         self._buffer += data
 
         finished_blocks = len(self._buffer) // (self.block_size // 8)
@@ -79,6 +82,9 @@ class _PKCS7UnpaddingContext(object):
         if self._buffer is None:
             raise ValueError("Context was already finalized")
 
+        if isinstance(data, six.text_type):
+            raise TypeError("Unicode-objects must be encoded before unpadding")
+
         self._buffer += data
 
         finished_blocks = max(