alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-09 20:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes issues with gen_crt_bundle.py for unicode chars

Browse Source 
gen_crt_bundle.py could fail to parse the certificates if it contained a non-ascii character.
This commit is contained in:
Marius Vikhammer
2020-06-08 16:37:28 +08:00
parent 58e1100473
commit c343323863
3 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/mbedtls/esp_crt_bundle/gen_crt_bundle.py
View File

@@ -30,6 +30,7 @@ import struct
import argparse
import csv
import re
from io import open
try:
from cryptography import x509
@@ -80,7 +81,7 @@ class CertificateBundle:
try:
if file_path.endswith('.pem'):
status("Parsing certificates from %s" % file_path)
with open(file_path, 'r') as f:
with open(file_path, 'r', encoding='utf-8') as f:
crt_str = f.read()
self.add_from_pem(crt_str)
return True
@@ -153,7 +154,7 @@ class CertificateBundle:
def add_with_filter(self, crts_path, filter_path):
filter_set = set()
with open(filter_path, 'r') as f:
with open(filter_path, 'r', encoding='utf-8') as f:
csv_reader = csv.reader(f, delimiter=',')
# Skip header
@@ -163,7 +164,7 @@ class CertificateBundle:
status("Parsing certificates from %s" % crts_path)
crt_str = []
with open(crts_path, 'r') as f:
with open(crts_path, 'r', encoding='utf-8') as f:
crt_str = f.read()
# Split all certs into a list of (name, certificate string) tuples