Big update 0.20.0

- major refactoring round done
- added replace actions for volumes
- added better Intel signature handling
- added support for unsigned Aptio capsules
- more GUIDs added to known-GUIDs database
- more information about PE and TE sections
- shown information about item full size
- hexadecimal numbers format changed from 0xAB to ABh
- AppleCRC renamed to ZVCRC because it seems not Apple-specific feature
after all

Author: NikolajSchlej

Tiano/EfiTianoCompressLegacy.c

@@ -1,6 +1,6 @@
 /* EFI11/Tiano Compress Implementation
 
-Copyright (c) 2014, Nikolaj Schlej
+Copyright (c) 2015, Nikolaj Schlej
 Copyright (c) 2006 - 2008, Intel Corporation
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -278,7 +278,7 @@ STATIC NODE   mPos, mMatchPos, mAvail, *mPosition, *mParent, *mPrev, *mNext = NU
 //
 // functions
 //
-UINT8
+EFI_STATUS
 EfiCompressLegacy(
 CONST VOID   *SrcBuffer,
 UINT32  SrcSize,
@@ -373,7 +373,7 @@ EFI_INVALID_PARAMETER - Parameter supplied is wrong.
 
 }
 
-UINT8
+EFI_STATUS
 TianoCompressLegacy (
 CONST VOID   *SrcBuffer,
 UINT32  SrcSize,

Tiano/EfiTianoDecompress.h

@@ -1,6 +1,6 @@
 /* EfiTianoDecompress.h
 
-Copyright (c) 2014, Nikolaj Schlej. All rights reserved.<BR>
+Copyright (c) 2015, Nikolaj Schlej. All rights reserved.<BR>
 Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -40,7 +40,7 @@ extern "C" {
     EFI_STATUS
         EFIAPI
         EfiTianoGetInfo(
-        VOID                    *Source,
+        const VOID              *Source,
         UINT32                  SrcSize,
         UINT32                  *DstSize,
         UINT32                  *ScratchSize
@@ -70,7 +70,7 @@ extern "C" {
     EFI_STATUS
         EFIAPI
         EfiDecompress(
-        VOID                    *Source,
+        const VOID                    *Source,
         UINT32                  SrcSize,
         VOID                    *Destination,
         UINT32                  DstSize,
@@ -104,7 +104,7 @@ extern "C" {
     EFI_STATUS
         EFIAPI
         TianoDecompress(
-        VOID                          *Source,
+        const VOID                          *Source,
         UINT32                        SrcSize,
         VOID                          *Destination,
         UINT32                        DstSize,

UEFIExtract/uefiextract_main.cpp

@@ -18,43 +18,43 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 int main(int argc, char *argv[])
 {
-    QCoreApplication a(argc, argv);
-    a.setOrganizationName("CodeRush");
-    a.setOrganizationDomain("coderush.me");
-    a.setApplicationName("UEFIExtract");
-
-    UEFIExtract w;
-    UINT8 result = ERR_SUCCESS;
-	UINT32 returned = 0;
-
-	if (a.arguments().length() > 32) {
-		std::cout << "Too many arguments" << std::endl;
-		return 1;
-	}
-
-    if (a.arguments().length() > 1 ) {
-		if (w.init(a.arguments().at(1)))
-			return 1;
-
-		if (a.arguments().length() == 2) {
-			result = w.extract();
-			if (result)
-				return 2;
-		}
-		else {
-			for (int i = 2; i < a.arguments().length(); i++) {
-				result = w.extract(a.arguments().at(i));
-				if (result)
-					returned |= (1 << (i - 1));
-			}
-			return returned;
-		}
-		
+  QCoreApplication a(argc, argv);
+  a.setOrganizationName("CodeRush");
+  a.setOrganizationDomain("coderush.me");
+  a.setApplicationName("UEFIExtract");
+
+  UEFIExtract w;
+  UINT8 result = ERR_SUCCESS;
+  UINT32 returned = 0;
+
+  if (a.arguments().length() > 32) {
+    std::cout << "Too many arguments" << std::endl;
+    return 1;
+  }
+
+  if (a.arguments().length() > 1 ) {
+    if (w.init(a.arguments().at(1)))
+      return 1;
+
+    if (a.arguments().length() == 2) {
+      result = w.extract();
+      if (result)
+        return 2;
     }
     else {
-        std::cout << "UEFIExtract 0.3.5" << std::endl << std::endl <<
-			"Usage: uefiextract imagefile [FileGUID_1 FileGUID_2 ... FileGUID_31]" << std::endl <<
-			"Returned value is a bit mask where 0 on position N meant File with GUID_N was found and unpacked, 1 otherwise" << std::endl;
-		return 1;
-	}
+      for (int i = 2; i < a.arguments().length(); i++) {
+        result = w.extract(a.arguments().at(i));
+        if (result)
+          returned |= (1 << (i - 1));
+      }
+      return returned;
+    }
+    
+  }
+  else {
+    std::cout << "UEFIExtract 0.4.0" << std::endl << std::endl <<
+    "Usage: uefiextract imagefile [FileGUID_1 FileGUID_2 ... FileGUID_31]" << std::endl <<
+    "Returned value is a bit mask where 0 on position N meant File with GUID_N was found and unpacked, 1 otherwise" << std::endl;
+    return 1;
+  }
 }

UEFIFind/uefifind_main.cpp

@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
         return ERR_SUCCESS;
     }
     else {
-        std::cout << "UEFIFind 0.1.1" << std::endl << std::endl <<
+        std::cout << "UEFIFind 0.2.0" << std::endl << std::endl <<
             "Usage: uefifind {header | body | all} {list | count} pattern imagefile\n";
         return ERR_INVALID_PARAMETER;
     }

UEFIPatch/uefipatch_main.cpp

@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
         result = w.patchFromFile(a.arguments().at(1));
     }
     else {
-        std::cout << "UEFIPatch 0.2.5 - UEFI image file patching utility" << std::endl << std::endl <<
+        std::cout << "UEFIPatch 0.3.0 - UEFI image file patching utility" << std::endl << std::endl <<
             "Usage: UEFIPatch image_file" << std::endl << std::endl <<
             "Patches will be read from patches.txt file\n";
         return ERR_SUCCESS;

basetypes.h

@@ -1,6 +1,6 @@
 /* basetypes.h
 
-Copyright (c) 2014, Nikolaj Schlej. All rights reserved.
+Copyright (c) 2015, Nikolaj Schlej. All rights reserved.
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -17,17 +17,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <stdarg.h>
 #include <stdint.h>
 
-typedef uint8_t   BOOLEAN;
-typedef int8_t    INT8;
-typedef uint8_t   UINT8;
-typedef int16_t   INT16;
-typedef uint16_t  UINT16;
-typedef int32_t   INT32;
-typedef uint32_t  UINT32;
-typedef int64_t   INT64;
-typedef uint64_t  UINT64;
-typedef char      CHAR8;
-typedef uint16_t  CHAR16;
+typedef uint8_t      BOOLEAN;
+typedef int8_t       INT8;
+typedef uint8_t      UINT8;
+typedef int16_t      INT16;
+typedef uint16_t     UINT16;
+typedef int32_t      INT32;
+typedef uint32_t     UINT32;
+typedef int64_t      INT64;
+typedef uint64_t     UINT64;
+typedef char         CHAR8;
+typedef uint16_t     CHAR16;
+typedef unsigned int UINTN; 
 
 #define CONST  const
 #define VOID   void
@@ -90,12 +91,12 @@ typedef uint16_t  CHAR16;
 #define IN
 #define OUT
 #define EFIAPI
-#define EFI_STATUS UINT8
+#define EFI_STATUS UINTN
 #define EFI_SUCCESS ERR_SUCCESS
 #define EFI_INVALID_PARAMETER ERR_INVALID_PARAMETER
 #define EFI_OUT_OF_RESOURCES ERR_OUT_OF_RESOURCES
 #define EFI_BUFFER_TOO_SMALL ERR_BUFFER_TOO_SMALL
-#define EFI_ERROR(X) X
+#define EFI_ERROR(X) (X)
 
 // Compression algorithms
 #define COMPRESSION_ALGORITHM_UNKNOWN 0
@@ -124,21 +125,21 @@ typedef uint16_t  CHAR16;
 #define PATCH_MODE_BODY       1
 
 // Patch types
-#define PATCH_TYPE_OFFSET     'O'
-#define PATCH_TYPE_PATTERN    'P'
+#define PATCH_TYPE_OFFSET    'O'
+#define PATCH_TYPE_PATTERN   'P'
 
 // Erase polarity types
 #define ERASE_POLARITY_FALSE   0
 #define ERASE_POLARITY_TRUE    1
 #define ERASE_POLARITY_UNKNOWN 0xFF
 
 // Search modes
-#define SEARCH_MODE_HEADER  1
-#define SEARCH_MODE_BODY    2
-#define SEARCH_MODE_ALL     3
+#define SEARCH_MODE_HEADER    1
+#define SEARCH_MODE_BODY      2
+#define SEARCH_MODE_ALL       3
 
 // EFI GUID
-typedef struct {
+typedef struct _EFI_GUID {
     UINT8 Data[16];
 } EFI_GUID;
 
@@ -148,7 +149,9 @@ typedef struct {
 #include <assert.h>
 #define ASSERT(x) assert(x)
 
-//Hexarg macro
-#define hexarg(X, Y) arg(QString("%1").arg((X),(Y),16,QChar('0')).toUpper())
+//Hexarg macros
+#define hexarg(X) arg(QString("%1").arg((X),0,16).toUpper())
+#define hexarg2(X, Y) arg(QString("%1").arg((X),(Y),16,QChar('0')).toUpper())
+
 
 #endif

descriptor.cpp

@@ -1,6 +1,6 @@
 /* descriptor.cpp
 
-Copyright (c) 2013, Nikolaj Schlej. All rights reserved.
+Copyright (c) 2015, Nikolaj Schlej. All rights reserved.
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -15,13 +15,13 @@ WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 // Calculate address of data structure addressed by descriptor address format
 // 8 bit base or limit
-UINT8* calculateAddress8(UINT8* baseAddress, const UINT8 baseOrLimit)
+const UINT8* calculateAddress8(const UINT8* baseAddress, const UINT8 baseOrLimit)
 {
     return baseAddress + baseOrLimit * 0x10;
 }
 
 // 16 bit base or limit
-UINT8* calculateAddress16(UINT8* baseAddress, const UINT16 baseOrLimit)
+const UINT8* calculateAddress16(const UINT8* baseAddress, const UINT16 baseOrLimit)
 {
     return baseAddress + baseOrLimit * 0x1000;
 }

descriptor.h

@@ -1,6 +1,6 @@
 /* descriptor.h
 
-Copyright (c) 2014, Nikolaj Schlej. All rights reserved.
+Copyright (c) 2015, Nikolaj Schlej. All rights reserved.
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -20,7 +20,7 @@ WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #pragma pack(push,1)
 
 // Flash descriptor header
-typedef struct {
+typedef struct _FLASH_DESCRIPTOR_HEADER {
     UINT8 FfVector[16];            // Must be 16 0xFFs
     UINT32 Signature;              // 0x0FF0A55A
 } FLASH_DESCRIPTOR_HEADER;
@@ -33,7 +33,7 @@ typedef struct {
 
 // Descriptor map
 // Base fields are storing bits [11:4] of actual base addresses, all other bits are 0
-typedef struct {
+typedef struct _FLASH_DESCRIPTOR_MAP {
     UINT8  ComponentBase;           // 0x03 on most machines
     UINT8  NumberOfFlashChips;      // Zero-based number of flash chips installed on board
     UINT8  RegionBase;              // 0x04 on most machines
@@ -53,7 +53,7 @@ typedef struct {
 
 // Component section
 // Flash parameters DWORD structure
-typedef struct {
+typedef struct _FLASH_PARAMETERS {
     UINT8 FirstChipDensity : 3;
     UINT8 SecondChipDensity : 3;
     UINT8 ReservedZero0 : 2;  // Still unknown, zeros in all descriptors I have seen
@@ -81,7 +81,7 @@ typedef struct {
 #define FLASH_FREQUENCY_50MHZ  0x04
 
 // Component section structure
-typedef struct {
+typedef struct _FLASH_DESCRIPTOR_COMPONENT_SECTION {
     FLASH_PARAMETERS FlashParameters;
     UINT8            InvalidInstruction0;  // Instructions for SPI chip, that must not be executed, like FLASH ERASE
     UINT8            InvalidInstruction1;  //
@@ -94,7 +94,7 @@ typedef struct {
 // Region section
 // All base and limit register are storing upper part of actual UINT32 base and limit
 // If limit is zero - region is not present
-typedef struct {
+typedef struct _FLASH_DESCRIPTOR_REGION_SECTION {
     UINT16 ReservedZero;                  // Still unknown, zero in all descriptors I have seen
     UINT16 FlashBlockEraseSize;           // Size of block erased by single BLOCK ERASE command
     UINT16 BiosBase;
@@ -113,7 +113,7 @@ typedef struct {
 #define FLASH_BLOCK_ERASE_SIZE_64KB 0x000F
 
 // Master section
-typedef struct {
+typedef struct _FLASH_DESCRIPTOR_MASTER_SECTION {
     UINT16 BiosId;
     UINT8 BiosRead;
     UINT8 BiosWrite;
@@ -138,14 +138,14 @@ typedef struct {
 #define FLASH_DESCRIPTOR_UPPER_MAP_BASE 0x0EFC
 
 // Descriptor upper map structure
-typedef struct {
+typedef struct _FLASH_DESCRIPTOR_UPPER_MAP {
     UINT8 VsccTableBase; // Base address of VSCC Table for ME, bits [11:4]
     UINT8 VsccTableSize; // Counted in UINT32s
     UINT16 ReservedZero; // Still unknown, zero in all descriptors I have seen
 } FLASH_DESCRIPTOR_UPPER_MAP;
 
 // VSCC table entry structure
-typedef struct {
+typedef struct _VSCC_TABLE_ENTRY {
     UINT8   VendorId;          // JEDEC VendorID byte
     UINT8   DeviceId0;         // JEDEC DeviceID first byte
     UINT8   DeviceId1;         // JEDEC DeviceID second byte
@@ -162,9 +162,9 @@ typedef struct {
 
 // Calculate address of data structure addressed by descriptor address format
 // 8 bit base or limit
-extern UINT8* calculateAddress8(UINT8* baseAddress, const UINT8 baseOrLimit);
+extern const UINT8* calculateAddress8(const UINT8* baseAddress, const UINT8 baseOrLimit);
 // 16 bit base or limit
-extern UINT8* calculateAddress16(UINT8* baseAddress, const UINT16 baseOrLimit);
+extern const UINT8* calculateAddress16(const UINT8* baseAddress, const UINT16 baseOrLimit);
 
 // Calculate offset of region using it's base
 extern UINT32 calculateRegionOffset(const UINT16 base);