Hello community,
here is the log from the commit of package python-M2Crypto for openSUSE:Factory
checked in at 2019-03-13 09:10:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-M2Crypto (Old)
and /work/SRC/openSUSE:Factory/.python-M2Crypto.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-M2Crypto"
Wed Mar 13 09:10:43 2019 rev:31 rq:682462 version:0.32.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-M2Crypto/python-M2Crypto.changes
2018-12-06 12:15:00.081669065 +0100
+++
/work/SRC/openSUSE:Factory/.python-M2Crypto.new.28833/python-M2Crypto.changes
2019-03-13 09:10:51.995413759 +0100
@@ -1,0 +2,15 @@
+Thu Mar 7 14:14:45 CET 2019 - Matej Cepl <mc...@suse.com>
+
+- Fix for compatibility with OpenSSL 1.1.0h by adding the patch
+ 0001-tests-test_ssl-use-ciphercuites-for-TLS1.3-cipher-in.patch
+
+-------------------------------------------------------------------
+Tue Mar 5 09:01:46 CET 2019 - Matej Cepl <mc...@suse.com>
+
+- Update to 0.32.0:
+ * 471582f - setup.py: use ${CPP} as path to cpp <Duncan Macleod>
+ * efb1580 - Bump pipeline OpenSSL from 1.1.0i to 1.1.0j
+ * 35bb71b - Stub wchar_t helpers and ignore unused WCHAR defs
+ * effc7be - Add type comment to setup.py <Matěj Cepl>
+
+-------------------------------------------------------------------
Old:
----
M2Crypto-0.31.0.tar.gz
New:
----
0001-tests-test_ssl-use-ciphercuites-for-TLS1.3-cipher-in.patch
M2Crypto-0.32.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-M2Crypto.spec ++++++
--- /var/tmp/diff_new_pack.ud1ZWv/_old 2019-03-13 09:10:53.263413629 +0100
+++ /var/tmp/diff_new_pack.ud1ZWv/_new 2019-03-13 09:10:53.263413629 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-M2Crypto
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -19,13 +19,14 @@
%define oldpython python
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-M2Crypto
-Version: 0.31.0
+Version: 0.32.0
Release: 0
Summary: Crypto and SSL toolkit for Python
License: MIT
Group: Development/Languages/Python
Url: https://gitlab.com/m2crypto/m2crypto
Source:
https://files.pythonhosted.org/packages/source/M/M2Crypto/M2Crypto-%{version}.tar.gz
+Patch0: 0001-tests-test_ssl-use-ciphercuites-for-TLS1.3-cipher-in.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module typing}
@@ -77,8 +78,8 @@
Documentation for the Crypto and SSL toolkit for Python
%prep
-# %%setup -q -n M2Crypto-%%{version}
-%setup -q -n M2Crypto-0.31.0
+%setup -q -n M2Crypto-%{version}
+%autopatch -p1
%build
export CFLAGS="%{optflags}"
++++++ 0001-tests-test_ssl-use-ciphercuites-for-TLS1.3-cipher-in.patch ++++++
>From 862167880780c1b1219b6be3864ba587f0bdddba Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <sebast...@breakpoint.cc>
Date: Sat, 2 Mar 2019 17:08:39 +0100
Subject: [PATCH] tests/test_ssl: use -ciphercuites for TLS1.3 cipher in
openssl1.1
The -cipher can not be used in OpenSSL 1.1.b+ for TLS1.3 cipher since
openssl upstream commit 1c31fe7eb093a ("Ignore cipher suites when
setting cipher list").
Use -ciphersuites for TLS1.3 cipher as documented.
Signed-off-by: Sebastian Andrzej Siewior <sebast...@breakpoint.cc>
---
tests/test_ssl.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/tests/test_ssl.py
+++ b/tests/test_ssl.py
@@ -460,9 +460,10 @@ class MiscSSLClientTestCase(BaseSSLClien
def test_cipher_ok(self):
if OPENSSL111:
TCIPHER = 'TLS_AES_256_GCM_SHA384'
+ self.args = self.args + ['-ciphersuites', TCIPHER]
else:
TCIPHER = 'AES128-SHA'
- self.args = self.args + ['-cipher', TCIPHER]
+ self.args = self.args + ['-cipher', TCIPHER]
pid = self.start_server(self.args)
try:
++++++ M2Crypto-0.31.0.tar.gz -> M2Crypto-0.32.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/M2Crypto-0.31.0/CHANGES new/M2Crypto-0.32.0/CHANGES
--- old/M2Crypto-0.31.0/CHANGES 2018-11-08 22:18:32.000000000 +0100
+++ new/M2Crypto-0.32.0/CHANGES 2019-03-04 18:30:22.000000000 +0100
@@ -1,3 +1,11 @@
+0.32.0 - 2019-03-04
+-------------------
+
+- 471582f - setup.py: use ${CPP} as path to cpp <Duncan Macleod>
+- efb1580 - Bump pipeline OpenSSL from 1.1.0i to 1.1.0j
+- 35bb71b - Stub wchar_t helpers and ignore unused WCHAR defs <makepost>
+- effc7be - Add type comment to setup.py <Matěj Cepl>
+
0.31.0 - 2018-11-08
-------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/M2Crypto-0.31.0/M2Crypto/__init__.py
new/M2Crypto-0.32.0/M2Crypto/__init__.py
--- old/M2Crypto-0.31.0/M2Crypto/__init__.py 2018-11-08 22:21:03.000000000
+0100
+++ new/M2Crypto-0.32.0/M2Crypto/__init__.py 2019-03-04 18:28:39.000000000
+0100
@@ -20,7 +20,7 @@
# noqa
import sys
from distutils.version import StrictVersion
-__version__ = '0.31.0'
+__version__ = '0.32.0'
version = __version__ # type: str
version_info = StrictVersion(__version__).version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/M2Crypto-0.31.0/M2Crypto.egg-info/PKG-INFO
new/M2Crypto-0.32.0/M2Crypto.egg-info/PKG-INFO
--- old/M2Crypto-0.31.0/M2Crypto.egg-info/PKG-INFO 2018-11-08
22:22:36.000000000 +0100
+++ new/M2Crypto-0.32.0/M2Crypto.egg-info/PKG-INFO 2019-03-04
18:40:55.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: M2Crypto
-Version: 0.31.0
+Version: 0.32.0
Summary: M2Crypto: A Python crypto and SSL toolkit
Home-page: https://gitlab.com/m2crypto/m2crypto
Author: Ng Pheng Siong
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/M2Crypto-0.31.0/PKG-INFO new/M2Crypto-0.32.0/PKG-INFO
--- old/M2Crypto-0.31.0/PKG-INFO 2018-11-08 22:22:36.000000000 +0100
+++ new/M2Crypto-0.32.0/PKG-INFO 2019-03-04 18:40:56.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: M2Crypto
-Version: 0.31.0
+Version: 0.32.0
Summary: M2Crypto: A Python crypto and SSL toolkit
Home-page: https://gitlab.com/m2crypto/m2crypto
Author: Ng Pheng Siong
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/M2Crypto-0.31.0/SWIG/_m2crypto.i
new/M2Crypto-0.32.0/SWIG/_m2crypto.i
--- old/M2Crypto-0.31.0/SWIG/_m2crypto.i 2018-03-06 23:45:31.000000000
+0100
+++ new/M2Crypto-0.32.0/SWIG/_m2crypto.i 2019-03-04 18:05:59.000000000
+0100
@@ -19,6 +19,14 @@
#define __WCHAR_MAX__ __WCHAR_MAX
#define __WCHAR_MIN__ __WCHAR_MIN
#endif
+/* https://gitlab.com/m2crypto/m2crypto/issues/246 */
+%ignore WCHAR_MAX;
+%ignore WCHAR_MIN;
+/* http://swig.10945.n7.nabble.com/SWIG-AsVal-wchar-t-error-td2264.html */
+%{
+int SWIG_AsVal_wchar_t(PyObject *p, wchar_t *c) { return SWIG_OK; }
+PyObject *SWIG_From_wchar_t(wchar_t c) { return SWIG_Py_Void(); }
+%}
%{
#ifdef _WIN32
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/M2Crypto-0.31.0/appveyor.yml
new/M2Crypto-0.32.0/appveyor.yml
--- old/M2Crypto-0.31.0/appveyor.yml 2018-10-08 14:38:25.000000000 +0200
+++ new/M2Crypto-0.32.0/appveyor.yml 2019-03-04 18:05:59.000000000 +0100
@@ -5,8 +5,8 @@
secure: oqWqarxnd4H23FMywnlQeg==
PASS:
secure: j/VSxdYJ7mdR44u8OdywLg==
- X86_OPENSSL_INSTALLER: Win32OpenSSL-1_1_0i.exe
- X64_OPENSSL_INSTALLER: Win64OpenSSL-1_1_0i.exe
+ X86_OPENSSL_INSTALLER: Win32OpenSSL-1_1_0j.exe
+ X64_OPENSSL_INSTALLER: Win64OpenSSL-1_1_0j.exe
matrix:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/M2Crypto-0.31.0/setup.py new/M2Crypto-0.32.0/setup.py
--- old/M2Crypto-0.31.0/setup.py 2018-10-12 11:06:56.000000000 +0200
+++ new/M2Crypto-0.32.0/setup.py 2019-03-04 18:27:03.000000000 +0100
@@ -50,7 +50,7 @@
'*Visual*', 'VC', 'include')
err = glob.glob(globmask)
else:
- pid = subprocess.Popen(['cpp', '-Wp,-v', '-'],
+ pid = subprocess.Popen([os.environ.get('CPP', 'cpp'), '-Wp,-v', '-'],
stdin=open(os.devnull, 'r'),
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
@@ -121,6 +121,7 @@
self.bundledlls = None
def finalize_options(self):
+ # type: (None) -> None
"""Append custom openssl include file and library linking options."""
build_ext.build_ext.finalize_options(self)
self.openssl_default = None
Binary files old/M2Crypto-0.31.0/tests/randpool.dat and
new/M2Crypto-0.32.0/tests/randpool.dat differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/M2Crypto-0.31.0/tests/sig.p7
new/M2Crypto-0.32.0/tests/sig.p7
--- old/M2Crypto-0.31.0/tests/sig.p7 2018-09-09 17:03:22.000000000 +0200
+++ new/M2Crypto-0.32.0/tests/sig.p7 2019-02-15 11:28:51.000000000 +0100
@@ -1,26 +1,35 @@
-----BEGIN PKCS7-----
-MIIEeAYJKoZIhvcNAQcCoIIEaTCCBGUCAQExCzAJBgUrDgMCGgUAMBgGCSqGSIb3
-DQEHAaALBAlzb21lIHRleHSgggJeMIICWjCCAcOgAwIBAgIBAzANBgkqhkiG9w0B
-AQUFADBPMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UE
-ChMITTJDcnlwdG8xGDAWBgNVBAMTD0hlaWtraSBUb2l2b25lbjAeFw0xNTExMjYy
-MTMzMTJaFw0yNTExMjMyMTMzMTJaMGkxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpD
-YWxpZm9ybmlhMREwDwYDVQQKEwhNMkNyeXB0bzEPMA0GA1UEAxMGU2lnbmVyMSEw
-HwYJKoZIhvcNAQkBFhJzaWduZXJAZXhhbXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBAMwwnjSFOILEjfeDLouvPKSEZxiQgRz4WKvYk4ehpFFbbBUY
-EDUNKXwG2nKnp8QerlWCzqlpwSnNbjchppK6AcLaCXulnryBYG1Zr0DTkRHW6jEa
-uDWkXQ7yPwnR7X00mLxflPb97x5WM68S0Rr36uqlBs8xek8vHr1hJsyZQfeTAgMB
-AAGjLDAqMAkGA1UdEwQCMAAwHQYDVR0OBBYEFL2gaB862G4r2ttUCdLmOTubBGzE
-MA0GCSqGSIb3DQEBBQUAA4GBAJtLgDOX79a3CaX1f0MgcdWbg11SPYOO31HZ5bvj
-1YqqnVz/LeW3TWcG7vj9Ypke5uomeiQJh1s8Wk9f41qnTZgQgrJ+OBMH8WIzCmfd
-YfK9nfuDD0XgsSJxnzzI9piglanM+lfqtyaGxCjAl+Sm4oaFOaqPQbpF2pJxBqo4
-sCv9MYIB1TCCAdECAQEwVDBPMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZv
-cm5pYTERMA8GA1UEChMITTJDcnlwdG8xGDAWBgNVBAMTD0hlaWtraSBUb2l2b25l
-bgIBAzAJBgUrDgMCGgUAoIHYMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJ
-KoZIhvcNAQkFMQ8XDTE4MDkwOTE1MDMyMlowIwYJKoZIhvcNAQkEMRYEFDeqY8dz
-mNlURzJi4aAFfB5jLtp3MHkGCSqGSIb3DQEJDzFsMGowCwYJYIZIAWUDBAEqMAsG
-CWCGSAFlAwQBFjALBglghkgBZQMEAQIwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwIC
-AgCAMA0GCCqGSIb3DQMCAgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMA0GCSqG
-SIb3DQEBAQUABIGAvUu/Oonnfcp6QmT1e/Xo0nak5ANvRq3ZRFb92HmXZqQZpICh
-4pXqDGJVzX4AaSS0DjA7P6JCW7CuOihZIoHuhCPtabms/3h4Uk0+W0xJWiDP6Eex
-/Uld7ZSzB3iK9YN70QC0drAyJElP8qgmAV9XUwlx9tR3NszaDEG0CxGZ/FY=
+MIIF/gYJKoZIhvcNAQcCoIIF7zCCBesCAQExCzAJBgUrDgMCGgUAMBgGCSqGSIb3
+DQEHAaALBAlzb21lIHRleHSgggNjMIIDXzCCAkegAwIBAgIBAzANBgkqhkiG9w0B
+AQsFADBPMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTERMA8GA1UE
+CgwITTJDcnlwdG8xGDAWBgNVBAMMD0hlaWtraSBUb2l2b25lbjAeFw0xODEwMDcx
+NTEyMDJaFw0yODEwMDQxNTEyMDJaMGkxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApD
+YWxpZm9ybmlhMREwDwYDVQQKDAhNMkNyeXB0bzEPMA0GA1UEAwwGU2lnbmVyMSEw
+HwYJKoZIhvcNAQkBFhJzaWduZXJAZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDIhYY9cqqR2HsRAgWStxu/nzW+iFbblvJwPpg8w2JC
+/1R0emPnqUyuUkiiT6vFax3eObjwiTYV93A9qKbDST4Q2K66zxrm3QvYzdkA6lfy
+fC5tiYCVaLH9BrzqukTB+iCHV9Os5bRduk8QIIJbGyd1swzOT3k/SY7juhQwz4qC
+EWVZeHtBFkPo6n+kYFJGk1NO3oc/UIpWxdMEXDyi07Bk2M4eda3OzZGxWMwtptza
+tbLCDi9odKelbmFMAfLQfYNmeGafuYczzFncA4Jvu5gM6RBjEu7pBcFbmH6UZZjf
+Mb9ZkPAcbKwsG92QcasRlYuc9yovwA8tschaZdapNESBAgMBAAGjLDAqMAkGA1Ud
+EwQCMAAwHQYDVR0OBBYEFGgDMyfZh5rqfUHYLev57qvJasX6MA0GCSqGSIb3DQEB
+CwUAA4IBAQBHJ2JtQ/P2hwqPH/FLK2cFEYWxE2nK3h5vj3iutbd1yoTzWCadxQsO
+TOnOHF1pA27XLogodXjFVDfmcE+PkvtfzsKzo3R35sOUq8bSabvd2BadNirRweEN
+gdqWn/GupLlzFrGYtflqTIsIMMPWMTp54u9/209vE/iY1rIEcsMDsv9jrc5OjZU3
+ptxSXlwmNZ8Ufp2gBEYA/1KU8St1HFLweetBqDmiWmPM3nDNgnJ3HXfhPf84hi0S
+T6tMcjVpT61VHdqunQojSswqQNhO9b0zTOu3R0GCKsn8ZA0zdgBhurZAyiSWXoTV
+T9JNLnoxpVBTuusxe3if9EPx5VRPWdy6MYICVjCCAlICAQEwVDBPMQswCQYDVQQG
+EwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTERMA8GA1UECgwITTJDcnlwdG8xGDAW
+BgNVBAMMD0hlaWtraSBUb2l2b25lbgIBAzAJBgUrDgMCGgUAoIHYMBgGCSqGSIb3
+DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTE5MDIxNTEwMjg1MVow
+IwYJKoZIhvcNAQkEMRYEFDeqY8dzmNlURzJi4aAFfB5jLtp3MHkGCSqGSIb3DQEJ
+DzFsMGowCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBFjALBglghkgBZQMEAQIwCgYI
+KoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMA0GCCqGSIb3DQMCAgFAMAcGBSsOAwIH
+MA0GCCqGSIb3DQMCAgEoMA0GCSqGSIb3DQEBAQUABIIBAL09HiQZDUYTaZmrGv0P
+9CGI8WL1xuLeCJaPGhr9viFN4m16nG+qBLihog5dOI7/uLfKFyblgvfYIu8zhaHy
+JN6BYmDOX9Mkj3C4L4k4jRs6FQu8zevthBzKTn08AhlIAmneHoLjGF7zadqt8MoO
+s3/yzxM64GdNCEL/5V5xTB7jBxXSHIqK7Twi6fJKhZhbBz2JtMpwxRBMwLplie4C
+YWYYkfXU0bGr4/qA0jBp5cvvRAsl+WrnbEo+ViQLOAmKjp8aGsf7AgT7Q7dHZYXl
+GI9g5tb0QFUptsbQPRdb1xMBDU4lSywTZiZ6kPt6fiCWB4K1tdjSlhVV7GhhqgJI
+HnM=
-----END PKCS7-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/M2Crypto-0.31.0/tests/sig.p7s
new/M2Crypto-0.32.0/tests/sig.p7s
--- old/M2Crypto-0.31.0/tests/sig.p7s 2018-09-09 17:03:22.000000000 +0200
+++ new/M2Crypto-0.32.0/tests/sig.p7s 2019-02-15 11:28:51.000000000 +0100
@@ -1,39 +1,47 @@
MIME-Version: 1.0
-Content-Type: multipart/signed; protocol="application/x-pkcs7-signature";
micalg="sha1"; boundary="----5091526DA45562EAF43348F05B8CD98A"
+Content-Type: multipart/signed; protocol="application/x-pkcs7-signature";
micalg="sha1"; boundary="----4469424C67FDBBE03CA0ACF6293E5314"
This is an S/MIME signed message
-------5091526DA45562EAF43348F05B8CD98A
+------4469424C67FDBBE03CA0ACF6293E5314
some text
-------5091526DA45562EAF43348F05B8CD98A
+------4469424C67FDBBE03CA0ACF6293E5314
Content-Type: application/x-pkcs7-signature; name="smime.p7s"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="smime.p7s"
-MIIEawYJKoZIhvcNAQcCoIIEXDCCBFgCAQExCzAJBgUrDgMCGgUAMAsGCSqGSIb3
-DQEHAaCCAl4wggJaMIIBw6ADAgECAgEDMA0GCSqGSIb3DQEBBQUAME8xCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQKEwhNMkNyeXB0bzEY
-MBYGA1UEAxMPSGVpa2tpIFRvaXZvbmVuMB4XDTE1MTEyNjIxMzMxMloXDTI1MTEy
-MzIxMzMxMlowaTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAP
-BgNVBAoTCE0yQ3J5cHRvMQ8wDQYDVQQDEwZTaWduZXIxITAfBgkqhkiG9w0BCQEW
-EnNpZ25lckBleGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-zDCeNIU4gsSN94Mui688pIRnGJCBHPhYq9iTh6GkUVtsFRgQNQ0pfAbacqenxB6u
-VYLOqWnBKc1uNyGmkroBwtoJe6WevIFgbVmvQNOREdbqMRq4NaRdDvI/CdHtfTSY
-vF+U9v3vHlYzrxLRGvfq6qUGzzF6Ty8evWEmzJlB95MCAwEAAaMsMCowCQYDVR0T
-BAIwADAdBgNVHQ4EFgQUvaBoHzrYbiva21QJ0uY5O5sEbMQwDQYJKoZIhvcNAQEF
-BQADgYEAm0uAM5fv1rcJpfV/QyBx1ZuDXVI9g47fUdnlu+PViqqdXP8t5bdNZwbu
-+P1imR7m6iZ6JAmHWzxaT1/jWqdNmBCCsn44EwfxYjMKZ91h8r2d+4MPReCxInGf
-PMj2mKCVqcz6V+q3JobEKMCX5KbihoU5qo9BukXaknEGqjiwK/0xggHVMIIB0QIB
-ATBUME8xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQK
-EwhNMkNyeXB0bzEYMBYGA1UEAxMPSGVpa2tpIFRvaXZvbmVuAgEDMAkGBSsOAwIa
-BQCggdgwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcN
-MTgwOTA5MTUwMzIyWjAjBgkqhkiG9w0BCQQxFgQUN6pjx3OY2VRHMmLhoAV8HmMu
-2ncweQYJKoZIhvcNAQkPMWwwajALBglghkgBZQMEASowCwYJYIZIAWUDBAEWMAsG
-CWCGSAFlAwQBAjAKBggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcN
-AwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwDQYJKoZIhvcNAQEBBQAEgYC9
-S786ied9ynpCZPV79ejSdqTkA29GrdlEVv3YeZdmpBmkgKHileoMYlXNfgBpJLQO
-MDs/okJbsK46KFkige6EI+1puaz/eHhSTT5bTElaIM/oR7H9SV3tlLMHeIr1g3vR
-ALR2sDIkSU/yqCYBX1dTCXH21Hc2zNoMQbQLEZn8Vg==
+MIIF8QYJKoZIhvcNAQcCoIIF4jCCBd4CAQExCzAJBgUrDgMCGgUAMAsGCSqGSIb3
+DQEHAaCCA2MwggNfMIICR6ADAgECAgEDMA0GCSqGSIb3DQEBCwUAME8xCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQKDAhNMkNyeXB0bzEY
+MBYGA1UEAwwPSGVpa2tpIFRvaXZvbmVuMB4XDTE4MTAwNzE1MTIwMloXDTI4MTAw
+NDE1MTIwMlowaTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExETAP
+BgNVBAoMCE0yQ3J5cHRvMQ8wDQYDVQQDDAZTaWduZXIxITAfBgkqhkiG9w0BCQEW
+EnNpZ25lckBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMiFhj1yqpHYexECBZK3G7+fNb6IVtuW8nA+mDzDYkL/VHR6Y+epTK5SSKJP
+q8VrHd45uPCJNhX3cD2opsNJPhDYrrrPGubdC9jN2QDqV/J8Lm2JgJVosf0GvOq6
+RMH6IIdX06zltF26TxAgglsbJ3WzDM5PeT9JjuO6FDDPioIRZVl4e0EWQ+jqf6Rg
+UkaTU07ehz9QilbF0wRcPKLTsGTYzh51rc7NkbFYzC2m3Nq1ssIOL2h0p6VuYUwB
+8tB9g2Z4Zp+5hzPMWdwDgm+7mAzpEGMS7ukFwVuYfpRlmN8xv1mQ8BxsrCwb3ZBx
+qxGVi5z3Ki/ADy2xyFpl1qk0RIECAwEAAaMsMCowCQYDVR0TBAIwADAdBgNVHQ4E
+FgQUaAMzJ9mHmup9Qdgt6/nuq8lqxfowDQYJKoZIhvcNAQELBQADggEBAEcnYm1D
+8/aHCo8f8UsrZwURhbETacreHm+PeK61t3XKhPNYJp3FCw5M6c4cXWkDbtcuiCh1
+eMVUN+ZwT4+S+1/OwrOjdHfmw5SrxtJpu93YFp02KtHB4Q2B2paf8a6kuXMWsZi1
++WpMiwgww9YxOnni73/bT28T+JjWsgRywwOy/2Otzk6NlTem3FJeXCY1nxR+naAE
+RgD/UpTxK3UcUvB560GoOaJaY8zecM2Ccncdd+E9/ziGLRJPq0xyNWlPrVUd2q6d
+CiNKzCpA2E71vTNM67dHQYIqyfxkDTN2AGG6tkDKJJZehNVP0k0uejGlUFO66zF7
+eJ/0Q/HlVE9Z3LoxggJWMIICUgIBATBUME8xCzAJBgNVBAYTAlVTMRMwEQYDVQQI
+DApDYWxpZm9ybmlhMREwDwYDVQQKDAhNMkNyeXB0bzEYMBYGA1UEAwwPSGVpa2tp
+IFRvaXZvbmVuAgEDMAkGBSsOAwIaBQCggdgwGAYJKoZIhvcNAQkDMQsGCSqGSIb3
+DQEHATAcBgkqhkiG9w0BCQUxDxcNMTkwMjE1MTAyODUxWjAjBgkqhkiG9w0BCQQx
+FgQUN6pjx3OY2VRHMmLhoAV8HmMu2ncweQYJKoZIhvcNAQkPMWwwajALBglghkgB
+ZQMEASowCwYJYIZIAWUDBAEWMAsGCWCGSAFlAwQBAjAKBggqhkiG9w0DBzAOBggq
+hkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwIC
+ASgwDQYJKoZIhvcNAQEBBQAEggEAvT0eJBkNRhNpmasa/Q/0IYjxYvXG4t4Ilo8a
+Gv2+IU3ibXqcb6oEuKGiDl04jv+4t8oXJuWC99gi7zOFofIk3oFiYM5f0ySPcLgv
+iTiNGzoVC7zN6+2EHMpOfTwCGUgCad4eguMYXvNp2q3wyg6zf/LPEzrgZ00IQv/l
+XnFMHuMHFdIciortPCLp8kqFmFsHPYm0ynDFEEzAumWJ7gJhZhiR9dTRsavj+oDS
+MGnly+9ECyX5audsSj5WJAs4CYqOnxoax/sCBPtDt0dlheUYj2Dm1vRAVSm2xtA9
+F1vXEwENTiVLLBNmJnqQ+3p+IJYHgrW12NKWFVXsaGGqAkgecw==
-------5091526DA45562EAF43348F05B8CD98A--
+------4469424C67FDBBE03CA0ACF6293E5314--
