diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-04-25 10:27:54 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-04-25 10:27:54 -0500 |
| commit | 5ffb04c4d0141e19f3f0fb3cb12e07c1d231fb9b (patch) | |
| tree | 7200b1c4e307652097a56abc60132be36de7ec72 | |
| parent | 68f1e0c2deea59df17e573b908f45182eff51dd0 (diff) | |
| parent | 462bd6073122f25f524fa92853cf5974d06c7eb8 (diff) | |
| download | cryptography-5ffb04c4d0141e19f3f0fb3cb12e07c1d231fb9b.tar.gz cryptography-5ffb04c4d0141e19f3f0fb3cb12e07c1d231fb9b.tar.bz2 cryptography-5ffb04c4d0141e19f3f0fb3cb12e07c1d231fb9b.zip | |
Merge pull request #968 from alex/typo-fixes
Fix some typos.
| -rw-r--r-- | docs/hazmat/primitives/padding.rst | 2 | ||||
| -rw-r--r-- | tests/hazmat/bindings/test_openssl.py | 2 | ||||
| -rw-r--r-- | tests/test_utils.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/hazmat/primitives/padding.rst b/docs/hazmat/primitives/padding.rst index 83154c0d..c0209446 100644 --- a/docs/hazmat/primitives/padding.rst +++ b/docs/hazmat/primitives/padding.rst @@ -5,7 +5,7 @@ Padding .. currentmodule:: cryptography.hazmat.primitives.padding -Padding is a way to take data that may or may not be be a multiple of the block +Padding is a way to take data that may or may not be a multiple of the block size for a cipher and extend it out so that it is. This is required for many block cipher modes as they require the data to be encrypted to be an exact multiple of the block size. diff --git a/tests/hazmat/bindings/test_openssl.py b/tests/hazmat/bindings/test_openssl.py index 1dbd23b4..58d7602b 100644 --- a/tests/hazmat/bindings/test_openssl.py +++ b/tests/hazmat/bindings/test_openssl.py @@ -84,7 +84,7 @@ class TestOpenSSL(object): with pytest.raises(RuntimeError): b._lock_cb(0, b.lib.CRYPTO_LOCK_SSL, "<test>", 1) - # errors shouldnt cause locking + # errors shouldn't cause locking assert lock.acquire(False) lock.release() diff --git a/tests/test_utils.py b/tests/test_utils.py index b50c21fe..7a0b9e74 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -2638,7 +2638,7 @@ def test_raises_unsupported_no_exc(): def test_raises_unsupported_algorithm(): - # Check that it doesnt assert if the right things are raised. + # Check that it doesn't assert if the right things are raised. with raises_unsupported_algorithm( _Reasons.BACKEND_MISSING_INTERFACE ) as exc_info: |