Browse Source

tools/upip: Upgrade to 1.2.2.

TLS SNI support, fixes after making str.rstrip() behavior compliant.
crypto-aes
Paul Sokolovsky 5 years ago
parent
commit
2f7827ba8f
  1. 2
      tools/upip.py
  2. 6
      tools/upip_utarfile.py

2
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

6
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

Loading…
Cancel
Save