Accepting request 493086 from devel:languages:python

1

OBS-URL: https://build.opensuse.org/request/show/493086
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pyOpenSSL?expand=0&rev=25
This commit is contained in:
Dominique Leuenberger 2017-05-16 12:29:25 +00:00 committed by Git OBS Bridge
commit d4bc66fe60
7 changed files with 94 additions and 48 deletions

View File

@ -2,12 +2,12 @@ Index: OpenSSL/test/test_crypto.py
===================================================================
--- OpenSSL/tests/test_crypto.py.orig
+++ OpenSSL/tests/test_crypto.py
@@ -627,7 +627,7 @@ class PKeyTests(TestCase):
:py:meth:`PKeyType.generate_key` generates an RSA key when passed
:py:data:`TYPE_RSA` as a type and a reasonable number of bits.
@@ -627,7 +627,7 @@
`PKey.generate_key` generates an RSA key when passed `TYPE_RSA` as a
type and a reasonable number of bits.
"""
- bits = 128
+ bits = 2048
key = PKey()
key.generate_key(TYPE_RSA, bits)
self.assertEqual(key.type(), TYPE_RSA)
assert key.type() == TYPE_RSA

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7779a3bbb74e79db234af6a08775568c6769b5821faecf6e2f4143edb227516e
size 167305

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:48abfe9d2bb8eb8d8947c8452b0223b7b1be2383b332f3b4f248fe59ef0bafdd
size 167121

View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Fri May 5 21:32:55 UTC 2017 - toddrme2178@gmail.com
- Fix Provides/Obsoletes.
-------------------------------------------------------------------
Wed Apr 26 14:20:27 UTC 2017 - toddrme2178@gmail.com
- Implement single-spec version
- Fix source URL
- Update to 17.0.0
* Added ``OpenSSL.X509Store.set_time()`` to set a custom
verification time when verifying certificate chains.
* Added a collection of functions for working with OCSP stapling.
None of these functions make it possible to validate OCSP
assertions, only to staple them into the handshake and to
retrieve the stapled assertion if provided.
Users will need to write their own code to handle OCSP
assertions.
We specifically added: ``Context.set_ocsp_server_callback``,
``Context.set_ocsp_client_callback``, and
``Connection.request_ocsp``.
* Changed the ``SSL`` module's memory allocation policy to
avoid zeroing memory it allocates when unnecessary.
This reduces CPU usage and memory allocation time by an amount
proportional to the size of the allocation.
For applications that process a lot of TLS data or that use
very lage allocations this can provide considerable performance
improvements.
* Automatically set ``SSL_CTX_set_ecdh_auto()`` on
``OpenSSL.SSL.Context``.
- Fix empty exceptions from ``OpenSSL.crypto.load_privatekey()``.
- Rebase bug-lp-1265482.diff
- Rebase rsa128-i586.patch
- Rebase skip-networked-test.patch
-------------------------------------------------------------------
Wed Nov 16 07:46:25 UTC 2016 - dmueller@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package python-pyOpenSSL
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,33 +16,40 @@
#
%bcond_without tests
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define oldpython python
Name: python-pyOpenSSL
Version: 16.2.0
Version: 17.0.0
Release: 0
Url: https://github.com/pyca/pyopenssl
Summary: Python wrapper module around the OpenSSL library
License: Apache-2.0
Group: Development/Languages/Python
Source: https://pypi.io/packages/source/p/pyOpenSSL/pyOpenSSL-%{version}.tar.gz
Source: https://files.pythonhosted.org/packages/source/p/pyOpenSSL/pyOpenSSL-%{version}.tar.gz
Patch0: bug-lp-1265482.diff
Patch1: skip-networked-test.patch
Patch2: rsa128-i586.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: openssl-devel
BuildRequires: python-Sphinx
BuildRequires: python-cryptography >= 1.3.4
BuildRequires: python-devel
BuildRequires: python-pytest
BuildRequires: python-setuptools
Requires: python-cryptography >= 1.3.1
Provides: pyOpenSSL = %{version}
Provides: python-openssl = %{version}
Obsoletes: python-openssl < %{version}
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%else
BuildArch: noarch
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module cryptography >= 1.3.4}
BuildRequires: python3-Sphinx
%if %{with tests}
BuildRequires: %{python_module pytest}
%endif
Requires: python-cryptography >= 1.3.4
Provides: pyOpenSSL = %{version}
%ifpython2
Obsoletes: %{oldpython}-openssl < %{version}
Provides: %{oldpython}-openssl = %{version}
%endif
BuildArch: noarch
%python_subpackages
%description
pyOpenSSL is a set of Python bindings for OpenSSL. It includes some low-level
@ -53,11 +60,11 @@ pyOpenSSL is now a pure-Python project with a dependency on a new project,
cryptography (<https://github.com/pyca/cryptography>), which provides (among
other things) a cffi-based interface to OpenSSL.
%package doc
%package -n %{name}-doc
Summary: Documentation for %{name}
Group: Documentation/HTML
%description doc
%description -n %{name}-doc
Provides documentation for %{name}.
%prep
@ -67,26 +74,29 @@ Provides documentation for %{name}.
%patch2 -p1
%build
python setup.py build
PYTHONPATH="build/lib" python setup.py build_sphinx && rm build/sphinx/html/.buildinfo
%python_build
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
PYTHONPATH="%{buildroot}%{python3_sitelib}" python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo
%if %{with tests}
%check
export LC_ALL=en_US.UTF-8
export PYTHONPATH=src
py.test -m "not network"
%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib}
py.test-%{$python_bin_suffix} -m "not network" -k "not test_export_text"
}
%endif
%files
%defattr(0644,root,root,0755)
%files %{python_files}
%defattr(-,root,root)
%doc LICENSE *.rst
%{python_sitelib}/OpenSSL/
%{python_sitelib}/pyOpenSSL-%{version}-py*.egg-info/
%{python_sitelib}/pyOpenSSL-%{version}-py*.egg-info
%files doc
%defattr(0644,root,root,0755)
%files -n %{name}-doc
%defattr(-,root,root)
%doc build/sphinx/html/
%doc examples/

View File

@ -1,17 +1,17 @@
Index: pyOpenSSL-16.0.0/tests/test_ssl.py
Index: pyOpenSSL-17.0.0/tests/test_ssl.py
===================================================================
--- pyOpenSSL-16.0.0.orig/tests/test_ssl.py
+++ pyOpenSSL-16.0.0/tests/test_ssl.py
@@ -549,7 +549,7 @@ class ContextTests(TestCase, _LoopbackMi
instance.
--- pyOpenSSL-17.0.0.orig/tests/test_ssl.py
+++ pyOpenSSL-17.0.0/tests/test_ssl.py
@@ -525,7 +525,7 @@
`Context.use_privatekey` takes an `OpenSSL.crypto.PKey` instance.
"""
key = PKey()
- key.generate_key(TYPE_RSA, 128)
+ key.generate_key(TYPE_RSA, 2048)
ctx = Context(TLSv1_METHOD)
ctx.use_privatekey(key)
self.assertRaises(TypeError, ctx.use_privatekey, "")
@@ -569,7 +569,7 @@ class ContextTests(TestCase, _LoopbackMi
with pytest.raises(TypeError):
@@ -546,7 +546,7 @@
arguments does not raise an exception.
"""
key = PKey()
@ -20,12 +20,12 @@ Index: pyOpenSSL-16.0.0/tests/test_ssl.py
with open(pemfile, "wt") as pem:
pem.write(
@@ -920,7 +920,7 @@ class ContextTests(TestCase, _LoopbackMi
@@ -849,7 +849,7 @@
passphrase. Return the path to the new file.
"""
key = PKey()
- key.generate_key(TYPE_RSA, 128)
+ key.generate_key(TYPE_RSA, 2048)
pemFile = self.mktemp()
fObj = open(pemFile, 'w')
pem = dump_privatekey(FILETYPE_PEM, key, "blowfish", passphrase)
with open(tmpfile, 'w') as fObj:
fObj.write(pem.decode('ascii'))

View File

@ -2,11 +2,11 @@ Index: pyOpenSSL-16.0.0/tests/test_ssl.py
===================================================================
--- pyOpenSSL-16.0.0.orig/tests/test_ssl.py
+++ pyOpenSSL-16.0.0/tests/test_ssl.py
@@ -1198,6 +1198,7 @@ class ContextTests(TestCase, _LoopbackMi
@@ -1113,6 +1113,7 @@
reason="set_default_verify_paths appears not to work on Windows. "
"See LP#404343 and LP#404344."
)
+ @pytest.mark.network
def test_set_default_verify_paths(self):
"""
:py:obj:`Context.set_default_verify_paths` causes the
`Context.set_default_verify_paths` causes the platform-specific CA