summaryrefslogtreecommitdiff
path: root/OpenSSL/crypto.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-09-05 08:58:07 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-09-05 08:58:07 -0400
commit4e2fe97e20e5ea2af3017c963a040f25a01dc206 (patch)
tree044ca39a405e681b3bcf202a172b1dd1b3ef574a /OpenSSL/crypto.py
parentb9521c8ec871abbe784af36467f46a7dd00c8d8a (diff)
parent8594f700d90e2846c2ede68079a41ff5a8665087 (diff)
downloadpyopenssl-4e2fe97e20e5ea2af3017c963a040f25a01dc206.tar.gz
Merge branch 'master' into alex-patch-2
Diffstat (limited to 'OpenSSL/crypto.py')
-rw-r--r--OpenSSL/crypto.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSSL/crypto.py b/OpenSSL/crypto.py
index 92ec815..0ff65dc 100644
--- a/OpenSSL/crypto.py
+++ b/OpenSSL/crypto.py
@@ -1579,7 +1579,7 @@ class X509StoreContext(object):
Convert an OpenSSL native context error failure into a Python
exception.
- When a call to native OpenSSL X509_verify_cert fails, additonal information
+ When a call to native OpenSSL X509_verify_cert fails, additional information
about the failure can be obtained from the store context.
"""
errors = [
@@ -1617,7 +1617,7 @@ class X509StoreContext(object):
:param store_ctx: The :py:class:`X509StoreContext` to verify.
- :raises X509StoreContextError: If an error occured when validating a
+ :raises X509StoreContextError: If an error occurred when validating a
certificate in the context. Sets ``certificate`` attribute to indicate
which certificate caused the error.
"""
@@ -1785,7 +1785,7 @@ class Revoked(object):
b"cessationOfOperation",
b"certificateHold",
# b"removeFromCRL",
- ]
+ ]
def __init__(self):
revoked = _lib.X509_REVOKED_new()