allow gen_crt_bundle to generate a .S file directly

.. this gets rid of one of the steps of converting it
This commit is contained in:
Jeff Epler 2022-10-05 13:32:37 -05:00
parent 09023abcd2
commit 905a5957b9
No known key found for this signature in database
GPG Key ID: D5BF15AB975AB4DE
2 changed files with 52 additions and 2 deletions

View File

@ -26,6 +26,9 @@ pyelftools
# for stubs and annotations # for stubs and annotations
adafruit-circuitpython-typing adafruit-circuitpython-typing
# for mbedtls certificate store
cryptography
# for web workflow minify # for web workflow minify
minify_html minify_html
jsmin jsmin

View File

@ -30,6 +30,7 @@ import os
import re import re
import struct import struct
import sys import sys
import textwrap
from io import open from io import open
try: try:
@ -217,6 +218,15 @@ def main():
help="Path to CSV-file where the second columns contains the name of the certificates \ help="Path to CSV-file where the second columns contains the name of the certificates \
that should be included from cacrt_all.pem", that should be included from cacrt_all.pem",
) )
parser.add_argument(
"--asm",
"-S",
action="store_true",
default=False,
help="Output an asm file for use with gas, rather than a binary file",
)
parser.add_argument("--symbol", help="The symbol to define", default="x509_crt_bundle")
parser.add_argument("--output", "-o", help="The output file", default=None)
args = parser.parse_args() args = parser.parse_args()
@ -239,8 +249,45 @@ def main():
crt_bundle = bundle.create_bundle() crt_bundle = bundle.create_bundle()
with open(ca_bundle_bin_file, "wb") as f: if args.asm:
f.write(crt_bundle) symbol = args.symbol
filename = args.output or (ca_bundle_bin_file + ".S")
with open(filename, "w") as f:
print(
textwrap.dedent(
f"""\
// Generated from {" ".join(args.input)} with {len(bundle.certificates)} certificates
.data
.section .rodata.embedded
.global {symbol}
.global _binary_{symbol}_start
.global _binary_{symbol}_end
{symbol}:
_binary_{symbol}_start:
"""
),
file=f,
)
for i in range(0, len(crt_bundle), 16):
chunk = crt_bundle[i : i + 16]
formatted = ", ".join(f"0x{byte:02x}" for byte in chunk)
print(f".byte {formatted}", file=f)
print(
textwrap.dedent(
f"""\
_binary_{symbol}_end:
{symbol}_length:
.word {len(crt_bundle)}
"""
),
file=f,
)
else:
filename = args.output or ca_bundle_bin_file
with open(filename, "wb") as f:
f.write(crt_bundle)
if __name__ == "__main__": if __name__ == "__main__":