arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-27 21:16:50 +03:00
Code

Update certs-from-mozilla.py (#7578)

Browse Source 
* Update certs-from-mozilla.py

Check if ar exists, if not tell the user what to get to prevent issue #7300 also dynamically get certs instead of hardcoded row item https://github.com/esp8266/Arduino/pull/7573#issuecomment-686192353
changed comment for missing ar exception
updated path and check for openssl
This commit is contained in:
gnorbsl 2020-09-07 15:06:36 +02:00 committed by GitHub
parent bfecdb0e39
commit 88be34e2dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/ESP8266WiFi/examples/BearSSL_CertStore/certs-from-mozilla.py
View File

@ -11,6 +11,8 @@ from __future__ import print_function
import csv import csv
import os import os
import sys import sys
from shutil import which
from subprocess import Popen, PIPE, call from subprocess import Popen, PIPE, call
try: try:
from urllib.request import urlopen from urllib.request import urlopen
@ -21,6 +23,12 @@ try:
except Exception: except Exception:
from io import StringIO from io import StringIO
# check if ar and openssl are available
if which('ar') is None and not os.path.isfile('./ar') and not os.path.isfile('./ar.exe'):
raise Exception("You need the program 'ar' from xtensa-lx106-elf found here: (esp8266-arduino-core)/hardware/esp8266com/esp8266/tools/xtensa-lx106-elf/xtensa-lx106-elf/bin/ar")
if which('openssl') is None and not os.path.isfile('./openssl') and not os.path.isfile('./openssl.exe'):
raise Exception("You need to have openssl in PATH, installable from https://www.openssl.org/")
# Mozilla's URL for the CSV file with included PEM certs # Mozilla's URL for the CSV file with included PEM certs
mozurl = "https://ccadb-public.secure.force.com/mozilla/IncludedCACertificateReportPEMCSV" mozurl = "https://ccadb-public.secure.force.com/mozilla/IncludedCACertificateReportPEMCSV"
@ -35,7 +43,9 @@ csvFile = StringIO(csvData)
csvReader = csv.reader(csvFile) csvReader = csv.reader(csvFile)
for row in csvReader: for row in csvReader:
names.append(row[0]+":"+row[1]+":"+row[2]) names.append(row[0]+":"+row[1]+":"+row[2])
pems.append(row[32]) for item in row:
if item.startswith("'-----BEGIN CERTIFICATE-----"):
pems.append(item)
del names[0] # Remove headers del names[0] # Remove headers
del pems[0] # Remove headers del pems[0] # Remove headers