remove X509StoreFlags.NOTIFY_POLICY (#1213)

* remove X509StoreFlags.NOTIFY_POLICY fixes #1212 * also fix twisted * more CI fixes, sigh
pyca · Apr 21, 2023 · d788a4f · d788a4f
1 parent 24ad5be
commit d788a4f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -71,7 +71,7 @@ jobs:
         TEST:
           - {CONTAINER: "ubuntu-bionic", TOXENV: "py36"}
           # cryptographyMain used since there's no wheel
-          - {CONTAINER: "ubuntu-rolling", TOXENV: "py310-cryptographyMain"}
+          - {CONTAINER: "ubuntu-rolling", TOXENV: "py311-cryptographyMain"}
     name: "${{ matrix.TEST.TOXENV }} on ${{ matrix.TEST.CONTAINER }}"
     steps:
       - uses: actions/checkout@v3

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -10,6 +10,9 @@ The third digit is only for regressions.
 Backward-incompatible changes:
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+- Removed ``X509StoreFlags.NOTIFY_POLICY``.
+  `#1213 <https://github.com/pyca/pyopenssl/pull/1213>`_.
+
 Deprecations:
 ^^^^^^^^^^^^^
 

diff --git a/src/OpenSSL/crypto.py b/src/OpenSSL/crypto.py
@@ -1645,7 +1645,6 @@ class X509StoreFlags:
     POLICY_CHECK: int = _lib.X509_V_FLAG_POLICY_CHECK
     EXPLICIT_POLICY: int = _lib.X509_V_FLAG_EXPLICIT_POLICY
     INHIBIT_MAP: int = _lib.X509_V_FLAG_INHIBIT_MAP
-    NOTIFY_POLICY: int = _lib.X509_V_FLAG_NOTIFY_POLICY
     CHECK_SS_SIGNATURE: int = _lib.X509_V_FLAG_CHECK_SS_SIGNATURE
     PARTIAL_CHAIN: int = _lib.X509_V_FLAG_PARTIAL_CHAIN
 

diff --git a/tox.ini b/tox.ini
@@ -34,6 +34,7 @@ commands =
 
 [testenv:py311-twistedTrunk]
 deps =
+    pyasn1!=0.5.0
     Twisted[all_non_platform] @ git+https://github.com/twisted/twisted
 setenv =
 commands =