diff options
| -rw-r--r-- | docs/hazmat/primitives/padding.rst | 3 | ||||
| -rw-r--r-- | tests/hazmat/primitives/test_padding.py | 16 |
2 files changed, 6 insertions, 13 deletions
diff --git a/docs/hazmat/primitives/padding.rst b/docs/hazmat/primitives/padding.rst index 4b05acd1..ba3ddcc0 100644 --- a/docs/hazmat/primitives/padding.rst +++ b/docs/hazmat/primitives/padding.rst @@ -27,8 +27,7 @@ multiple of the block size. .. doctest:: >>> from cryptography.hazmat.primitives import padding - >>> padder = padding.PKCS7(128) - >>> padder = padder.padder() + >>> padder = padding.PKCS7(128).padder() >>> padder.update(b"1111111111") '' >>> padder.finalize() diff --git a/tests/hazmat/primitives/test_padding.py b/tests/hazmat/primitives/test_padding.py index f689dda0..798b2a77 100644 --- a/tests/hazmat/primitives/test_padding.py +++ b/tests/hazmat/primitives/test_padding.py @@ -29,9 +29,7 @@ class TestPKCS7(object): (128, b""), ]) def test_invalid_padding(self, size, padded): - padder = padding.PKCS7(size) - - unpadder = padder.unpadder() + unpadder = padding.PKCS7(size).unpadder() with pytest.raises(ValueError): unpadder.update(padded) unpadder.finalize() @@ -59,8 +57,7 @@ class TestPKCS7(object): ) ]) def test_pad(self, size, unpadded, padded): - padder = padding.PKCS7(size) - padder = padder.padder() + padder = padding.PKCS7(size).padder() result = padder.update(unpadded) result += padder.finalize() assert result == padded @@ -78,23 +75,20 @@ class TestPKCS7(object): ), ]) def test_unpad(self, size, unpadded, padded): - padder = padding.PKCS7(size) - unpadder = padder.unpadder() + unpadder = padding.PKCS7(size).unpadder() result = unpadder.update(padded) result += unpadder.finalize() assert result == unpadded def test_use_after_finalize(self): - p = padding.PKCS7(128) - - padder = p.padder() + padder = padding.PKCS7(128).padder() b = padder.finalize() with pytest.raises(ValueError): padder.update(b"") with pytest.raises(ValueError): padder.finalize() - unpadder = p.unpadder() + unpadder = padding.PKCS7(128).unpadder() unpadder.update(b) unpadder.finalize() with pytest.raises(ValueError): |