diff options
| -rw-r--r-- | cryptography/hazmat/primitives/padding.py | 8 | ||||
| -rw-r--r-- | docs/hazmat/primitives/padding.rst | 5 | ||||
| -rw-r--r-- | tests/hazmat/primitives/test_padding.py | 14 |
3 files changed, 15 insertions, 12 deletions
diff --git a/cryptography/hazmat/primitives/padding.py b/cryptography/hazmat/primitives/padding.py index d5fb0326..27a1face 100644 --- a/cryptography/hazmat/primitives/padding.py +++ b/cryptography/hazmat/primitives/padding.py @@ -33,14 +33,6 @@ class PKCS7(object): def unpadder(self): return _PKCS7UnpaddingContext(self.block_size) - def pad(self, data): - padder = self.padder() - return padder.update(data) + padder.finalize() - - def unpad(self, data): - unpadder = self.unpadder() - return unpadder.update(data) + unpadder.finalize() - @interfaces.register(interfaces.PaddingContext) class _PKCS7PaddingContext(object): diff --git a/docs/hazmat/primitives/padding.rst b/docs/hazmat/primitives/padding.rst index 7cbadeb9..1ad2bb83 100644 --- a/docs/hazmat/primitives/padding.rst +++ b/docs/hazmat/primitives/padding.rst @@ -28,7 +28,10 @@ multiple of the block size. >>> from cryptography.hazmat.primitives import padding >>> padder = padding.PKCS7(128) - >>> padder.pad(b"1111111111") + >>> padder = padder.padder() + >>> padder.update(b"1111111111") + '' + >>> padder.finalize() '1111111111\x06\x06\x06\x06\x06\x06' :param block_size: The size of the block in bits that the data is being diff --git a/tests/hazmat/primitives/test_padding.py b/tests/hazmat/primitives/test_padding.py index a41edac1..c47b6c5c 100644 --- a/tests/hazmat/primitives/test_padding.py +++ b/tests/hazmat/primitives/test_padding.py @@ -31,8 +31,10 @@ class TestPKCS7(object): def test_invalid_padding(self, size, padded): padder = padding.PKCS7(size) + unpadder = padder.unpadder() with pytest.raises(ValueError): - padder.unpad(padded) + unpadder.update(padded) + unpadder.finalize() @pytest.mark.parametrize(("size", "unpadded", "padded"), [ ( @@ -48,7 +50,10 @@ class TestPKCS7(object): ]) def test_pad(self, size, unpadded, padded): padder = padding.PKCS7(size) - assert padder.pad(unpadded) == padded + padder = padder.padder() + result = padder.update(unpadded) + result += padder.finalize() + assert result == padded @pytest.mark.parametrize(("size", "unpadded", "padded"), [ ( @@ -64,7 +69,10 @@ class TestPKCS7(object): ]) def test_unpad(self, size, unpadded, padded): padder = padding.PKCS7(size) - assert padder.unpad(padded) == unpadded + unpadder = padder.unpadder() + result = unpadder.update(padded) + result += unpadder.finalize() + assert result == unpadded def test_use_after_finalize(self): p = padding.PKCS7(128) |