/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/transport/http/_urllib2_wrappers.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-02 11:26:27 UTC
  • mfrom: (6621.27.5 1089352-sni-support)
  • Revision ID: breezy.the.bot@gmail.com-20170602112627-jbvjcm9czx7gt3gb
Add SNI support.

Merged from https://code.launchpad.net/~jelmer/brz/sni-support/+merge/324979

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transport/http/_urllib2_wrappers.py
455
455
                    "'bzr help ssl.ca_certs' for more information on setting "
456
456
                    "trusted CAs.")
457
457
        try:
458
 
            ssl_sock = ssl.wrap_socket(
459
 
                self.sock, self.key_file, self.cert_file,
460
 
                cert_reqs=cert_reqs, ca_certs=ca_certs)
 
458
            ssl_sock = ssl.SSLSocket(self.sock, self.key_file, self.cert_file,
 
459
                                     cert_reqs=cert_reqs, ca_certs=ca_certs,
 
460
                                     server_hostname=self.host)
461
461
        except ssl.SSLError:
462
462
            trace.note(
463
463
                "\n"
466
466
                "Pass -Ossl.cert_reqs=none to disable certificate "
467
467
                "verification entirely.\n")
468
468
            raise
 
469
        # Wrap the ssl socket before anybody use it
 
470
        self._wrap_socket_for_reporting(ssl_sock)
 
471
 
469
472
        if cert_reqs == ssl.CERT_REQUIRED:
470
473
            peer_cert = ssl_sock.getpeercert()
471
474
            ssl.match_hostname(peer_cert, host)
472
475
 
473
 
        # Wrap the ssl socket before anybody use it
474
 
        self._wrap_socket_for_reporting(ssl_sock)
475
 
 
476
476
 
477
477
class Request(urllib2.Request):
478
478
    """A custom Request object.