kopia lustrzana https://github.com/espressif/esp-idf
Tools: Update the certificate of idf_tools.py
rodzic
c25d92074e
commit
a9c63eb237
|
@ -190,8 +190,8 @@ CURRENT_PLATFORM = Platforms.get(PYTHON_PLATFORM)
|
||||||
EXPORT_SHELL = 'shell'
|
EXPORT_SHELL = 'shell'
|
||||||
EXPORT_KEY_VALUE = 'key-value'
|
EXPORT_KEY_VALUE = 'key-value'
|
||||||
|
|
||||||
# "DigiCert Global Root CA"
|
# the older "DigiCert Global Root CA" certificate used with github.com
|
||||||
DIGICERT_ROOT_CERT = u"""
|
DIGICERT_ROOT_CA_CERT = """
|
||||||
-----BEGIN CERTIFICATE-----
|
-----BEGIN CERTIFICATE-----
|
||||||
MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
|
MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
|
||||||
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
|
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
|
||||||
|
@ -216,6 +216,35 @@ CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
|
||||||
-----END CERTIFICATE-----
|
-----END CERTIFICATE-----
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
# the newer "DigiCert Global Root G2" certificate used with dl.espressif.com
|
||||||
|
DIGICERT_ROOT_G2_CERT = """
|
||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh
|
||||||
|
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
|
||||||
|
d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH
|
||||||
|
MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT
|
||||||
|
MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
|
||||||
|
b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG
|
||||||
|
9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI
|
||||||
|
2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx
|
||||||
|
1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ
|
||||||
|
q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz
|
||||||
|
tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ
|
||||||
|
vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP
|
||||||
|
BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV
|
||||||
|
5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY
|
||||||
|
1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4
|
||||||
|
NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG
|
||||||
|
Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91
|
||||||
|
8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe
|
||||||
|
pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
|
||||||
|
MrY=
|
||||||
|
-----END CERTIFICATE-----
|
||||||
|
"""
|
||||||
|
|
||||||
|
DL_CERT_DICT = {'dl.espressif.com': DIGICERT_ROOT_G2_CERT,
|
||||||
|
'github.com': DIGICERT_ROOT_CA_CERT}
|
||||||
|
|
||||||
|
|
||||||
global_quiet = False
|
global_quiet = False
|
||||||
global_non_interactive = False
|
global_non_interactive = False
|
||||||
|
@ -406,17 +435,15 @@ def download(url, destination): # type: (str, str) -> None
|
||||||
info(f'Downloading {url}')
|
info(f'Downloading {url}')
|
||||||
info(f'Destination: {destination}')
|
info(f'Destination: {destination}')
|
||||||
try:
|
try:
|
||||||
ctx = None
|
for site, cert in DL_CERT_DICT.items():
|
||||||
# For dl.espressif.com and github.com, add the DigiCert root certificate.
|
# For dl.espressif.com and github.com, add the DigiCert root certificate.
|
||||||
# This works around the issue with outdated certificate stores in some installations.
|
# This works around the issue with outdated certificate stores in some installations.
|
||||||
if 'dl.espressif.com' in url or 'github.com' in url:
|
if site in url:
|
||||||
try:
|
|
||||||
ctx = ssl.create_default_context()
|
ctx = ssl.create_default_context()
|
||||||
ctx.load_verify_locations(cadata=DIGICERT_ROOT_CERT)
|
ctx.load_verify_locations(cadata=cert)
|
||||||
except AttributeError:
|
break
|
||||||
# no ssl.create_default_context or load_verify_locations cadata argument
|
else:
|
||||||
# in Python <=2.7.8
|
ctx = None
|
||||||
pass
|
|
||||||
|
|
||||||
urlretrieve_ctx(url, destination, report_progress if not global_non_interactive else None, context=ctx)
|
urlretrieve_ctx(url, destination, report_progress if not global_non_interactive else None, context=ctx)
|
||||||
sys.stdout.write('\rDone\n')
|
sys.stdout.write('\rDone\n')
|
||||||
|
|
Ładowanie…
Reference in New Issue