Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

take idna implementation from twisted

This commit is contained in:
Jeroen 2018-06-26 21:15:14 +02:00
parent 26651b0d6a
commit 95341a8f6f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/crypto/context_factory.py
View File

@ -13,8 +13,8 @@
# limitations under the License. # limitations under the License.
import logging import logging
import idna
from OpenSSL import SSL, crypto from OpenSSL import SSL, crypto
from twisted.internet._idna import _idnaBytes
from twisted.internet.ssl import ContextFactory, CertificateOptions from twisted.internet.ssl import ContextFactory, CertificateOptions
from twisted.internet._sslverify import _defaultCurveName, _tolerateErrors from twisted.internet._sslverify import _defaultCurveName, _tolerateErrors
from twisted.internet.interfaces import IOpenSSLClientConnectionCreator from twisted.internet.interfaces import IOpenSSLClientConnectionCreator
@ -63,7 +63,7 @@ class ClientTLSOptions(object):
def __init__(self, hostname, ctx): def __init__(self, hostname, ctx):
self._ctx = ctx self._ctx = ctx
self._hostname = hostname self._hostname = hostname
self._hostnameBytes = idna.encode(hostname) self._hostnameBytes = _idnaBytes(hostname)
ctx.set_info_callback( ctx.set_info_callback(
_tolerateErrors(self._identityVerifyingInfoCallback) _tolerateErrors(self._identityVerifyingInfoCallback)
) )