Skip to content

Commit d788a4f

Browse files
authored
remove X509StoreFlags.NOTIFY_POLICY (#1213)
* remove X509StoreFlags.NOTIFY_POLICY fixes #1212 * also fix twisted * more CI fixes, sigh
1 parent 24ad5be commit d788a4f

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
TEST:
7272
- {CONTAINER: "ubuntu-bionic", TOXENV: "py36"}
7373
# cryptographyMain used since there's no wheel
74-
- {CONTAINER: "ubuntu-rolling", TOXENV: "py310-cryptographyMain"}
74+
- {CONTAINER: "ubuntu-rolling", TOXENV: "py311-cryptographyMain"}
7575
name: "${{ matrix.TEST.TOXENV }} on ${{ matrix.TEST.CONTAINER }}"
7676
steps:
7777
- uses: actions/checkout@v3

CHANGELOG.rst

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ The third digit is only for regressions.
1010
Backward-incompatible changes:
1111
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1212

13+
- Removed ``X509StoreFlags.NOTIFY_POLICY``.
14+
`#1213 <https://github.com/pyca/pyopenssl/pull/1213>`_.
15+
1316
Deprecations:
1417
^^^^^^^^^^^^^
1518

src/OpenSSL/crypto.py

-1
Original file line numberDiff line numberDiff line change
@@ -1645,7 +1645,6 @@ class X509StoreFlags:
16451645
POLICY_CHECK: int = _lib.X509_V_FLAG_POLICY_CHECK
16461646
EXPLICIT_POLICY: int = _lib.X509_V_FLAG_EXPLICIT_POLICY
16471647
INHIBIT_MAP: int = _lib.X509_V_FLAG_INHIBIT_MAP
1648-
NOTIFY_POLICY: int = _lib.X509_V_FLAG_NOTIFY_POLICY
16491648
CHECK_SS_SIGNATURE: int = _lib.X509_V_FLAG_CHECK_SS_SIGNATURE
16501649
PARTIAL_CHAIN: int = _lib.X509_V_FLAG_PARTIAL_CHAIN
16511650

tox.ini

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ commands =
3434

3535
[testenv:py311-twistedTrunk]
3636
deps =
37+
pyasn1!=0.5.0
3738
Twisted[all_non_platform] @ git+https://github.com/twisted/twisted
3839
setenv =
3940
commands =

0 commit comments

Comments
 (0)