aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2016-06-02 22:24:22 -0700
committerPaul Kehrer <paul.l.kehrer@gmail.com>2016-06-02 22:24:22 -0700
commit0c11d0427e12557fa41cdfbc00f6a83a36c58af7 (patch)
tree502887b370573178237afb3c4a246654e2457c8b
parente295f3ab615775c3549b7bc2e051af5cff801619 (diff)
downloadcryptography-0c11d0427e12557fa41cdfbc00f6a83a36c58af7.tar.gz
cryptography-0c11d0427e12557fa41cdfbc00f6a83a36c58af7.tar.bz2
cryptography-0c11d0427e12557fa41cdfbc00f6a83a36c58af7.zip
Random grammar stuff (#2955)
-rw-r--r--docs/development/getting-started.rst2
-rw-r--r--docs/development/submitting-patches.rst2
-rw-r--r--src/cryptography/hazmat/backends/openssl/rsa.py2
-rw-r--r--tests/hazmat/primitives/test_rsa.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/docs/development/getting-started.rst b/docs/development/getting-started.rst
index 0bbb18ce..3ad9fe82 100644
--- a/docs/development/getting-started.rst
+++ b/docs/development/getting-started.rst
@@ -27,7 +27,7 @@ You must have installed `OpenSSL`_ via `Homebrew`_ or `MacPorts`_ and must set
``CFLAGS`` and ``LDFLAGS`` environment variables before installing the
``dev-requirements.txt`` otherwise pip will fail with include errors.
-For example with `Homebrew`_:
+For example, with `Homebrew`_:
.. code-block:: console
diff --git a/docs/development/submitting-patches.rst b/docs/development/submitting-patches.rst
index 563bc81f..475e7037 100644
--- a/docs/development/submitting-patches.rst
+++ b/docs/development/submitting-patches.rst
@@ -48,7 +48,7 @@ API considerations
Most projects' APIs are designed with a philosophy of "make easy things easy,
and make hard things possible". One of the perils of writing cryptographic code
is that secure code looks just like insecure code, and its results are almost
-always indistinguishable. As a result ``cryptography`` has, as a design
+always indistinguishable. As a result, ``cryptography`` has, as a design
philosophy: "make it hard to do insecure things". Here are a few strategies for
API design that should be both followed, and should inspire other API choices:
diff --git a/src/cryptography/hazmat/backends/openssl/rsa.py b/src/cryptography/hazmat/backends/openssl/rsa.py
index 1d86bfe3..d8458ccc 100644
--- a/src/cryptography/hazmat/backends/openssl/rsa.py
+++ b/src/cryptography/hazmat/backends/openssl/rsa.py
@@ -141,7 +141,7 @@ def _handle_rsa_enc_dec_error(backend, key):
backend._lib.RSA_R_OAEP_DECODING_ERROR,
# Though this error looks similar to the
# RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE, this occurs on decrypts,
- # rather then on encrypts
+ # rather than on encrypts
backend._lib.RSA_R_DATA_TOO_LARGE_FOR_MODULUS,
]
if backend._lib.Cryptography_HAS_RSA_R_PKCS_DECODING_ERROR:
diff --git a/tests/hazmat/primitives/test_rsa.py b/tests/hazmat/primitives/test_rsa.py
index 2331a935..6a8bb95d 100644
--- a/tests/hazmat/primitives/test_rsa.py
+++ b/tests/hazmat/primitives/test_rsa.py
@@ -1845,7 +1845,7 @@ class TestRSAPrimeFactorRecovery(object):
)
# Unfortunately there is no convention on which prime should be p
# and which one q. The function we use always makes p < q, but the
- # NIST vectors are not so consistent. Accordingly we verify we've
+ # NIST vectors are not so consistent. Accordingly, we verify we've
# recovered the proper (p, q) by sorting them and asserting on that.
assert sorted([p, q]) == sorted([private["p"], private["q"]])