diff options
| author | Jean-Paul Calderone <jean-paul@clusterhq.com> | 2015-01-18 18:39:34 -0500 |
|---|---|---|
| committer | Jean-Paul Calderone <jean-paul@clusterhq.com> | 2015-01-18 18:39:34 -0500 |
| commit | 87e09b0908cddf59e21114e7920f90b174f793c4 (patch) | |
| tree | d89aa6b3e9d29dc79fad6e7efe5ff9de8eb95dfd | |
| parent | 014c0cc45915a73be8a9c43e70dae760f1b44237 (diff) | |
| parent | 3b0ee97f10decc3eeafa4039facdb1cbfd23d6b9 (diff) | |
| download | pyopenssl-87e09b0908cddf59e21114e7920f90b174f793c4.tar.gz | |
Merge pull request #172 from alex/fix-typos
Fix several typos.
| -rw-r--r-- | OpenSSL/RATIONALE | 2 | ||||
| -rw-r--r-- | OpenSSL/crypto.py | 2 | ||||
| -rw-r--r-- | OpenSSL/test/test_crypto.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSSL/RATIONALE b/OpenSSL/RATIONALE index a0e389c..074422c 100644 --- a/OpenSSL/RATIONALE +++ b/OpenSSL/RATIONALE @@ -30,7 +30,7 @@ This is a list of things we need from an OpenSSL module: This could of course be done a lot better than the way it works now, so more transport layers than sockets are possible! + A well-organized error system that mimics OpenSSL's error system is - desireable. Specifically there has to be a way to find out wether the + desirable. Specifically there has to be a way to find out wether the operation was successful, or if it failed, why it failed, so some sort of interface to OpenSSL's error queue mechanism is needed. + Certificate objects (X509) and certificate name objects (X509_NAME) are diff --git a/OpenSSL/crypto.py b/OpenSSL/crypto.py index 313a30a..8d971f2 100644 --- a/OpenSSL/crypto.py +++ b/OpenSSL/crypto.py @@ -1897,7 +1897,7 @@ class PKCS12(object): def set_ca_certificates(self, cacerts): """ - Replace or set the CA certificates withing the PKCS12 object. + Replace or set the CA certificates within the PKCS12 object. :param cacerts: The new CA certificates. :type cacerts: :py:data:`None` or an iterable of :py:class:`X509` diff --git a/OpenSSL/test/test_crypto.py b/OpenSSL/test/test_crypto.py index 60f9e6a..f704ac0 100644 --- a/OpenSSL/test/test_crypto.py +++ b/OpenSSL/test/test_crypto.py @@ -536,7 +536,7 @@ class X509ExtTests(TestCase): def test_issuer(self): """ - If an extension requires a issuer, the :py:data:`issuer` parameter to + If an extension requires an issuer, the :py:data:`issuer` parameter to :py:class:`X509Extension` provides its value. """ ext2 = X509Extension( @@ -1212,7 +1212,7 @@ class X509ReqTests(TestCase, _PKeyInteractionTestsMixin): def test_verify_success(self): """ :py:obj:`X509Req.verify` returns :py:obj:`True` if called with a - :py:obj:`OpenSSL.crypto.PKey` which represents the public part ofthe key + :py:obj:`OpenSSL.crypto.PKey` which represents the public part of the key which signed the request. """ request = X509Req() |