[Python-modules-commits] [pyopenssl] 05/18: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Wed Dec 13 04:58:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository pyopenssl.
commit aa9a631c1f77f4e2cb78ab83b68ad40a13c069b8
Merge: 408c5cf 17fe01f
Author: Sandro Tosi <morph at debian.org>
Date: Sun Dec 10 22:20:33 2017 -0500
merge patched into master
CHANGELOG.rst | 203 +-
CONTRIBUTING.rst | 2 -
INSTALL.rst | 18 +
MANIFEST.in | 13 +-
PKG-INFO | 87 +-
README.rst | 6 +-
debian/.git-dpm | 6 +-
...t_set_default_verify_paths-since-it-tries.patch | 37 +-
...02-pass-PYTHONPATH-when-building-HTML-doc.patch | 2 +-
doc/api.rst | 1 -
doc/api/crypto.rst | 42 +-
doc/api/rand.rst | 43 -
doc/api/ssl.rst | 14 +-
doc/conf.py | 16 +-
docs-requirements.txt | 2 -
examples/simple/server.py | 3 +-
setup.cfg | 4 +-
setup.py | 17 +-
src/OpenSSL/SSL.py | 500 +++-
src/OpenSSL/__init__.py | 4 +-
src/OpenSSL/_util.py | 6 +
src/OpenSSL/crypto.py | 450 +++-
src/OpenSSL/debug.py | 42 +
src/OpenSSL/rand.py | 183 +-
src/OpenSSL/tsafe.py | 7 +
src/OpenSSL/version.py | 6 +-
src/pyOpenSSL.egg-info/PKG-INFO | 87 +-
src/pyOpenSSL.egg-info/SOURCES.txt | 4 +-
src/pyOpenSSL.egg-info/requires.txt | 11 +-
tests/conftest.py | 14 +
tests/test_crypto.py | 2599 +++++++++---------
tests/test_debug.py | 10 +
tests/test_rand.py | 187 +-
tests/test_ssl.py | 2837 ++++++++++----------
tests/test_tsafe.py | 10 +-
tests/test_util.py | 15 +-
tests/util.py | 329 +--
tox.ini | 17 +-
38 files changed, 4107 insertions(+), 3727 deletions(-)
diff --cc debian/.git-dpm
index 414a06d,0000000..f8e8efe
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- c88b82c90e031c8c94633b30864c46f65bf7fc82
- c88b82c90e031c8c94633b30864c46f65bf7fc82
- d4eb534a46ebf3546919bfd415a97288e71ab4a1
++17fe01f6b1f88173975523536bb2530561f38703
++17fe01f6b1f88173975523536bb2530561f38703
++ece132987aa1ce8adb0367287b41c4d349633896
+ece132987aa1ce8adb0367287b41c4d349633896
+pyopenssl_17.5.0.orig.tar.gz
+77bb6a9f5f20834bd9ba5d1bdc4bd82d6b6208be
+170870
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-disable-test_set_default_verify_paths-since-it-tries.patch
index a6c0dd2,0000000..248d437
mode 100644,000000..100644
--- a/debian/patches/0001-disable-test_set_default_verify_paths-since-it-tries.patch
+++ b/debian/patches/0001-disable-test_set_default_verify_paths-since-it-tries.patch
@@@ -1,58 -1,0 +1,57 @@@
- From b9227a312f9d70853fa42af49d920a9099df68aa Mon Sep 17 00:00:00 2001
++From d576c2a816de6adbfa4c3544aafb93b8c1468e7b Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 10:47:52 -0700
+Subject: disable test_set_default_verify_paths since it tries to access the
+ web
+
+---
- tests/test_ssl.py | 28 +++++++++++++++-------------
- 1 file changed, 15 insertions(+), 13 deletions(-)
++ tests/test_ssl.py | 28 ++++++++++++++++------------
++ 1 file changed, 16 insertions(+), 12 deletions(-)
+
+diff --git a/tests/test_ssl.py b/tests/test_ssl.py
- index 2b7e276..31738d9 100644
++index 03dd935..a95a898 100644
+--- a/tests/test_ssl.py
++++ b/tests/test_ssl.py
- @@ -1182,6 +1182,7 @@ class ContextTests(TestCase, _LoopbackMixin):
++@@ -1183,6 +1183,7 @@ class TestContext(object):
+ platform == "win32",
+ reason="set_default_verify_paths appears not to work on Windows. "
+ "See LP#404343 and LP#404344."
++
+ )
+ def test_set_default_verify_paths(self):
+ """
- @@ -1196,21 +1197,22 @@ class ContextTests(TestCase, _LoopbackMixin):
++@@ -1196,19 +1197,22 @@ class TestContext(object):
+ # internet which has such a certificate. Connecting to the network
+ # in a unit test is bad, but it's the only way I can think of to
+ # really test this. -exarkun
- + pass
-
- # Arg, verisign.com doesn't speak anything newer than TLS 1.0
+- context = Context(SSLv23_METHOD)
+- context.set_default_verify_paths()
+- context.set_verify(
+- VERIFY_PEER,
+- lambda conn, cert, errno, depth, preverify_ok: preverify_ok)
- -
- - client = socket()
- - client.connect(("encrypted.google.com", 443))
- - clientSSL = Connection(context, client)
- - clientSSL.set_connect_state()
- - clientSSL.do_handshake()
- - clientSSL.send(b"GET / HTTP/1.0\r\n\r\n")
- - self.assertTrue(clientSSL.recv(1024))
+++ pass
+++
++ #context = Context(SSLv23_METHOD)
++ #context.set_default_verify_paths()
++ #context.set_verify(
++ # VERIFY_PEER,
++ # lambda conn, cert, errno, depth, preverify_ok: preverify_ok)
++
++ #client = socket()
++ #client.connect(("encrypted.google.com", 443))
++ #clientSSL = Connection(context, client)
++ #clientSSL.set_connect_state()
++ #clientSSL.do_handshake()
++ #clientSSL.send(b"GET / HTTP/1.0\r\n\r\n")
- + #self.assertTrue(clientSSL.recv(1024))
+++ #assert clientSSL.recv(1024)
++
++- client = socket()
++- client.connect(("encrypted.google.com", 443))
++- clientSSL = Connection(context, client)
++- clientSSL.set_connect_state()
++- clientSSL.do_handshake()
++- clientSSL.send(b"GET / HTTP/1.0\r\n\r\n")
++- assert clientSSL.recv(1024)
+
- def test_set_default_verify_paths_signature(self):
++ def test_fallback_path_is_not_file_or_dir(self):
+ """
diff --cc debian/patches/0002-pass-PYTHONPATH-when-building-HTML-doc.patch
index 771f596,0000000..af7ba94
mode 100644,000000..100644
--- a/debian/patches/0002-pass-PYTHONPATH-when-building-HTML-doc.patch
+++ b/debian/patches/0002-pass-PYTHONPATH-when-building-HTML-doc.patch
@@@ -1,30 -1,0 +1,30 @@@
- From c88b82c90e031c8c94633b30864c46f65bf7fc82 Mon Sep 17 00:00:00 2001
++From 17fe01f6b1f88173975523536bb2530561f38703 Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Wed, 13 Apr 2016 21:03:53 +0100
+Subject: pass PYTHONPATH when building HTML doc
+
+---
+ doc/Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/doc/Makefile b/doc/Makefile
+index 4202bee..5fec498 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -6,6 +6,7 @@ SPHINXOPTS =
+ SPHINXBUILD = sphinx-build
+ PAPER =
+ BUILDDIR = _build
++PYTHONPATH = .
+
+ # Internal variables.
+ PAPEROPT_a4 = -D latex_paper_size=a4
+@@ -37,7 +38,7 @@ clean:
+ -rm -rf $(BUILDDIR)/*
+
+ html:
+- $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
++ PYTHONPATH=$(PYTHONPATH) $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyopenssl.git
More information about the Python-modules-commits
mailing list