diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2023-04-21 08:06:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-21 07:06:01 -0600 |
| commit | d788a4f1ee2cfe0642ea9e0533bb840077a88ca6 (patch) | |
| tree | 27479e3350ce331cc34e775a27466f7dbe09c9ca | |
| parent | 24ad5be8251c39817796db4334a21dbf3cd666e0 (diff) | |
| download | pyopenssl-d788a4f1ee2cfe0642ea9e0533bb840077a88ca6.tar.gz | |
remove X509StoreFlags.NOTIFY_POLICY (#1213)
* remove X509StoreFlags.NOTIFY_POLICY
fixes #1212
* also fix twisted
* more CI fixes, sigh
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | CHANGELOG.rst | 3 | ||||
| -rw-r--r-- | src/OpenSSL/crypto.py | 1 | ||||
| -rw-r--r-- | tox.ini | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d120cf6..e87c327 100644 --- 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 index 8a0957e..b2b4113 100644 --- 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 index a3d9e9a..b3f391d 100644 --- 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 @@ -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 = |