BaseTools/GenerateCapsule.py: Fix checking for DepExp presence

struct.unpack() returns a tuple even for a single-element pack,
resulting in signature verification being evaluated to false even when
the signature is there.

This fixes --decode and --dump-info actions incorrectly reporting issues
with parsing capsule dependencies when there are none.

Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/BaseTools/Source/Python/Capsule/GenerateCapsule.py b/BaseTools/Source/Python/Capsule/GenerateCapsule.py
index d694130bc4..a773cfb2b3 100644
--- a/BaseTools/Source/Python/Capsule/GenerateCapsule.py
+++ b/BaseTools/Source/Python/Capsule/GenerateCapsule.py
@@ -831,7 +831,7 @@ if __name__ == '__main__':
                             print ('--------')

                             print ('No EFI_FIRMWARE_IMAGE_AUTHENTICATION')

 

-                    PayloadSignature = struct.unpack ('<I', SinglePayloadDescriptor.Payload[0:4])

+                    (PayloadSignature,) = struct.unpack ('<I', SinglePayloadDescriptor.Payload[0:4])

                     if PayloadSignature != FmpPayloadHeader.Signature:

                         SinglePayloadDescriptor.UseDependency = True

                         try:

@@ -918,7 +918,7 @@ if __name__ == '__main__':
                         print ('--------')

                         print ('No EFI_FIRMWARE_IMAGE_AUTHENTICATION')

 

-                    PayloadSignature = struct.unpack ('<I', Result[0:4])

+                    (PayloadSignature,) = struct.unpack ('<I', Result[0:4])

                     if PayloadSignature != FmpPayloadHeader.Signature:

                         try:

                             Result = CapsuleDependency.Decode (Result)