This commit is contained in:
Gwyn Ciesla 2020-12-01 09:21:20 -06:00
parent bd69e44e6f
commit ce16e3e59d
3 changed files with 6 additions and 40 deletions

View file

@ -1,35 +0,0 @@
From 3e752ec4544dadfd7e3cc96d77b8a30bec36c49a Mon Sep 17 00:00:00 2001
From: Dan Callaghan <djc@djc.id.au>
Date: Sun, 30 Aug 2020 13:28:29 +1000
Subject: [PATCH] Use TLSv1.2 for fake servers in tests
Some Linux distros have begun disabling TLSv1.0 and TLSv1.1 by default
for security reasons, for example in Fedora 33 onwards:
https://fedoraproject.org/wiki/Changes/StrongCryptoSettings2
Use TLSv1.2 for the fake TLS servers created in the test suite, to avoid
failures due to OpenSSL disallowing TLSv1.0:
<twisted.python.failure.Failure OpenSSL.SSL.Error: [('SSL routines',
'ssl_choose_client_version', 'unsupported protocol')]>
---
tests/http/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/http/__init__.py b/tests/http/__init__.py
index 2096ba3c9..7486d092b 100644
--- a/tests/http/__init__.py
+++ b/tests/http/__init__.py
@@ -145,7 +145,7 @@ def __init__(self, sanlist):
self._cert_file = create_test_cert_file(sanlist)
def serverConnectionForTLS(self, tlsProtocol):
- ctx = SSL.Context(SSL.TLSv1_METHOD)
+ ctx = SSL.Context(SSL.TLSv1_2_METHOD)
ctx.use_certificate_file(self._cert_file)
ctx.use_privatekey_file(get_test_key_file())
return Connection(ctx, None)
--
2.26.2

View file

@ -6,7 +6,7 @@
%{?python_enable_dependency_generator} %{?python_enable_dependency_generator}
Name: matrix-%{srcname} Name: matrix-%{srcname}
Version: 1.18.0 Version: 1.23.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: A Matrix reference homeserver written in Python using Twisted Summary: A Matrix reference homeserver written in Python using Twisted
License: ASL 2.0 License: ASL 2.0
@ -14,8 +14,6 @@ URL: https://github.com/matrix-org/%{srcname}
Source0: %{url}/archive/v%{version}%{rcx}/%{srcname}-%{version}%{rcx}.tar.gz Source0: %{url}/archive/v%{version}%{rcx}/%{srcname}-%{version}%{rcx}.tar.gz
Source1: synapse.sysconfig Source1: synapse.sysconfig
Source2: synapse.service Source2: synapse.service
# https://github.com/matrix-org/synapse/pull/8208
Patch1: 0001-Use-TLSv1.2-for-fake-servers-in-tests.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: python3-devel BuildRequires: python3-devel
@ -32,7 +30,7 @@ BuildRequires: python3-attrs >= 19.1.0
BuildRequires: python3-authlib BuildRequires: python3-authlib
BuildRequires: python3-bcrypt >= 3.1.0 BuildRequires: python3-bcrypt >= 3.1.0
BuildRequires: python3-bleach >= 1.4.3 BuildRequires: python3-bleach >= 1.4.3
BuildRequires: python3-canonicaljson >= 1.1.3 BuildRequires: python3-canonicaljson >= 1.4.0
BuildRequires: python3-daemonize >= 2.3.1 BuildRequires: python3-daemonize >= 2.3.1
BuildRequires: python3-frozendict >= 1.0 BuildRequires: python3-frozendict >= 1.0
BuildRequires: python3-idna >= 2.5 BuildRequires: python3-idna >= 2.5
@ -136,6 +134,9 @@ exit 0
%changelog %changelog
* Mon Nov 30 2020 Gwyn Ciesla <gwync@protonmail.com> - 1.23.0-1
- 1.23.0
* Sat Aug 29 2020 Kai A. Hiller <V02460@gmail.com> - 1.18.0-1 * Sat Aug 29 2020 Kai A. Hiller <V02460@gmail.com> - 1.18.0-1
- Update to v1.18.0 - Update to v1.18.0

View file

@ -1 +1 @@
SHA512 (synapse-1.18.0.tar.gz) = edbbc55910d6691caf7209a10b74a3022f9cafdc2dd4693ee5d4337372a307f9a4fbd72444c6d73615cde360a8517772fea98d72292321f40f3e98bf8fb706b3 SHA512 (synapse-1.23.0.tar.gz) = 5ebb65ca84816b0117cdff96a24d0b8c9bc7676817d42516b2aa3b0cea70d4a00d88e7ef525f3eece168bf26091b05c88a6f3a2545073994778d6a00e40126f5