From 1d8a82e19b1434d915b581fa80dd5d4da47ea2df Mon Sep 17 00:00:00 2001 From: James Newling Date: Wed, 26 Jun 2024 17:04:04 -0700 Subject: [PATCH 1/2] Remove print statement (pollutes logging of a compiler which uses bootgen) --- cdo-driver/cdo_driver.c | 1 - 1 file changed, 1 deletion(-) diff --git a/cdo-driver/cdo_driver.c b/cdo-driver/cdo_driver.c index 08b1c7b..6e8e6e6 100755 --- a/cdo-driver/cdo_driver.c +++ b/cdo-driver/cdo_driver.c @@ -145,7 +145,6 @@ void startCDOFileStream(const char* cdoFileName) printf("File could not be opened, fopen Error: %s\n", strerror(errno)); exit(EXIT_FAILURE); } - printf("Generating: %s\n", cdoFileName); } void endCurrentCDOFileStream() From f7825edbd1c85380cfb5ef0cf2c16c910954f57c Mon Sep 17 00:00:00 2001 From: Charlie Johnston Date: Mon, 5 Aug 2024 13:07:25 -0700 Subject: [PATCH 2/2] verifyimage: Fix segmentation fault that occurs during verifyimage. In commit d02322b, the behavior of ReadBinaryFile was changed such that it no longer populated iHT. This caused VerifyAuthentication to access a null iHT value resulting a segementation fault. This fix changes VerifyAuthentication to call ReadHeaderTableDetails instead, where the old functionality of ReadBinaryFile now lives. Signed-off-by: Charlie Johnston --- verifyimage-versal.cpp | 2 +- verifyimage-zynqmp.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/verifyimage-versal.cpp b/verifyimage-versal.cpp index 5490663..5656e50 100755 --- a/verifyimage-versal.cpp +++ b/verifyimage-versal.cpp @@ -34,7 +34,7 @@ /*******************************************************************************/ void VersalReadImage::VerifyAuthentication(bool verifyImageOption) { - ReadBinaryFile(); + ReadHeaderTableDetails(); if (iHT->headerAuthCertificateWordOffset != 0) { diff --git a/verifyimage-zynqmp.cpp b/verifyimage-zynqmp.cpp index d4812e6..d73272c 100755 --- a/verifyimage-zynqmp.cpp +++ b/verifyimage-zynqmp.cpp @@ -50,7 +50,7 @@ static void RearrangeEndianess(uint8_t *array, uint32_t size) /*******************************************************************************/ void ZynqMpReadImage::VerifyAuthentication(bool verifyImageOption) { - ReadBinaryFile(); + ReadHeaderTableDetails(); if (iHT->headerAuthCertificateWordOffset != 0) {