diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2017-09-29 18:24:11 -0700 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2017-09-29 18:24:11 -0700 |
| commit | 2f7827ba8f8e31eda0e15f3d51073329cf606323 (patch) | |
| tree | 3418bc06138b2f7aa0277d5032f2ffa03f989e45 | |
| parent | bdc6e86e079dd8a82e9ead1d4041c2e17c882437 (diff) | |
tools/upip: Upgrade to 1.2.2.
TLS SNI support, fixes after making str.rstrip() behavior compliant.
| -rw-r--r-- | tools/upip.py | 2 | ||||
| -rw-r--r-- | tools/upip_utarfile.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/upip.py b/tools/upip.py index 7b85c718f..411da49e8 100644 --- a/tools/upip.py +++ b/tools/upip.py @@ -122,7 +122,7 @@ def url_open(url): s.connect(addr) if proto == "https:": - s = ussl.wrap_socket(s) + s = ussl.wrap_socket(s, server_hostname=host) if warn_ussl: print("Warning: %s SSL certificate is not validated" % host) warn_ussl = False diff --git a/tools/upip_utarfile.py b/tools/upip_utarfile.py index 65ce0bdca..460ca2cd4 100644 --- a/tools/upip_utarfile.py +++ b/tools/upip_utarfile.py @@ -3,7 +3,7 @@ import uctypes # http://www.gnu.org/software/tar/manual/html_node/Standard.html TAR_HEADER = { "name": (uctypes.ARRAY | 0, uctypes.UINT8 | 100), - "size": (uctypes.ARRAY | 124, uctypes.UINT8 | 12), + "size": (uctypes.ARRAY | 124, uctypes.UINT8 | 11), } DIRTYPE = "dir" @@ -75,8 +75,8 @@ class TarFile: return None d = TarInfo() - d.name = str(h.name, "utf-8").rstrip() - d.size = int(bytes(h.size).rstrip(), 8) + d.name = str(h.name, "utf-8").rstrip("\0") + d.size = int(bytes(h.size), 8) d.type = [REGTYPE, DIRTYPE][d.name[-1] == "/"] self.subf = d.subf = FileSection(self.f, d.size, roundup(d.size, 512)) return d |