Accepting request 1030954 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/1030954
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pyOpenSSL?expand=0&rev=47
This commit is contained in:
Dominique Leuenberger 2022-10-29 18:16:04 +00:00 committed by Git OBS Bridge
commit f51aeaddfe
6 changed files with 92 additions and 17 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:660b1b1425aac4a1bea1d94168a85d99f0b3144c869dd4390d27629d0087f1bf
size 178438

3
pyOpenSSL-22.1.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7a83b7b272dd595222d672f5ce29aa030f1fb837630ef229f62e72e395ce8968
size 181704

View File

@ -0,0 +1,46 @@
diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
index 9db7353..c2a49f2 100644
--- a/src/OpenSSL/SSL.py
+++ b/src/OpenSSL/SSL.py
@@ -59,7 +59,7 @@ __all__ = [
"OP_NO_TLSv1",
"OP_NO_TLSv1_1",
"OP_NO_TLSv1_2",
- "OP_NO_TLSv1_3",
+ # "OP_NO_TLSv1_3", conditionally added below
"MODE_RELEASE_BUFFERS",
"OP_SINGLE_DH_USE",
"OP_SINGLE_ECDH_USE",
@@ -84,8 +84,8 @@ __all__ = [
"OP_NO_QUERY_MTU",
"OP_COOKIE_EXCHANGE",
"OP_NO_TICKET",
- "OP_NO_RENEGOTIATION",
- "OP_IGNORE_UNEXPECTED_EOF",
+ # "OP_NO_RENEGOTIATION", conditionally added below
+ # "OP_IGNORE_UNEXPECTED_EOF", conditionally added below
"OP_ALL",
"VERIFY_PEER",
"VERIFY_FAIL_IF_NO_PEER_CERT",
@@ -172,6 +172,7 @@ OP_NO_TLSv1_1 = _lib.SSL_OP_NO_TLSv1_1
OP_NO_TLSv1_2 = _lib.SSL_OP_NO_TLSv1_2
try:
OP_NO_TLSv1_3 = _lib.SSL_OP_NO_TLSv1_3
+ __all__ += ["OP_NO_TLSv1_3"]
except AttributeError:
pass
@@ -208,11 +209,13 @@ OP_NO_TICKET = _lib.SSL_OP_NO_TICKET
try:
OP_NO_RENEGOTIATION = _lib.SSL_OP_NO_RENEGOTIATION
+ __all__ += ["OP_NO_RENEGOTIATION"]
except AttributeError:
pass
try:
OP_IGNORE_UNEXPECTED_EOF = _lib.SSL_OP_IGNORE_UNEXPECTED_EOF
+ __all__ += ["OP_IGNORE_UNEXPECTED_EOF"]
except AttributeError:
pass

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Fri Oct 21 14:20:05 UTC 2022 - Ben Greiner <code@bnavigator.de>
- Upstream post-release doc fix (gh#pyca/pyopenssl#1150)
* The minimum cryptography version is now 38.0.x (and we now pin
releases against cryptography major versions to prevent future
breakage)
- Add pyOpenSSL-pr1158-conditional-__all__.patch
gh#pyca/pyopenssl#1158
-------------------------------------------------------------------
Thu Sep 29 19:33:29 UTC 2022 - Dirk Müller <dmueller@suse.com>
- update to 22.1.0:
* Remove support for SSLv2 and SSLv3.
* The minimum ``cryptography`` version is now 37.0.2.
* The ``OpenSSL.crypto.X509StoreContextError`` exception has been refactored,
changing its internal attributes.
* Add ``OpenSSL.SSL.Connection.set_verify`` and ``OpenSSL.SSL.Connection.get_verify_mode``
to override the context object's verification flags.
* Add ``OpenSSL.SSL.Connection.use_certificate`` and
``OpenSSL.SSL.Connection.use_privatekey``
to set a certificate per connection (and not just per context)
-------------------------------------------------------------------
Wed Jun 1 08:25:21 UTC 2022 - Steve Kowalik <steven.kowalik@suse.com>

View File

@ -27,7 +27,7 @@
%endif
%global skip_python2 1
Name: python-pyOpenSSL%{psuffix}
Version: 22.0.0
Version: 22.1.0
Release: 0
Summary: Python wrapper module around the OpenSSL library
License: Apache-2.0
@ -36,12 +36,14 @@ Source: https://files.pythonhosted.org/packages/source/p/pyOpenSSL/pyOpe
# PATCH-FIX-UPSTREAM skip-networked-test.patch gh#pyca/pyopenssl#68 mcepl@suse.com
# Mark tests requiring network access
Patch0: skip-networked-test.patch
# PATCH-FIX-UPSTREAM pyOpenSSL-pr1158-conditional-__all__.patch gh#pyca/pyopenssl#1158
Patch1: pyOpenSSL-pr1158-conditional-__all__.patch
BuildRequires: %{python_module cffi}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
%if %{with test}
BuildRequires: %{python_module cryptography >= 35}
BuildRequires: %{python_module cryptography >= 38.0.0 with %python-cryptography < 39}
BuildRequires: %{python_module flaky}
BuildRequires: %{python_module pretend}
BuildRequires: %{python_module pyOpenSSL >= %version}
@ -50,7 +52,7 @@ BuildRequires: ca-certificates-mozilla
BuildRequires: openssl
%endif
Requires: python-cffi
Requires: python-cryptography >= 35
Requires: (python-cryptography >= 38.0.0 with python-cryptography < 39)
Provides: pyOpenSSL = %{version}
BuildArch: noarch
%python_subpackages
@ -65,8 +67,7 @@ cryptography (<https://github.com/pyca/cryptography>), which provides (among
other things) a cffi-based interface to OpenSSL.
%prep
%setup -q -n pyOpenSSL-%{version}
%autopatch -p1
%autosetup -p1 -n pyOpenSSL-%{version}
%build
%python_build
@ -92,7 +93,7 @@ export LC_ALL=en_US.UTF-8
%license LICENSE
%doc *.rst
%{python_sitelib}/OpenSSL/
%{python_sitelib}/pyOpenSSL-%{version}-py*.egg-info
%{python_sitelib}/pyOpenSSL-%{version}*-info
%endif
%changelog

View File

@ -1,6 +1,8 @@
--- a/tests/test_ssl.py
+++ b/tests/test_ssl.py
@@ -1240,6 +1240,7 @@ class TestContext(object):
Index: pyOpenSSL-22.1.0/tests/test_ssl.py
===================================================================
--- pyOpenSSL-22.1.0.orig/tests/test_ssl.py
+++ pyOpenSSL-22.1.0/tests/test_ssl.py
@@ -1244,6 +1244,7 @@ class TestContext:
reason="set_default_verify_paths appears not to work on Windows. "
"See LP#404343 and LP#404344.",
)
@ -8,8 +10,10 @@
def test_set_default_verify_paths(self):
"""
`Context.set_default_verify_paths` causes the platform-specific CA
--- a/setup.cfg
+++ b/setup.cfg
Index: pyOpenSSL-22.1.0/setup.cfg
===================================================================
--- pyOpenSSL-22.1.0.orig/setup.cfg
+++ pyOpenSSL-22.1.0/setup.cfg
@@ -2,6 +2,8 @@
minversion = 3.0.1
strict = true
@ -17,9 +21,9 @@
+markers =
+ network: test case requires network connection
[bdist_wheel]
universal = 1
@@ -19,4 +21,3 @@ doc-files = doc/_build/html
[metadata]
license_file = LICENSE
@@ -16,4 +18,3 @@ doc_files = doc/_build/html
[egg_info]
tag_build =
tag_date = 0