Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable use of CRL (and more) in verify context. #483

Merged
merged 18 commits into from
Jun 5, 2016
Merged

Enable use of CRL (and more) in verify context. #483

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f38ea82
Enable use of CRL (and more) in verify context.
sholsapp Jun 4, 2016
45d3447
flake8 fixes.
Jun 4, 2016
a983072
Comments from Hynek & Paul.
Jun 4, 2016
2dca3d9
More updates from Paul & Hynek.
Jun 4, 2016
5e4816b
Fix closing backtick.
Jun 4, 2016
2bc4bd8
Remove commented out constants.
Jun 4, 2016
e3421c7
More doc updates. Changelog update.
Jun 4, 2016
1186115
Getting closer?
Jun 4, 2016
7fed893
Sphinx fix.
Jun 4, 2016
7cfd528
Indent docstring.
Jun 4, 2016
4a14255
More Sphinx updates.
Jun 4, 2016
e3ce93d
Type updates for docstrings.
Jun 5, 2016
55af14e
Remove Enum subclassing.
Jun 5, 2016
c5dc568
Docstring update.
Jun 5, 2016
f0fcf90
Docstrings updates.
Jun 5, 2016
8842733
Round and round it goes. Where it ends, nobody knows.
Jun 5, 2016
0317e55
Remove TODO comment. Need @sholsapp to follow up.
Jun 5, 2016
cd5f04c
Time for lots of alcohol.
Jun 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove Enum subclassing.
  • Loading branch information
Dan Sully committed Jun 5, 2016
commit 55af14e4a32c4ee34f88f579eb5bddfdb34b10c9
4 changes: 2 additions & 2 deletions doc/api/crypto.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ X509StoreContext objects

.. _openssl-pkey:

X509StoreFlags enums
--------------------
X509StoreFlags constants
------------------------

.. autoclass:: X509StoreFlags

Expand Down
3 changes: 1 addition & 2 deletions src/OpenSSL/crypto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
integer_types as _integer_types,
text_type as _text_type,
PY3 as _PY3)
from enum import Enum

from OpenSSL._util import (
ffi as _ffi,
Expand Down Expand Up @@ -1426,7 +1425,7 @@ def get_extension(self, index):
X509Type = X509


class X509StoreFlags(Enum):
class X509StoreFlags(object):
"""
Flags for X509 verification, used to change the behavior of
:class:`X509Store`.
Expand Down
6 changes: 2 additions & 4 deletions tests/test_crypto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3458,8 +3458,7 @@ def test_verify_with_revoked(self):
store.add_crl(root_crl)
store.add_crl(intermediate_crl)
store.set_flags(
X509StoreFlags.CRL_CHECK.value |
X509StoreFlags.CRL_CHECK_ALL.value)
X509StoreFlags.CRL_CHECK | X509StoreFlags.CRL_CHECK_ALL)
store_ctx = X509StoreContext(store, self.intermediate_server_cert)
e = self.assertRaises(
X509StoreContextError, store_ctx.verify_certificate)
Expand All @@ -3477,8 +3476,7 @@ def test_verify_with_missing_crl(self):
self.root_cert, self.root_key, certs=[self.intermediate_cert])
store.add_crl(root_crl)
store.set_flags(
X509StoreFlags.CRL_CHECK.value |
X509StoreFlags.CRL_CHECK_ALL.value)
X509StoreFlags.CRL_CHECK | X509StoreFlags.CRL_CHECK_ALL)
store_ctx = X509StoreContext(store, self.intermediate_server_cert)
e = self.assertRaises(
X509StoreContextError, store_ctx.verify_certificate)
Expand Down