mirror of
https://github.com/LongSoft/UEFITool.git
synced 2024-11-23 16:38:23 +08:00
Kaitai-based Intel ACM and BootGuard parsers
As the first step towards automated parsing, this change set replaces outdated BootGuard-related parsers with shiny new KaitaiStruct-based ones. It also does the following: - improves Intel FIT definitions by using the relevant specification - adds sha1, sha384, sha512 and sm3 digest implementations - updates LZMA SDK to v22.01 - moves GUIDs out of include files to prevent multiple instantiations - enforces C++11 - adds Kaitai-based parsers for Intel FIT, BootGuard v1 and BootGuard v2 structures - makes many small refactorings here, there and everywhere
This commit is contained in:
parent
8600bc3ab3
commit
934ce1f3f8
@ -1,7 +1,11 @@
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0 FATAL_ERROR)
|
||||
|
||||
PROJECT(UEFIExtract)
|
||||
|
||||
SET(CMAKE_CXX_STANDARD 11)
|
||||
SET(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
SET(CMAKE_CXX_EXTENSIONS OFF)
|
||||
|
||||
SET(PROJECT_SOURCES
|
||||
uefiextract_main.cpp
|
||||
ffsdumper.cpp
|
||||
@ -14,19 +18,31 @@ SET(PROJECT_SOURCES
|
||||
../common/nvramparser.cpp
|
||||
../common/meparser.cpp
|
||||
../common/ffsparser.cpp
|
||||
../common/fitparser.cpp
|
||||
../common/ffsreport.cpp
|
||||
../common/peimage.cpp
|
||||
../common/treeitem.cpp
|
||||
../common/treemodel.cpp
|
||||
../common/utility.cpp
|
||||
../common/LZMA/LzmaDecompress.c
|
||||
../common/LZMA/SDK/C/Bra.c
|
||||
../common/LZMA/SDK/C/Bra86.c
|
||||
../common/LZMA/SDK/C/CpuArch.c
|
||||
../common/LZMA/SDK/C/LzmaDec.c
|
||||
../common/Tiano/EfiTianoDecompress.c
|
||||
../common/ustring.cpp
|
||||
../common/sha256.c
|
||||
../common/bstrlib/bstrlib.c
|
||||
../common/bstrlib/bstrwrap.cpp
|
||||
../common/generated/intel_acbp_v1.cpp
|
||||
../common/generated/intel_acbp_v2.cpp
|
||||
../common/generated/intel_keym_v1.cpp
|
||||
../common/generated/intel_keym_v2.cpp
|
||||
../common/generated/intel_acm.cpp
|
||||
../common/kaitai/kaitaistream.cpp
|
||||
../common/digest/sha1.c
|
||||
../common/digest/sha256.c
|
||||
../common/digest/sha512.c
|
||||
../common/digest/sm3.c
|
||||
../common/zlib/adler32.c
|
||||
../common/zlib/compress.c
|
||||
../common/zlib/crc32.c
|
||||
@ -44,48 +60,7 @@ SET(PROJECT_SOURCES
|
||||
../common/zlib/zutil.c
|
||||
)
|
||||
|
||||
SET(PROJECT_HEADERS
|
||||
ffsdumper.h
|
||||
uefidump.h
|
||||
../common/guiddatabase.h
|
||||
../common/basetypes.h
|
||||
../common/descriptor.h
|
||||
../common/gbe.h
|
||||
../common/me.h
|
||||
../common/ffs.h
|
||||
../common/nvram.h
|
||||
../common/nvramparser.h
|
||||
../common/ffsparser.h
|
||||
../common/ffsreport.h
|
||||
../common/peimage.h
|
||||
../common/types.h
|
||||
../common/treeitem.h
|
||||
../common/treemodel.h
|
||||
../common/utility.h
|
||||
../common/LZMA/LzmaDecompress.h
|
||||
../common/Tiano/EfiTianoDecompress.h
|
||||
../common/ubytearray.h
|
||||
../common/ustring.h
|
||||
../common/bootguard.h
|
||||
../common/sha256.h
|
||||
../common/filesystem.h
|
||||
../common/bstrlib/bstrlib.h
|
||||
../common/bstrlib/bstrwrap.h
|
||||
../common/zlib/zconf.h
|
||||
../common/zlib/zlib.h
|
||||
../common/zlib/crc32.h
|
||||
../common/zlib/deflate.h
|
||||
../common/zlib/gzguts.h
|
||||
../common/zlib/inffast.h
|
||||
../common/zlib/inffixed.h
|
||||
../common/zlib/inflate.h
|
||||
../common/zlib/inftrees.h
|
||||
../common/zlib/trees.h
|
||||
../common/zlib/zutil.h
|
||||
../version.h
|
||||
)
|
||||
|
||||
ADD_DEFINITIONS(-DU_ENABLE_NVRAM_PARSING_SUPPORT -DU_ENABLE_ME_PARSING_SUPPORT -DU_ENABLE_FIT_PARSING_SUPPORT -DU_ENABLE_GUID_DATABASE_SUPPORT)
|
||||
|
||||
ADD_EXECUTABLE(UEFIExtract ${PROJECT_SOURCES} ${PROJECT_HEADERS})
|
||||
ADD_EXECUTABLE(UEFIExtract ${PROJECT_SOURCES})
|
||||
|
||||
|
@ -1,7 +1,11 @@
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0 FATAL_ERROR)
|
||||
|
||||
PROJECT(UEFIFind)
|
||||
|
||||
SET(CMAKE_CXX_STANDARD 11)
|
||||
SET(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
SET(CMAKE_CXX_EXTENSIONS OFF)
|
||||
|
||||
SET(PROJECT_SOURCES
|
||||
uefifind_main.cpp
|
||||
uefifind.cpp
|
||||
@ -12,6 +16,7 @@ SET(PROJECT_SOURCES
|
||||
../common/nvram.cpp
|
||||
../common/nvramparser.cpp
|
||||
../common/ffsparser.cpp
|
||||
../common/fitparser.cpp
|
||||
../common/ffsreport.cpp
|
||||
../common/ffsutils.cpp
|
||||
../common/peimage.cpp
|
||||
@ -19,13 +24,24 @@ SET(PROJECT_SOURCES
|
||||
../common/treemodel.cpp
|
||||
../common/utility.cpp
|
||||
../common/LZMA/LzmaDecompress.c
|
||||
../common/LZMA/SDK/C/Bra.c
|
||||
../common/LZMA/SDK/C/Bra86.c
|
||||
../common/LZMA/SDK/C/CpuArch.c
|
||||
../common/LZMA/SDK/C/LzmaDec.c
|
||||
../common/Tiano/EfiTianoDecompress.c
|
||||
../common/ustring.cpp
|
||||
../common/sha256.c
|
||||
../common/bstrlib/bstrlib.c
|
||||
../common/bstrlib/bstrwrap.cpp
|
||||
../common/generated/intel_acbp_v1.cpp
|
||||
../common/generated/intel_acbp_v2.cpp
|
||||
../common/generated/intel_keym_v1.cpp
|
||||
../common/generated/intel_keym_v2.cpp
|
||||
../common/generated/intel_acm.cpp
|
||||
../common/kaitai/kaitaistream.cpp
|
||||
../common/digest/sha1.c
|
||||
../common/digest/sha256.c
|
||||
../common/digest/sha512.c
|
||||
../common/digest/sm3.c
|
||||
../common/zlib/adler32.c
|
||||
../common/zlib/compress.c
|
||||
../common/zlib/crc32.c
|
||||
@ -43,48 +59,7 @@ SET(PROJECT_SOURCES
|
||||
../common/zlib/zutil.c
|
||||
)
|
||||
|
||||
SET(PROJECT_HEADERS
|
||||
uefifind.h
|
||||
../common/guiddatabase.h
|
||||
../common/basetypes.h
|
||||
../common/descriptor.h
|
||||
../common/gbe.h
|
||||
../common/me.h
|
||||
../common/ffs.h
|
||||
../common/nvram.h
|
||||
../common/nvramparser.h
|
||||
../common/ffsparser.h
|
||||
../common/ffsreport.h
|
||||
../common/ffsutils.h
|
||||
../common/peimage.h
|
||||
../common/types.h
|
||||
../common/treeitem.h
|
||||
../common/treemodel.h
|
||||
../common/utility.h
|
||||
../common/LZMA/LzmaDecompress.h
|
||||
../common/Tiano/EfiTianoDecompress.h
|
||||
../common/ubytearray.h
|
||||
../common/ustring.h
|
||||
../common/bootguard.h
|
||||
../common/sha256.h
|
||||
../common/filesystem.h
|
||||
../common/bstrlib/bstrlib.h
|
||||
../common/bstrlib/bstrwrap.h
|
||||
../common/zlib/zconf.h
|
||||
../common/zlib/zlib.h
|
||||
../common/zlib/crc32.h
|
||||
../common/zlib/deflate.h
|
||||
../common/zlib/gzguts.h
|
||||
../common/zlib/inffast.h
|
||||
../common/zlib/inffixed.h
|
||||
../common/zlib/inflate.h
|
||||
../common/zlib/inftrees.h
|
||||
../common/zlib/trees.h
|
||||
../common/zlib/zutil.h
|
||||
../version.h
|
||||
)
|
||||
|
||||
ADD_DEFINITIONS(-DU_ENABLE_NVRAM_PARSING_SUPPORT -DU_ENABLE_FIT_PARSING_SUPPORT -DU_ENABLE_GUID_DATABASE_SUPPORT)
|
||||
|
||||
ADD_EXECUTABLE(UEFIFind ${PROJECT_SOURCES} ${PROJECT_HEADERS})
|
||||
ADD_EXECUTABLE(UEFIFind ${PROJECT_SOURCES})
|
||||
|
||||
|
@ -2,6 +2,10 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.16)
|
||||
|
||||
PROJECT(UEFITool LANGUAGES C CXX)
|
||||
|
||||
SET(CMAKE_CXX_STANDARD 11)
|
||||
SET(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
SET(CMAKE_CXX_EXTENSIONS OFF)
|
||||
|
||||
FIND_PACKAGE(Qt6 REQUIRED COMPONENTS Widgets)
|
||||
QT_STANDARD_PROJECT_SETUP()
|
||||
|
||||
@ -13,6 +17,15 @@ SET(PROJECT_FORMS
|
||||
gotoaddressdialog.ui
|
||||
)
|
||||
|
||||
SET(PROJECT_HEADERS
|
||||
uefitool.h
|
||||
hexspinbox.h
|
||||
searchdialog.h
|
||||
hexviewdialog.h
|
||||
gotobasedialog.h
|
||||
gotoaddressdialog.h
|
||||
)
|
||||
|
||||
SET(PROJECT_SOURCES
|
||||
icons/uefitool.icns
|
||||
uefitool.rc
|
||||
@ -23,6 +36,10 @@ SET(PROJECT_SOURCES
|
||||
guidlineedit.cpp
|
||||
ffsfinder.cpp
|
||||
hexspinbox.cpp
|
||||
qhexedit2/qhexedit.cpp
|
||||
qhexedit2/chunks.cpp
|
||||
qhexedit2/commands.cpp
|
||||
../common/fitparser.cpp
|
||||
../common/guiddatabase.cpp
|
||||
../common/nvram.cpp
|
||||
../common/nvramparser.cpp
|
||||
@ -41,6 +58,8 @@ SET(PROJECT_SOURCES
|
||||
../common/treemodel.cpp
|
||||
../common/LZMA/LzmaCompress.c
|
||||
../common/LZMA/LzmaDecompress.c
|
||||
../common/LZMA/SDK/C/CpuArch.c
|
||||
../common/LZMA/SDK/C/Bra.c
|
||||
../common/LZMA/SDK/C/Bra86.c
|
||||
../common/LZMA/SDK/C/LzFind.c
|
||||
../common/LZMA/SDK/C/LzmaDec.c
|
||||
@ -49,7 +68,16 @@ SET(PROJECT_SOURCES
|
||||
../common/Tiano/EfiTianoCompress.c
|
||||
../common/Tiano/EfiTianoCompressLegacy.c
|
||||
../common/ustring.cpp
|
||||
../common/sha256.c
|
||||
../common/digest/sha1.c
|
||||
../common/digest/sha256.c
|
||||
../common/digest/sha512.c
|
||||
../common/digest/sm3.c
|
||||
../common/generated/intel_acbp_v1.cpp
|
||||
../common/generated/intel_acbp_v2.cpp
|
||||
../common/generated/intel_keym_v1.cpp
|
||||
../common/generated/intel_keym_v2.cpp
|
||||
../common/generated/intel_acm.cpp
|
||||
../common/kaitai/kaitaistream.cpp
|
||||
../common/zlib/adler32.c
|
||||
../common/zlib/compress.c
|
||||
../common/zlib/crc32.c
|
||||
@ -65,66 +93,7 @@ SET(PROJECT_SOURCES
|
||||
../common/zlib/trees.c
|
||||
../common/zlib/uncompr.c
|
||||
../common/zlib/zutil.c
|
||||
qhexedit2/qhexedit.cpp
|
||||
qhexedit2/chunks.cpp
|
||||
qhexedit2/commands.cpp
|
||||
)
|
||||
|
||||
SET(PROJECT_HEADERS
|
||||
hexspinbox.h
|
||||
uefitool.h
|
||||
searchdialog.h
|
||||
hexviewdialog.h
|
||||
gotobasedialog.h
|
||||
gotoaddressdialog.h
|
||||
guidlineedit.h
|
||||
ffsfinder.h
|
||||
../common/guiddatabase.h
|
||||
../common/nvram.h
|
||||
../common/nvramparser.h
|
||||
../common/meparser.h
|
||||
../common/ffsops.h
|
||||
../common/basetypes.h
|
||||
../common/descriptor.h
|
||||
../common/gbe.h
|
||||
../common/me.h
|
||||
../common/ffs.h
|
||||
../common/fit.h
|
||||
../common/peimage.h
|
||||
../common/types.h
|
||||
../common/utility.h
|
||||
../common/parsingdata.h
|
||||
../common/ffsbuilder.h
|
||||
../common/ffsparser.h
|
||||
../common/ffsreport.h
|
||||
../common/treeitem.h
|
||||
../common/ffsutils.h
|
||||
../common/treemodel.h
|
||||
../common/LZMA/LzmaCompress.h
|
||||
../common/LZMA/LzmaDecompress.h
|
||||
../common/Tiano/EfiTianoDecompress.h
|
||||
../common/Tiano/EfiTianoCompress.h
|
||||
../common/uinttypes.h
|
||||
../common/ustring.h
|
||||
../common/ubytearray.h
|
||||
../common/bootguard.h
|
||||
../common/sha256.h
|
||||
../common/zlib/zconf.h
|
||||
../common/zlib/zlib.h
|
||||
../common/zlib/crc32.h
|
||||
../common/zlib/deflate.h
|
||||
../common/zlib/gzguts.h
|
||||
../common/zlib/inffast.h
|
||||
../common/zlib/inffixed.h
|
||||
../common/zlib/inflate.h
|
||||
../common/zlib/inftrees.h
|
||||
../common/zlib/trees.h
|
||||
../common/zlib/zutil.h
|
||||
../version.h
|
||||
qhexedit2/qhexedit.h
|
||||
qhexedit2/chunks.h
|
||||
qhexedit2/commands.h
|
||||
)
|
||||
)
|
||||
|
||||
QT_ADD_RESOURCES(PROJECT_SOURCES
|
||||
uefitool.qrc
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
USTATUS FfsFinder::findHexPattern(const UModelIndex & index, const UByteArray & hexPattern, const UINT8 mode)
|
||||
{
|
||||
//TODO: use FfsUtils.
|
||||
// TODO: use FfsUtils.
|
||||
|
||||
if (!index.isValid())
|
||||
return U_SUCCESS;
|
||||
|
@ -2,6 +2,9 @@ QT += core gui widgets
|
||||
|
||||
TARGET = UEFITool
|
||||
TEMPLATE = app
|
||||
|
||||
CONFIG += c++11
|
||||
|
||||
DEFINES += "U_ENABLE_FIT_PARSING_SUPPORT"
|
||||
DEFINES += "U_ENABLE_NVRAM_PARSING_SUPPORT"
|
||||
DEFINES += "U_ENABLE_ME_PARSING_SUPPORT"
|
||||
@ -15,6 +18,7 @@ HEADERS += uefitool.h \
|
||||
guidlineedit.h \
|
||||
ffsfinder.h \
|
||||
hexspinbox.h \
|
||||
../common/fitparser.h \
|
||||
../common/guiddatabase.h \
|
||||
../common/nvram.h \
|
||||
../common/nvramparser.h \
|
||||
@ -25,7 +29,6 @@ HEADERS += uefitool.h \
|
||||
../common/gbe.h \
|
||||
../common/me.h \
|
||||
../common/ffs.h \
|
||||
../common/fit.h \
|
||||
../common/peimage.h \
|
||||
../common/types.h \
|
||||
../common/utility.h \
|
||||
@ -35,27 +38,28 @@ HEADERS += uefitool.h \
|
||||
../common/ffsreport.h \
|
||||
../common/treeitem.h \
|
||||
../common/ffsutils.h \
|
||||
../common/intel_fit.h \
|
||||
../common/intel_microcode.h \
|
||||
../common/treemodel.h \
|
||||
../common/LZMA/LzmaCompress.h \
|
||||
../common/LZMA/LzmaDecompress.h \
|
||||
../common/Tiano/EfiTianoDecompress.h \
|
||||
../common/Tiano/EfiTianoCompress.h \
|
||||
../common/uinttypes.h \
|
||||
../common/ustring.h \
|
||||
../common/ubytearray.h \
|
||||
../common/bootguard.h \
|
||||
../common/sha256.h \
|
||||
../common/zlib/zconf.h \
|
||||
../common/digest/sha1.h \
|
||||
../common/digest/sha2.h \
|
||||
../common/digest/sm3.h \
|
||||
../common/generated/intel_acbp_v1.h \
|
||||
../common/generated/intel_acbp_v2.h \
|
||||
../common/generated/intel_keym_v1.h \
|
||||
../common/generated/intel_keym_v2.h \
|
||||
../common/generated/intel_acm.h \
|
||||
../common/kaitai/kaitaistream.h \
|
||||
../common/kaitai/kaitaistruct.h \
|
||||
../common/kaitai/exceptions.h \
|
||||
../common/zlib/zlib.h \
|
||||
../common/zlib/crc32.h \
|
||||
../common/zlib/deflate.h \
|
||||
../common/zlib/gzguts.h \
|
||||
../common/zlib/inffast.h \
|
||||
../common/zlib/inffixed.h \
|
||||
../common/zlib/inflate.h \
|
||||
../common/zlib/inftrees.h \
|
||||
../common/zlib/trees.h \
|
||||
../common/zlib/zutil.h \
|
||||
../version.h \
|
||||
qhexedit2/qhexedit.h \
|
||||
qhexedit2/chunks.h \
|
||||
@ -68,6 +72,7 @@ SOURCES += uefitool_main.cpp \
|
||||
guidlineedit.cpp \
|
||||
ffsfinder.cpp \
|
||||
hexspinbox.cpp \
|
||||
../common/fitparser.cpp \
|
||||
../common/guiddatabase.cpp \
|
||||
../common/nvram.cpp \
|
||||
../common/nvramparser.cpp \
|
||||
@ -86,6 +91,8 @@ SOURCES += uefitool_main.cpp \
|
||||
../common/treemodel.cpp \
|
||||
../common/LZMA/LzmaCompress.c \
|
||||
../common/LZMA/LzmaDecompress.c \
|
||||
../common/LZMA/SDK/C/CpuArch.c \
|
||||
../common/LZMA/SDK/C/Bra.c \
|
||||
../common/LZMA/SDK/C/Bra86.c \
|
||||
../common/LZMA/SDK/C/LzFind.c \
|
||||
../common/LZMA/SDK/C/LzmaDec.c \
|
||||
@ -94,7 +101,16 @@ SOURCES += uefitool_main.cpp \
|
||||
../common/Tiano/EfiTianoCompress.c \
|
||||
../common/Tiano/EfiTianoCompressLegacy.c \
|
||||
../common/ustring.cpp \
|
||||
../common/sha256.c \
|
||||
../common/digest/sha1.c \
|
||||
../common/digest/sha256.c \
|
||||
../common/digest/sha512.c \
|
||||
../common/digest/sm3.c \
|
||||
../common/generated/intel_acbp_v1.cpp \
|
||||
../common/generated/intel_acbp_v2.cpp \
|
||||
../common/generated/intel_keym_v1.cpp \
|
||||
../common/generated/intel_keym_v2.cpp \
|
||||
../common/generated/intel_acm.cpp \
|
||||
../common/kaitai/kaitaistream.cpp \
|
||||
../common/zlib/adler32.c \
|
||||
../common/zlib/compress.c \
|
||||
../common/zlib/crc32.c \
|
||||
|
@ -19,11 +19,11 @@ WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
|
||||
#define LZMA_HEADER_SIZE (LZMA_PROPS_SIZE + 8)
|
||||
|
||||
static void * AllocForLzma(void *p, size_t size) { (void)p; return malloc(size); }
|
||||
static void FreeForLzma(void *p, void *address) { (void)p; free(address); }
|
||||
static void * AllocForLzma(ISzAllocPtr p, size_t size) { (void)p; return malloc(size); }
|
||||
static void FreeForLzma(ISzAllocPtr p, void *address) { (void)p; free(address); }
|
||||
static ISzAlloc SzAllocForLzma = { &AllocForLzma, &FreeForLzma };
|
||||
|
||||
SRes OnProgress(void *p, UInt64 inSize, UInt64 outSize)
|
||||
SRes OnProgress(const ICompressProgress *p, UInt64 inSize, UInt64 outSize)
|
||||
{
|
||||
(void)p; (void)inSize; (void)outSize;
|
||||
return SZ_OK;
|
||||
|
@ -14,7 +14,7 @@
|
||||
#ifndef LZMACOMPRESS_H
|
||||
#define LZMACOMPRESS_H
|
||||
|
||||
#include "SDK/C/Types.h"
|
||||
#include "SDK/C/7zTypes.h"
|
||||
#include "../basetypes.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
@ -12,7 +12,7 @@ WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
*/
|
||||
|
||||
#include "LzmaDecompress.h"
|
||||
#include "SDK/C/Types.h"
|
||||
#include "SDK/C/7zTypes.h"
|
||||
#include "SDK/C/7zVersion.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
@ -27,8 +27,8 @@ LShiftU64 (
|
||||
return Operand << Count;
|
||||
}
|
||||
|
||||
static void * AllocForLzma(void *p, size_t size) { (void)p; return malloc(size); }
|
||||
static void FreeForLzma(void *p, void *address) { (void)p; free(address); }
|
||||
static void * AllocForLzma(ISzAllocPtr p, size_t size) { (void)p; return malloc(size); }
|
||||
static void FreeForLzma(ISzAllocPtr p, void *address) { (void)p; free(address); }
|
||||
static ISzAlloc SzAllocForLzma = { &AllocForLzma, &FreeForLzma };
|
||||
|
||||
/*
|
||||
|
529
common/LZMA/SDK/C/7zTypes.h
Normal file
529
common/LZMA/SDK/C/7zTypes.h
Normal file
@ -0,0 +1,529 @@
|
||||
/* 7zTypes.h -- Basic types
|
||||
2022-04-01 : Igor Pavlov : Public domain */
|
||||
|
||||
#ifndef __7Z_TYPES_H
|
||||
#define __7Z_TYPES_H
|
||||
|
||||
#ifdef _WIN32
|
||||
/* #include <windows.h> */
|
||||
#else
|
||||
#include <errno.h>
|
||||
#endif
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
#ifndef EXTERN_C_BEGIN
|
||||
#ifdef __cplusplus
|
||||
#define EXTERN_C_BEGIN extern "C" {
|
||||
#define EXTERN_C_END }
|
||||
#else
|
||||
#define EXTERN_C_BEGIN
|
||||
#define EXTERN_C_END
|
||||
#endif
|
||||
#endif
|
||||
|
||||
EXTERN_C_BEGIN
|
||||
|
||||
#define SZ_OK 0
|
||||
|
||||
#define SZ_ERROR_DATA 1
|
||||
#define SZ_ERROR_MEM 2
|
||||
#define SZ_ERROR_CRC 3
|
||||
#define SZ_ERROR_UNSUPPORTED 4
|
||||
#define SZ_ERROR_PARAM 5
|
||||
#define SZ_ERROR_INPUT_EOF 6
|
||||
#define SZ_ERROR_OUTPUT_EOF 7
|
||||
#define SZ_ERROR_READ 8
|
||||
#define SZ_ERROR_WRITE 9
|
||||
#define SZ_ERROR_PROGRESS 10
|
||||
#define SZ_ERROR_FAIL 11
|
||||
#define SZ_ERROR_THREAD 12
|
||||
|
||||
#define SZ_ERROR_ARCHIVE 16
|
||||
#define SZ_ERROR_NO_ARCHIVE 17
|
||||
|
||||
typedef int SRes;
|
||||
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#if _MSC_VER > 1200
|
||||
#define MY_ALIGN(n) __declspec(align(n))
|
||||
#else
|
||||
#define MY_ALIGN(n)
|
||||
#endif
|
||||
#else
|
||||
#define MY_ALIGN(n) __attribute__ ((aligned(n)))
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
/* typedef DWORD WRes; */
|
||||
typedef unsigned WRes;
|
||||
#define MY_SRes_HRESULT_FROM_WRes(x) HRESULT_FROM_WIN32(x)
|
||||
|
||||
// #define MY_HRES_ERROR__INTERNAL_ERROR MY_SRes_HRESULT_FROM_WRes(ERROR_INTERNAL_ERROR)
|
||||
|
||||
#else // _WIN32
|
||||
|
||||
// #define ENV_HAVE_LSTAT
|
||||
typedef int WRes;
|
||||
|
||||
// (FACILITY_ERRNO = 0x800) is 7zip's FACILITY constant to represent (errno) errors in HRESULT
|
||||
#define MY__FACILITY_ERRNO 0x800
|
||||
#define MY__FACILITY_WIN32 7
|
||||
#define MY__FACILITY__WRes MY__FACILITY_ERRNO
|
||||
|
||||
#define MY_HRESULT_FROM_errno_CONST_ERROR(x) ((HRESULT)( \
|
||||
( (HRESULT)(x) & 0x0000FFFF) \
|
||||
| (MY__FACILITY__WRes << 16) \
|
||||
| (HRESULT)0x80000000 ))
|
||||
|
||||
#define MY_SRes_HRESULT_FROM_WRes(x) \
|
||||
((HRESULT)(x) <= 0 ? ((HRESULT)(x)) : MY_HRESULT_FROM_errno_CONST_ERROR(x))
|
||||
|
||||
// we call macro HRESULT_FROM_WIN32 for system errors (WRes) that are (errno)
|
||||
#define HRESULT_FROM_WIN32(x) MY_SRes_HRESULT_FROM_WRes(x)
|
||||
|
||||
/*
|
||||
#define ERROR_FILE_NOT_FOUND 2L
|
||||
#define ERROR_ACCESS_DENIED 5L
|
||||
#define ERROR_NO_MORE_FILES 18L
|
||||
#define ERROR_LOCK_VIOLATION 33L
|
||||
#define ERROR_FILE_EXISTS 80L
|
||||
#define ERROR_DISK_FULL 112L
|
||||
#define ERROR_NEGATIVE_SEEK 131L
|
||||
#define ERROR_ALREADY_EXISTS 183L
|
||||
#define ERROR_DIRECTORY 267L
|
||||
#define ERROR_TOO_MANY_POSTS 298L
|
||||
|
||||
#define ERROR_INTERNAL_ERROR 1359L
|
||||
#define ERROR_INVALID_REPARSE_DATA 4392L
|
||||
#define ERROR_REPARSE_TAG_INVALID 4393L
|
||||
#define ERROR_REPARSE_TAG_MISMATCH 4394L
|
||||
*/
|
||||
|
||||
// we use errno equivalents for some WIN32 errors:
|
||||
|
||||
#define ERROR_INVALID_PARAMETER EINVAL
|
||||
#define ERROR_INVALID_FUNCTION EINVAL
|
||||
#define ERROR_ALREADY_EXISTS EEXIST
|
||||
#define ERROR_FILE_EXISTS EEXIST
|
||||
#define ERROR_PATH_NOT_FOUND ENOENT
|
||||
#define ERROR_FILE_NOT_FOUND ENOENT
|
||||
#define ERROR_DISK_FULL ENOSPC
|
||||
// #define ERROR_INVALID_HANDLE EBADF
|
||||
|
||||
// we use FACILITY_WIN32 for errors that has no errno equivalent
|
||||
// Too many posts were made to a semaphore.
|
||||
#define ERROR_TOO_MANY_POSTS ((HRESULT)0x8007012AL)
|
||||
#define ERROR_INVALID_REPARSE_DATA ((HRESULT)0x80071128L)
|
||||
#define ERROR_REPARSE_TAG_INVALID ((HRESULT)0x80071129L)
|
||||
|
||||
// if (MY__FACILITY__WRes != FACILITY_WIN32),
|
||||
// we use FACILITY_WIN32 for COM errors:
|
||||
#define E_OUTOFMEMORY ((HRESULT)0x8007000EL)
|
||||
#define E_INVALIDARG ((HRESULT)0x80070057L)
|
||||
#define MY__E_ERROR_NEGATIVE_SEEK ((HRESULT)0x80070083L)
|
||||
|
||||
/*
|
||||
// we can use FACILITY_ERRNO for some COM errors, that have errno equivalents:
|
||||
#define E_OUTOFMEMORY MY_HRESULT_FROM_errno_CONST_ERROR(ENOMEM)
|
||||
#define E_INVALIDARG MY_HRESULT_FROM_errno_CONST_ERROR(EINVAL)
|
||||
#define MY__E_ERROR_NEGATIVE_SEEK MY_HRESULT_FROM_errno_CONST_ERROR(EINVAL)
|
||||
*/
|
||||
|
||||
#define TEXT(quote) quote
|
||||
|
||||
#define FILE_ATTRIBUTE_READONLY 0x0001
|
||||
#define FILE_ATTRIBUTE_HIDDEN 0x0002
|
||||
#define FILE_ATTRIBUTE_SYSTEM 0x0004
|
||||
#define FILE_ATTRIBUTE_DIRECTORY 0x0010
|
||||
#define FILE_ATTRIBUTE_ARCHIVE 0x0020
|
||||
#define FILE_ATTRIBUTE_DEVICE 0x0040
|
||||
#define FILE_ATTRIBUTE_NORMAL 0x0080
|
||||
#define FILE_ATTRIBUTE_TEMPORARY 0x0100
|
||||
#define FILE_ATTRIBUTE_SPARSE_FILE 0x0200
|
||||
#define FILE_ATTRIBUTE_REPARSE_POINT 0x0400
|
||||
#define FILE_ATTRIBUTE_COMPRESSED 0x0800
|
||||
#define FILE_ATTRIBUTE_OFFLINE 0x1000
|
||||
#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED 0x2000
|
||||
#define FILE_ATTRIBUTE_ENCRYPTED 0x4000
|
||||
|
||||
#define FILE_ATTRIBUTE_UNIX_EXTENSION 0x8000 /* trick for Unix */
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef RINOK
|
||||
#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
|
||||
#endif
|
||||
|
||||
#ifndef RINOK_WRes
|
||||
#define RINOK_WRes(x) { WRes __result__ = (x); if (__result__ != 0) return __result__; }
|
||||
#endif
|
||||
|
||||
typedef unsigned char Byte;
|
||||
typedef short Int16;
|
||||
typedef unsigned short UInt16;
|
||||
|
||||
#ifdef _LZMA_UINT32_IS_ULONG
|
||||
typedef long Int32;
|
||||
typedef unsigned long UInt32;
|
||||
#else
|
||||
typedef int Int32;
|
||||
typedef unsigned int UInt32;
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef _WIN32
|
||||
|
||||
typedef int INT;
|
||||
typedef Int32 INT32;
|
||||
typedef unsigned int UINT;
|
||||
typedef UInt32 UINT32;
|
||||
typedef INT32 LONG; // LONG, ULONG and DWORD must be 32-bit for _WIN32 compatibility
|
||||
typedef UINT32 ULONG;
|
||||
|
||||
#undef DWORD
|
||||
typedef UINT32 DWORD;
|
||||
|
||||
#define VOID void
|
||||
|
||||
#define HRESULT LONG
|
||||
|
||||
typedef void *LPVOID;
|
||||
// typedef void VOID;
|
||||
// typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR;
|
||||
// gcc / clang on Unix : sizeof(long==sizeof(void*) in 32 or 64 bits)
|
||||
typedef long INT_PTR;
|
||||
typedef unsigned long UINT_PTR;
|
||||
typedef long LONG_PTR;
|
||||
typedef unsigned long DWORD_PTR;
|
||||
|
||||
typedef size_t SIZE_T;
|
||||
|
||||
#endif // _WIN32
|
||||
|
||||
|
||||
#define MY_HRES_ERROR__INTERNAL_ERROR ((HRESULT)0x8007054FL)
|
||||
|
||||
|
||||
#ifdef _SZ_NO_INT_64
|
||||
|
||||
/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
|
||||
NOTES: Some code will work incorrectly in that case! */
|
||||
|
||||
typedef long Int64;
|
||||
typedef unsigned long UInt64;
|
||||
|
||||
#else
|
||||
|
||||
#if defined(_MSC_VER) || defined(__BORLANDC__)
|
||||
typedef __int64 Int64;
|
||||
typedef unsigned __int64 UInt64;
|
||||
#define UINT64_CONST(n) n
|
||||
#else
|
||||
typedef long long int Int64;
|
||||
typedef unsigned long long int UInt64;
|
||||
#define UINT64_CONST(n) n ## ULL
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef _LZMA_NO_SYSTEM_SIZE_T
|
||||
typedef UInt32 SizeT;
|
||||
#else
|
||||
typedef size_t SizeT;
|
||||
#endif
|
||||
|
||||
typedef int BoolInt;
|
||||
/* typedef BoolInt Bool; */
|
||||
#define True 1
|
||||
#define False 0
|
||||
|
||||
|
||||
#ifdef _WIN32
|
||||
#define MY_STD_CALL __stdcall
|
||||
#else
|
||||
#define MY_STD_CALL
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
|
||||
#if _MSC_VER >= 1300
|
||||
#define MY_NO_INLINE __declspec(noinline)
|
||||
#else
|
||||
#define MY_NO_INLINE
|
||||
#endif
|
||||
|
||||
#define MY_FORCE_INLINE __forceinline
|
||||
|
||||
#define MY_CDECL __cdecl
|
||||
#define MY_FAST_CALL __fastcall
|
||||
|
||||
#else // _MSC_VER
|
||||
|
||||
#if (defined(__GNUC__) && (__GNUC__ >= 4)) \
|
||||
|| (defined(__clang__) && (__clang_major__ >= 4)) \
|
||||
|| defined(__INTEL_COMPILER) \
|
||||
|| defined(__xlC__)
|
||||
#define MY_NO_INLINE __attribute__((noinline))
|
||||
// #define MY_FORCE_INLINE __attribute__((always_inline)) inline
|
||||
#else
|
||||
#define MY_NO_INLINE
|
||||
#endif
|
||||
|
||||
#define MY_FORCE_INLINE
|
||||
|
||||
|
||||
#define MY_CDECL
|
||||
|
||||
#if defined(_M_IX86) \
|
||||
|| defined(__i386__)
|
||||
// #define MY_FAST_CALL __attribute__((fastcall))
|
||||
// #define MY_FAST_CALL __attribute__((cdecl))
|
||||
#define MY_FAST_CALL
|
||||
#elif defined(MY_CPU_AMD64)
|
||||
// #define MY_FAST_CALL __attribute__((ms_abi))
|
||||
#define MY_FAST_CALL
|
||||
#else
|
||||
#define MY_FAST_CALL
|
||||
#endif
|
||||
|
||||
#endif // _MSC_VER
|
||||
|
||||
|
||||
/* The following interfaces use first parameter as pointer to structure */
|
||||
|
||||
typedef struct IByteIn IByteIn;
|
||||
struct IByteIn
|
||||
{
|
||||
Byte (*Read)(const IByteIn *p); /* reads one byte, returns 0 in case of EOF or error */
|
||||
};
|
||||
#define IByteIn_Read(p) (p)->Read(p)
|
||||
|
||||
|
||||
typedef struct IByteOut IByteOut;
|
||||
struct IByteOut
|
||||
{
|
||||
void (*Write)(const IByteOut *p, Byte b);
|
||||
};
|
||||
#define IByteOut_Write(p, b) (p)->Write(p, b)
|
||||
|
||||
|
||||
typedef struct ISeqInStream ISeqInStream;
|
||||
struct ISeqInStream
|
||||
{
|
||||
SRes (*Read)(const ISeqInStream *p, void *buf, size_t *size);
|
||||
/* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
|
||||
(output(*size) < input(*size)) is allowed */
|
||||
};
|
||||
#define ISeqInStream_Read(p, buf, size) (p)->Read(p, buf, size)
|
||||
|
||||
/* it can return SZ_ERROR_INPUT_EOF */
|
||||
SRes SeqInStream_Read(const ISeqInStream *stream, void *buf, size_t size);
|
||||
SRes SeqInStream_Read2(const ISeqInStream *stream, void *buf, size_t size, SRes errorType);
|
||||
SRes SeqInStream_ReadByte(const ISeqInStream *stream, Byte *buf);
|
||||
|
||||
|
||||
typedef struct ISeqOutStream ISeqOutStream;
|
||||
struct ISeqOutStream
|
||||
{
|
||||
size_t (*Write)(const ISeqOutStream *p, const void *buf, size_t size);
|
||||
/* Returns: result - the number of actually written bytes.
|
||||
(result < size) means error */
|
||||
};
|
||||
#define ISeqOutStream_Write(p, buf, size) (p)->Write(p, buf, size)
|
||||
|
||||
typedef enum
|
||||
{
|
||||
SZ_SEEK_SET = 0,
|
||||
SZ_SEEK_CUR = 1,
|
||||
SZ_SEEK_END = 2
|
||||
} ESzSeek;
|
||||
|
||||
|
||||
typedef struct ISeekInStream ISeekInStream;
|
||||
struct ISeekInStream
|
||||
{
|
||||
SRes (*Read)(const ISeekInStream *p, void *buf, size_t *size); /* same as ISeqInStream::Read */
|
||||
SRes (*Seek)(const ISeekInStream *p, Int64 *pos, ESzSeek origin);
|
||||
};
|
||||
#define ISeekInStream_Read(p, buf, size) (p)->Read(p, buf, size)
|
||||
#define ISeekInStream_Seek(p, pos, origin) (p)->Seek(p, pos, origin)
|
||||
|
||||
|
||||
typedef struct ILookInStream ILookInStream;
|
||||
struct ILookInStream
|
||||
{
|
||||
SRes (*Look)(const ILookInStream *p, const void **buf, size_t *size);
|
||||
/* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
|
||||
(output(*size) > input(*size)) is not allowed
|
||||
(output(*size) < input(*size)) is allowed */
|
||||
SRes (*Skip)(const ILookInStream *p, size_t offset);
|
||||
/* offset must be <= output(*size) of Look */
|
||||
|
||||
SRes (*Read)(const ILookInStream *p, void *buf, size_t *size);
|
||||
/* reads directly (without buffer). It's same as ISeqInStream::Read */
|
||||
SRes (*Seek)(const ILookInStream *p, Int64 *pos, ESzSeek origin);
|
||||
};
|
||||
|
||||
#define ILookInStream_Look(p, buf, size) (p)->Look(p, buf, size)
|
||||
#define ILookInStream_Skip(p, offset) (p)->Skip(p, offset)
|
||||
#define ILookInStream_Read(p, buf, size) (p)->Read(p, buf, size)
|
||||
#define ILookInStream_Seek(p, pos, origin) (p)->Seek(p, pos, origin)
|
||||
|
||||
|
||||
SRes LookInStream_LookRead(const ILookInStream *stream, void *buf, size_t *size);
|
||||
SRes LookInStream_SeekTo(const ILookInStream *stream, UInt64 offset);
|
||||
|
||||
/* reads via ILookInStream::Read */
|
||||
SRes LookInStream_Read2(const ILookInStream *stream, void *buf, size_t size, SRes errorType);
|
||||
SRes LookInStream_Read(const ILookInStream *stream, void *buf, size_t size);
|
||||
|
||||
|
||||
|
||||
typedef struct
|
||||
{
|
||||
ILookInStream vt;
|
||||
const ISeekInStream *realStream;
|
||||
|
||||
size_t pos;
|
||||
size_t size; /* it's data size */
|
||||
|
||||
/* the following variables must be set outside */
|
||||
Byte *buf;
|
||||
size_t bufSize;
|
||||
} CLookToRead2;
|
||||
|
||||
void LookToRead2_CreateVTable(CLookToRead2 *p, int lookahead);
|
||||
|
||||
#define LookToRead2_Init(p) { (p)->pos = (p)->size = 0; }
|
||||
|
||||
|
||||
typedef struct
|
||||
{
|
||||
ISeqInStream vt;
|
||||
const ILookInStream *realStream;
|
||||
} CSecToLook;
|
||||
|
||||
void SecToLook_CreateVTable(CSecToLook *p);
|
||||
|
||||
|
||||
|
||||
typedef struct
|
||||
{
|
||||
ISeqInStream vt;
|
||||
const ILookInStream *realStream;
|
||||
} CSecToRead;
|
||||
|
||||
void SecToRead_CreateVTable(CSecToRead *p);
|
||||
|
||||
|
||||
typedef struct ICompressProgress ICompressProgress;
|
||||
|
||||
struct ICompressProgress
|
||||
{
|
||||
SRes (*Progress)(const ICompressProgress *p, UInt64 inSize, UInt64 outSize);
|
||||
/* Returns: result. (result != SZ_OK) means break.
|
||||
Value (UInt64)(Int64)-1 for size means unknown value. */
|
||||
};
|
||||
#define ICompressProgress_Progress(p, inSize, outSize) (p)->Progress(p, inSize, outSize)
|
||||
|
||||
|
||||
|
||||
typedef struct ISzAlloc ISzAlloc;
|
||||
typedef const ISzAlloc * ISzAllocPtr;
|
||||
|
||||
struct ISzAlloc
|
||||
{
|
||||
void *(*Alloc)(ISzAllocPtr p, size_t size);
|
||||
void (*Free)(ISzAllocPtr p, void *address); /* address can be 0 */
|
||||
};
|
||||
|
||||
#define ISzAlloc_Alloc(p, size) (p)->Alloc(p, size)
|
||||
#define ISzAlloc_Free(p, a) (p)->Free(p, a)
|
||||
|
||||
/* deprecated */
|
||||
#define IAlloc_Alloc(p, size) ISzAlloc_Alloc(p, size)
|
||||
#define IAlloc_Free(p, a) ISzAlloc_Free(p, a)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#ifndef MY_offsetof
|
||||
#ifdef offsetof
|
||||
#define MY_offsetof(type, m) offsetof(type, m)
|
||||
/*
|
||||
#define MY_offsetof(type, m) FIELD_OFFSET(type, m)
|
||||
*/
|
||||
#else
|
||||
#define MY_offsetof(type, m) ((size_t)&(((type *)0)->m))
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#ifndef MY_container_of
|
||||
|
||||
/*
|
||||
#define MY_container_of(ptr, type, m) container_of(ptr, type, m)
|
||||
#define MY_container_of(ptr, type, m) CONTAINING_RECORD(ptr, type, m)
|
||||
#define MY_container_of(ptr, type, m) ((type *)((char *)(ptr) - offsetof(type, m)))
|
||||
#define MY_container_of(ptr, type, m) (&((type *)0)->m == (ptr), ((type *)(((char *)(ptr)) - MY_offsetof(type, m))))
|
||||
*/
|
||||
|
||||
/*
|
||||
GCC shows warning: "perhaps the 'offsetof' macro was used incorrectly"
|
||||
GCC 3.4.4 : classes with constructor
|
||||
GCC 4.8.1 : classes with non-public variable members"
|
||||
*/
|
||||
|
||||
#define MY_container_of(ptr, type, m) ((type *)(void *)((char *)(void *)(1 ? (ptr) : &((type *)0)->m) - MY_offsetof(type, m)))
|
||||
|
||||
#endif
|
||||
|
||||
#define CONTAINER_FROM_VTBL_SIMPLE(ptr, type, m) ((type *)(void *)(ptr))
|
||||
|
||||
/*
|
||||
#define CONTAINER_FROM_VTBL(ptr, type, m) CONTAINER_FROM_VTBL_SIMPLE(ptr, type, m)
|
||||
*/
|
||||
#define CONTAINER_FROM_VTBL(ptr, type, m) MY_container_of(ptr, type, m)
|
||||
|
||||
#define CONTAINER_FROM_VTBL_CLS(ptr, type, m) CONTAINER_FROM_VTBL_SIMPLE(ptr, type, m)
|
||||
/*
|
||||
#define CONTAINER_FROM_VTBL_CLS(ptr, type, m) CONTAINER_FROM_VTBL(ptr, type, m)
|
||||
*/
|
||||
|
||||
|
||||
#define MY_memset_0_ARRAY(a) memset((a), 0, sizeof(a))
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
#define CHAR_PATH_SEPARATOR '\\'
|
||||
#define WCHAR_PATH_SEPARATOR L'\\'
|
||||
#define STRING_PATH_SEPARATOR "\\"
|
||||
#define WSTRING_PATH_SEPARATOR L"\\"
|
||||
|
||||
#else
|
||||
|
||||
#define CHAR_PATH_SEPARATOR '/'
|
||||
#define WCHAR_PATH_SEPARATOR L'/'
|
||||
#define STRING_PATH_SEPARATOR "/"
|
||||
#define WSTRING_PATH_SEPARATOR L"/"
|
||||
|
||||
#endif
|
||||
|
||||
#define k_PropVar_TimePrec_0 0
|
||||
#define k_PropVar_TimePrec_Unix 1
|
||||
#define k_PropVar_TimePrec_DOS 2
|
||||
#define k_PropVar_TimePrec_HighPrec 3
|
||||
#define k_PropVar_TimePrec_Base 16
|
||||
#define k_PropVar_TimePrec_100ns (k_PropVar_TimePrec_Base + 7)
|
||||
#define k_PropVar_TimePrec_1ns (k_PropVar_TimePrec_Base + 9)
|
||||
|
||||
EXTERN_C_END
|
||||
|
||||
#endif
|
@ -1,7 +1,27 @@
|
||||
#define MY_VER_MAJOR 9
|
||||
#define MY_VER_MINOR 20
|
||||
#define MY_VER_MAJOR 22
|
||||
#define MY_VER_MINOR 01
|
||||
#define MY_VER_BUILD 0
|
||||
#define MY_VERSION "9.20"
|
||||
#define MY_DATE "2010-11-18"
|
||||
#define MY_COPYRIGHT ": Igor Pavlov : Public domain"
|
||||
#define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " : " MY_DATE
|
||||
#define MY_VERSION_NUMBERS "22.01"
|
||||
#define MY_VERSION MY_VERSION_NUMBERS
|
||||
|
||||
#ifdef MY_CPU_NAME
|
||||
#define MY_VERSION_CPU MY_VERSION " (" MY_CPU_NAME ")"
|
||||
#else
|
||||
#define MY_VERSION_CPU MY_VERSION
|
||||
#endif
|
||||
|
||||
#define MY_DATE "2022-07-15"
|
||||
#undef MY_COPYRIGHT
|
||||
#undef MY_VERSION_COPYRIGHT_DATE
|
||||
#define MY_AUTHOR_NAME "Igor Pavlov"
|
||||
#define MY_COPYRIGHT_PD "Igor Pavlov : Public domain"
|
||||
#define MY_COPYRIGHT_CR "Copyright (c) 1999-2022 Igor Pavlov"
|
||||
|
||||
#ifdef USE_COPYRIGHT_CR
|
||||
#define MY_COPYRIGHT MY_COPYRIGHT_CR
|
||||
#else
|
||||
#define MY_COPYRIGHT MY_COPYRIGHT_PD
|
||||
#endif
|
||||
|
||||
#define MY_COPYRIGHT_DATE MY_COPYRIGHT " : " MY_DATE
|
||||
#define MY_VERSION_COPYRIGHT_DATE MY_VERSION_CPU " : " MY_COPYRIGHT " : " MY_DATE
|
||||
|
230
common/LZMA/SDK/C/Bra.c
Normal file
230
common/LZMA/SDK/C/Bra.c
Normal file
@ -0,0 +1,230 @@
|
||||
/* Bra.c -- Converters for RISC code
|
||||
2021-02-09 : Igor Pavlov : Public domain */
|
||||
|
||||
#include "Precomp.h"
|
||||
|
||||
#include "CpuArch.h"
|
||||
#include "Bra.h"
|
||||
|
||||
SizeT ARM_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
|
||||
{
|
||||
Byte *p;
|
||||
const Byte *lim;
|
||||
size &= ~(size_t)3;
|
||||
ip += 4;
|
||||
p = data;
|
||||
lim = data + size;
|
||||
|
||||
if (encoding)
|
||||
|
||||
for (;;)
|
||||
{
|
||||
for (;;)
|
||||
{
|
||||
if (p >= lim)
|
||||
return (SizeT)(p - data);
|
||||
p += 4;
|
||||
if (p[-1] == 0xEB)
|
||||
break;
|
||||
}
|
||||
{
|
||||
UInt32 v = GetUi32(p - 4);
|
||||
v <<= 2;
|
||||
v += ip + (UInt32)(p - data);
|
||||
v >>= 2;
|
||||
v &= 0x00FFFFFF;
|
||||
v |= 0xEB000000;
|
||||
SetUi32(p - 4, v);
|
||||
}
|
||||
}
|
||||
|
||||
for (;;)
|
||||
{
|
||||
for (;;)
|
||||
{
|
||||
if (p >= lim)
|
||||
return (SizeT)(p - data);
|
||||
p += 4;
|
||||
if (p[-1] == 0xEB)
|
||||
break;
|
||||
}
|
||||
{
|
||||
UInt32 v = GetUi32(p - 4);
|
||||
v <<= 2;
|
||||
v -= ip + (UInt32)(p - data);
|
||||
v >>= 2;
|
||||
v &= 0x00FFFFFF;
|
||||
v |= 0xEB000000;
|
||||
SetUi32(p - 4, v);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
SizeT ARMT_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
|
||||
{
|
||||
Byte *p;
|
||||
const Byte *lim;
|
||||
size &= ~(size_t)1;
|
||||
p = data;
|
||||
lim = data + size - 4;
|
||||
|
||||
if (encoding)
|
||||
|
||||
for (;;)
|
||||
{
|
||||
UInt32 b1;
|
||||
for (;;)
|
||||
{
|
||||
UInt32 b3;
|
||||
if (p > lim)
|
||||
return (SizeT)(p - data);
|
||||
b1 = p[1];
|
||||
b3 = p[3];
|
||||
p += 2;
|
||||
b1 ^= 8;
|
||||
if ((b3 & b1) >= 0xF8)
|
||||
break;
|
||||
}
|
||||
{
|
||||
UInt32 v =
|
||||
((UInt32)b1 << 19)
|
||||
+ (((UInt32)p[1] & 0x7) << 8)
|
||||
+ (((UInt32)p[-2] << 11))
|
||||
+ (p[0]);
|
||||
|
||||
p += 2;
|
||||
{
|
||||
UInt32 cur = (ip + (UInt32)(p - data)) >> 1;
|
||||
v += cur;
|
||||
}
|
||||
|
||||
p[-4] = (Byte)(v >> 11);
|
||||
p[-3] = (Byte)(0xF0 | ((v >> 19) & 0x7));
|
||||
p[-2] = (Byte)v;
|
||||
p[-1] = (Byte)(0xF8 | (v >> 8));
|
||||
}
|
||||
}
|
||||
|
||||
for (;;)
|
||||
{
|
||||
UInt32 b1;
|
||||
for (;;)
|
||||
{
|
||||
UInt32 b3;
|
||||
if (p > lim)
|
||||
return (SizeT)(p - data);
|
||||
b1 = p[1];
|
||||
b3 = p[3];
|
||||
p += 2;
|
||||
b1 ^= 8;
|
||||
if ((b3 & b1) >= 0xF8)
|
||||
break;
|
||||
}
|
||||
{
|
||||
UInt32 v =
|
||||
((UInt32)b1 << 19)
|
||||
+ (((UInt32)p[1] & 0x7) << 8)
|
||||
+ (((UInt32)p[-2] << 11))
|
||||
+ (p[0]);
|
||||
|
||||
p += 2;
|
||||
{
|
||||
UInt32 cur = (ip + (UInt32)(p - data)) >> 1;
|
||||
v -= cur;
|
||||
}
|
||||
|
||||
/*
|
||||
SetUi16(p - 4, (UInt16)(((v >> 11) & 0x7FF) | 0xF000));
|
||||
SetUi16(p - 2, (UInt16)(v | 0xF800));
|
||||
*/
|
||||
|
||||
p[-4] = (Byte)(v >> 11);
|
||||
p[-3] = (Byte)(0xF0 | ((v >> 19) & 0x7));
|
||||
p[-2] = (Byte)v;
|
||||
p[-1] = (Byte)(0xF8 | (v >> 8));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
SizeT PPC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
|
||||
{
|
||||
Byte *p;
|
||||
const Byte *lim;
|
||||
size &= ~(size_t)3;
|
||||
ip -= 4;
|
||||
p = data;
|
||||
lim = data + size;
|
||||
|
||||
for (;;)
|
||||
{
|
||||
for (;;)
|
||||
{
|
||||
if (p >= lim)
|
||||
return (SizeT)(p - data);
|
||||
p += 4;
|
||||
/* if ((v & 0xFC000003) == 0x48000001) */
|
||||
if ((p[-4] & 0xFC) == 0x48 && (p[-1] & 3) == 1)
|
||||
break;
|
||||
}
|
||||
{
|
||||
UInt32 v = GetBe32(p - 4);
|
||||
if (encoding)
|
||||
v += ip + (UInt32)(p - data);
|
||||
else
|
||||
v -= ip + (UInt32)(p - data);
|
||||
v &= 0x03FFFFFF;
|
||||
v |= 0x48000000;
|
||||
SetBe32(p - 4, v);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
SizeT SPARC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding)
|
||||
{
|
||||
Byte *p;
|
||||
const Byte *lim;
|
||||
size &= ~(size_t)3;
|
||||
ip -= 4;
|
||||
p = data;
|
||||
lim = data + size;
|
||||
|
||||
for (;;)
|
||||
{
|
||||
for (;;)
|
||||
{
|
||||
if (p >= lim)
|
||||
return (SizeT)(p - data);
|
||||
/*
|
||||
v = GetBe32(p);
|
||||
p += 4;
|
||||
m = v + ((UInt32)5 << 29);
|
||||
m ^= (UInt32)7 << 29;
|
||||
m += (UInt32)1 << 22;
|
||||
if ((m & ((UInt32)0x1FF << 23)) == 0)
|
||||
break;
|
||||
*/
|
||||
p += 4;
|
||||
if ((p[-4] == 0x40 && (p[-3] & 0xC0) == 0) ||
|
||||
(p[-4] == 0x7F && (p[-3] >= 0xC0)))
|
||||
break;
|
||||
}
|
||||
{
|
||||
UInt32 v = GetBe32(p - 4);
|
||||
v <<= 2;
|
||||
if (encoding)
|
||||
v += ip + (UInt32)(p - data);
|
||||
else
|
||||
v -= ip + (UInt32)(p - data);
|
||||
|
||||
v &= 0x01FFFFFF;
|
||||
v -= (UInt32)1 << 24;
|
||||
v ^= 0xFF000000;
|
||||
v >>= 2;
|
||||
v |= 0x40000000;
|
||||
SetBe32(p - 4, v);
|
||||
}
|
||||
}
|
||||
}
|
@ -1,14 +1,12 @@
|
||||
/* Bra.h -- Branch converters for executables
|
||||
2009-02-07 : Igor Pavlov : Public domain */
|
||||
2013-01-18 : Igor Pavlov : Public domain */
|
||||
|
||||
#ifndef __BRA_H
|
||||
#define __BRA_H
|
||||
|
||||
#include "Types.h"
|
||||
#include "7zTypes.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
EXTERN_C_BEGIN
|
||||
|
||||
/*
|
||||
These functions convert relative addresses to absolute addresses
|
||||
@ -61,8 +59,6 @@ SizeT PPC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
|
||||
SizeT SPARC_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
|
||||
SizeT IA64_Convert(Byte *data, SizeT size, UInt32 ip, int encoding);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
EXTERN_C_END
|
||||
|
||||
#endif
|
||||
|
@ -1,85 +1,82 @@
|
||||
/* Bra86.c -- Converter for x86 code (BCJ)
|
||||
2008-10-04 : Igor Pavlov : Public domain */
|
||||
2021-02-09 : Igor Pavlov : Public domain */
|
||||
|
||||
#include "Precomp.h"
|
||||
|
||||
#include "Bra.h"
|
||||
|
||||
#define Test86MSByte(b) ((b) == 0 || (b) == 0xFF)
|
||||
|
||||
const Byte kMaskToAllowedStatus[8] = {1, 1, 1, 0, 1, 0, 0, 0};
|
||||
const Byte kMaskToBitNumber[8] = {0, 1, 2, 2, 3, 3, 3, 3};
|
||||
#define Test86MSByte(b) ((((b) + 1) & 0xFE) == 0)
|
||||
|
||||
SizeT x86_Convert(Byte *data, SizeT size, UInt32 ip, UInt32 *state, int encoding)
|
||||
{
|
||||
SizeT bufferPos = 0, prevPosT;
|
||||
UInt32 prevMask = *state & 0x7;
|
||||
SizeT pos = 0;
|
||||
UInt32 mask = *state & 7;
|
||||
if (size < 5)
|
||||
return 0;
|
||||
size -= 4;
|
||||
ip += 5;
|
||||
prevPosT = (SizeT)0 - 1;
|
||||
|
||||
for (;;)
|
||||
{
|
||||
Byte *p = data + bufferPos;
|
||||
Byte *limit = data + size - 4;
|
||||
Byte *p = data + pos;
|
||||
const Byte *limit = data + size;
|
||||
for (; p < limit; p++)
|
||||
if ((*p & 0xFE) == 0xE8)
|
||||
break;
|
||||
bufferPos = (SizeT)(p - data);
|
||||
|
||||
{
|
||||
SizeT d = (SizeT)(p - data) - pos;
|
||||
pos = (SizeT)(p - data);
|
||||
if (p >= limit)
|
||||
break;
|
||||
prevPosT = bufferPos - prevPosT;
|
||||
if (prevPosT > 3)
|
||||
prevMask = 0;
|
||||
{
|
||||
*state = (d > 2 ? 0 : mask >> (unsigned)d);
|
||||
return pos;
|
||||
}
|
||||
if (d > 2)
|
||||
mask = 0;
|
||||
else
|
||||
{
|
||||
prevMask = (prevMask << ((int)prevPosT - 1)) & 0x7;
|
||||
if (prevMask != 0)
|
||||
mask >>= (unsigned)d;
|
||||
if (mask != 0 && (mask > 4 || mask == 3 || Test86MSByte(p[(size_t)(mask >> 1) + 1])))
|
||||
{
|
||||
Byte b = p[4 - kMaskToBitNumber[prevMask]];
|
||||
if (!kMaskToAllowedStatus[prevMask] || Test86MSByte(b))
|
||||
{
|
||||
prevPosT = bufferPos;
|
||||
prevMask = ((prevMask << 1) & 0x7) | 1;
|
||||
bufferPos++;
|
||||
mask = (mask >> 1) | 4;
|
||||
pos++;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
prevPosT = bufferPos;
|
||||
|
||||
if (Test86MSByte(p[4]))
|
||||
{
|
||||
UInt32 src = ((UInt32)p[4] << 24) | ((UInt32)p[3] << 16) | ((UInt32)p[2] << 8) | ((UInt32)p[1]);
|
||||
UInt32 dest;
|
||||
for (;;)
|
||||
{
|
||||
Byte b;
|
||||
int index;
|
||||
UInt32 v = ((UInt32)p[4] << 24) | ((UInt32)p[3] << 16) | ((UInt32)p[2] << 8) | ((UInt32)p[1]);
|
||||
UInt32 cur = ip + (UInt32)pos;
|
||||
pos += 5;
|
||||
if (encoding)
|
||||
dest = (ip + (UInt32)bufferPos) + src;
|
||||
v += cur;
|
||||
else
|
||||
dest = src - (ip + (UInt32)bufferPos);
|
||||
if (prevMask == 0)
|
||||
break;
|
||||
index = kMaskToBitNumber[prevMask] * 8;
|
||||
b = (Byte)(dest >> (24 - index));
|
||||
if (!Test86MSByte(b))
|
||||
break;
|
||||
src = dest ^ ((1 << (32 - index)) - 1);
|
||||
v -= cur;
|
||||
if (mask != 0)
|
||||
{
|
||||
unsigned sh = (mask & 6) << 2;
|
||||
if (Test86MSByte((Byte)(v >> sh)))
|
||||
{
|
||||
v ^= (((UInt32)0x100 << sh) - 1);
|
||||
if (encoding)
|
||||
v += cur;
|
||||
else
|
||||
v -= cur;
|
||||
}
|
||||
p[4] = (Byte)(~(((dest >> 24) & 1) - 1));
|
||||
p[3] = (Byte)(dest >> 16);
|
||||
p[2] = (Byte)(dest >> 8);
|
||||
p[1] = (Byte)dest;
|
||||
bufferPos += 5;
|
||||
mask = 0;
|
||||
}
|
||||
p[1] = (Byte)v;
|
||||
p[2] = (Byte)(v >> 8);
|
||||
p[3] = (Byte)(v >> 16);
|
||||
p[4] = (Byte)(0 - ((v >> 24) & 1));
|
||||
}
|
||||
else
|
||||
{
|
||||
prevMask = ((prevMask << 1) & 0x7) | 1;
|
||||
bufferPos++;
|
||||
mask = (mask >> 1) | 4;
|
||||
pos++;
|
||||
}
|
||||
}
|
||||
prevPosT = bufferPos - prevPosT;
|
||||
*state = ((prevPosT > 3) ? 0 : ((prevMask << ((int)prevPosT - 1)) & 0x7));
|
||||
return bufferPos;
|
||||
}
|
||||
|
43
common/LZMA/SDK/C/Compiler.h
Normal file
43
common/LZMA/SDK/C/Compiler.h
Normal file
@ -0,0 +1,43 @@
|
||||
/* Compiler.h
|
||||
2021-01-05 : Igor Pavlov : Public domain */
|
||||
|
||||
#ifndef __7Z_COMPILER_H
|
||||
#define __7Z_COMPILER_H
|
||||
|
||||
#ifdef __clang__
|
||||
#pragma clang diagnostic ignored "-Wunused-private-field"
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
|
||||
#ifdef UNDER_CE
|
||||
#define RPC_NO_WINDOWS_H
|
||||
/* #pragma warning(disable : 4115) // '_RPC_ASYNC_STATE' : named type definition in parentheses */
|
||||
#pragma warning(disable : 4201) // nonstandard extension used : nameless struct/union
|
||||
#pragma warning(disable : 4214) // nonstandard extension used : bit field types other than int
|
||||
#endif
|
||||
|
||||
#if _MSC_VER >= 1300
|
||||
#pragma warning(disable : 4996) // This function or variable may be unsafe
|
||||
#else
|
||||
#pragma warning(disable : 4511) // copy constructor could not be generated
|
||||
#pragma warning(disable : 4512) // assignment operator could not be generated
|
||||
#pragma warning(disable : 4514) // unreferenced inline function has been removed
|
||||
#pragma warning(disable : 4702) // unreachable code
|
||||
#pragma warning(disable : 4710) // not inlined
|
||||
#pragma warning(disable : 4714) // function marked as __forceinline not inlined
|
||||
#pragma warning(disable : 4786) // identifier was truncated to '255' characters in the debug information
|
||||
#endif
|
||||
|
||||
#ifdef __clang__
|
||||
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
||||
#pragma clang diagnostic ignored "-Wmicrosoft-exception-spec"
|
||||
// #pragma clang diagnostic ignored "-Wreserved-id-macro"
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#define UNUSED_VAR(x) (void)x;
|
||||
/* #define UNUSED_VAR(x) x=x; */
|
||||
|
||||
#endif
|
478
common/LZMA/SDK/C/CpuArch.c
Normal file
478
common/LZMA/SDK/C/CpuArch.c
Normal file
@ -0,0 +1,478 @@
|
||||
/* CpuArch.c -- CPU specific code
|
||||
2021-07-13 : Igor Pavlov : Public domain */
|
||||
|
||||
#include "Precomp.h"
|
||||
|
||||
#include "CpuArch.h"
|
||||
|
||||
#ifdef MY_CPU_X86_OR_AMD64
|
||||
|
||||
#if (defined(_MSC_VER) && !defined(MY_CPU_AMD64)) || defined(__GNUC__)
|
||||
#define USE_ASM
|
||||
#endif
|
||||
|
||||
#if !defined(USE_ASM) && _MSC_VER >= 1500
|
||||
#include <intrin.h>
|
||||
#endif
|
||||
|
||||
#if defined(USE_ASM) && !defined(MY_CPU_AMD64)
|
||||
static UInt32 CheckFlag(UInt32 flag)
|
||||
{
|
||||
#ifdef _MSC_VER
|
||||
__asm pushfd;
|
||||
__asm pop EAX;
|
||||
__asm mov EDX, EAX;
|
||||
__asm xor EAX, flag;
|
||||
__asm push EAX;
|
||||
__asm popfd;
|
||||
__asm pushfd;
|
||||
__asm pop EAX;
|
||||
__asm xor EAX, EDX;
|
||||
__asm push EDX;
|
||||
__asm popfd;
|
||||
__asm and flag, EAX;
|
||||
#else
|
||||
__asm__ __volatile__ (
|
||||
"pushf\n\t"
|
||||
"pop %%EAX\n\t"
|
||||
"movl %%EAX,%%EDX\n\t"
|
||||
"xorl %0,%%EAX\n\t"
|
||||
"push %%EAX\n\t"
|
||||
"popf\n\t"
|
||||
"pushf\n\t"
|
||||
"pop %%EAX\n\t"
|
||||
"xorl %%EDX,%%EAX\n\t"
|
||||
"push %%EDX\n\t"
|
||||
"popf\n\t"
|
||||
"andl %%EAX, %0\n\t":
|
||||
"=c" (flag) : "c" (flag) :
|
||||
"%eax", "%edx");
|
||||
#endif
|
||||
return flag;
|
||||
}
|
||||
#define CHECK_CPUID_IS_SUPPORTED if (CheckFlag(1 << 18) == 0 || CheckFlag(1 << 21) == 0) return False;
|
||||
#else
|
||||
#define CHECK_CPUID_IS_SUPPORTED
|
||||
#endif
|
||||
|
||||
#ifndef USE_ASM
|
||||
#ifdef _MSC_VER
|
||||
#if _MSC_VER >= 1600
|
||||
#define MY__cpuidex __cpuidex
|
||||
#else
|
||||
|
||||
/*
|
||||
__cpuid (function == 4) requires subfunction number in ECX.
|
||||
MSDN: The __cpuid intrinsic clears the ECX register before calling the cpuid instruction.
|
||||
__cpuid() in new MSVC clears ECX.
|
||||
__cpuid() in old MSVC (14.00) doesn't clear ECX
|
||||
We still can use __cpuid for low (function) values that don't require ECX,
|
||||
but __cpuid() in old MSVC will be incorrect for some function values: (function == 4).
|
||||
So here we use the hack for old MSVC to send (subFunction) in ECX register to cpuid instruction,
|
||||
where ECX value is first parameter for FAST_CALL / NO_INLINE function,
|
||||
So the caller of MY__cpuidex_HACK() sets ECX as subFunction, and
|
||||
old MSVC for __cpuid() doesn't change ECX and cpuid instruction gets (subFunction) value.
|
||||
|
||||
DON'T remove MY_NO_INLINE and MY_FAST_CALL for MY__cpuidex_HACK() !!!
|
||||
*/
|
||||
|
||||
static
|
||||
MY_NO_INLINE
|
||||
void MY_FAST_CALL MY__cpuidex_HACK(UInt32 subFunction, int *CPUInfo, UInt32 function)
|
||||
{
|
||||
UNUSED_VAR(subFunction);
|
||||
__cpuid(CPUInfo, function);
|
||||
}
|
||||
|
||||
#define MY__cpuidex(info, func, func2) MY__cpuidex_HACK(func2, info, func)
|
||||
#pragma message("======== MY__cpuidex_HACK WAS USED ========")
|
||||
#endif
|
||||
#else
|
||||
#define MY__cpuidex(info, func, func2) __cpuid(info, func)
|
||||
#pragma message("======== (INCORRECT ?) cpuid WAS USED ========")
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
|
||||
void MyCPUID(UInt32 function, UInt32 *a, UInt32 *b, UInt32 *c, UInt32 *d)
|
||||
{
|
||||
#ifdef USE_ASM
|
||||
|
||||
#ifdef _MSC_VER
|
||||
|
||||
UInt32 a2, b2, c2, d2;
|
||||
__asm xor EBX, EBX;
|
||||
__asm xor ECX, ECX;
|
||||
__asm xor EDX, EDX;
|
||||
__asm mov EAX, function;
|
||||
__asm cpuid;
|
||||
__asm mov a2, EAX;
|
||||
__asm mov b2, EBX;
|
||||
__asm mov c2, ECX;
|
||||
__asm mov d2, EDX;
|
||||
|
||||
*a = a2;
|
||||
*b = b2;
|
||||
*c = c2;
|
||||
*d = d2;
|
||||
|
||||
#else
|
||||
|
||||
__asm__ __volatile__ (
|
||||
#if defined(MY_CPU_AMD64) && defined(__PIC__)
|
||||
"mov %%rbx, %%rdi;"
|
||||
"cpuid;"
|
||||
"xchg %%rbx, %%rdi;"
|
||||
: "=a" (*a) ,
|
||||
"=D" (*b) ,
|
||||
#elif defined(MY_CPU_X86) && defined(__PIC__)
|
||||
"mov %%ebx, %%edi;"
|
||||
"cpuid;"
|
||||
"xchgl %%ebx, %%edi;"
|
||||
: "=a" (*a) ,
|
||||
"=D" (*b) ,
|
||||
#else
|
||||
"cpuid"
|
||||
: "=a" (*a) ,
|
||||
"=b" (*b) ,
|
||||
#endif
|
||||
"=c" (*c) ,
|
||||
"=d" (*d)
|
||||
: "0" (function), "c"(0) ) ;
|
||||
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
int CPUInfo[4];
|
||||
|
||||
MY__cpuidex(CPUInfo, (int)function, 0);
|
||||
|
||||
*a = (UInt32)CPUInfo[0];
|
||||
*b = (UInt32)CPUInfo[1];
|
||||
*c = (UInt32)CPUInfo[2];
|
||||
*d = (UInt32)CPUInfo[3];
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
BoolInt x86cpuid_CheckAndRead(Cx86cpuid *p)
|
||||
{
|
||||
CHECK_CPUID_IS_SUPPORTED
|
||||
MyCPUID(0, &p->maxFunc, &p->vendor[0], &p->vendor[2], &p->vendor[1]);
|
||||
MyCPUID(1, &p->ver, &p->b, &p->c, &p->d);
|
||||
return True;
|
||||
}
|
||||
|
||||
static const UInt32 kVendors[][3] =
|
||||
{
|
||||
{ 0x756E6547, 0x49656E69, 0x6C65746E},
|
||||
{ 0x68747541, 0x69746E65, 0x444D4163},
|
||||
{ 0x746E6543, 0x48727561, 0x736C7561}
|
||||
};
|
||||
|
||||
int x86cpuid_GetFirm(const Cx86cpuid *p)
|
||||
{
|
||||
unsigned i;
|
||||
for (i = 0; i < sizeof(kVendors) / sizeof(kVendors[i]); i++)
|
||||
{
|
||||
const UInt32 *v = kVendors[i];
|
||||
if (v[0] == p->vendor[0] &&
|
||||
v[1] == p->vendor[1] &&
|
||||
v[2] == p->vendor[2])
|
||||
return (int)i;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
BoolInt CPU_Is_InOrder()
|
||||
{
|
||||
Cx86cpuid p;
|
||||
int firm;
|
||||
UInt32 family, model;
|
||||
if (!x86cpuid_CheckAndRead(&p))
|
||||
return True;
|
||||
|
||||
family = x86cpuid_GetFamily(p.ver);
|
||||
model = x86cpuid_GetModel(p.ver);
|
||||
|
||||
firm = x86cpuid_GetFirm(&p);
|
||||
|
||||
switch (firm)
|
||||
{
|
||||
case CPU_FIRM_INTEL: return (family < 6 || (family == 6 && (
|
||||
/* In-Order Atom CPU */
|
||||
model == 0x1C /* 45 nm, N4xx, D4xx, N5xx, D5xx, 230, 330 */
|
||||
|| model == 0x26 /* 45 nm, Z6xx */
|
||||
|| model == 0x27 /* 32 nm, Z2460 */
|
||||
|| model == 0x35 /* 32 nm, Z2760 */
|
||||
|| model == 0x36 /* 32 nm, N2xxx, D2xxx */
|
||||
)));
|
||||
case CPU_FIRM_AMD: return (family < 5 || (family == 5 && (model < 6 || model == 0xA)));
|
||||
case CPU_FIRM_VIA: return (family < 6 || (family == 6 && model < 0xF));
|
||||
}
|
||||
return True;
|
||||
}
|
||||
|
||||
#if !defined(MY_CPU_AMD64) && defined(_WIN32)
|
||||
#include <Windows.h>
|
||||
static BoolInt CPU_Sys_Is_SSE_Supported()
|
||||
{
|
||||
OSVERSIONINFO vi;
|
||||
vi.dwOSVersionInfoSize = sizeof(vi);
|
||||
if (!GetVersionEx(&vi))
|
||||
return False;
|
||||
return (vi.dwMajorVersion >= 5);
|
||||
}
|
||||
#define CHECK_SYS_SSE_SUPPORT if (!CPU_Sys_Is_SSE_Supported()) return False;
|
||||
#else
|
||||
#define CHECK_SYS_SSE_SUPPORT
|
||||
#endif
|
||||
|
||||
|
||||
static UInt32 X86_CPUID_ECX_Get_Flags()
|
||||
{
|
||||
Cx86cpuid p;
|
||||
CHECK_SYS_SSE_SUPPORT
|
||||
if (!x86cpuid_CheckAndRead(&p))
|
||||
return 0;
|
||||
return p.c;
|
||||
}
|
||||
|
||||
BoolInt CPU_IsSupported_AES()
|
||||
{
|
||||
return (X86_CPUID_ECX_Get_Flags() >> 25) & 1;
|
||||
}
|
||||
|
||||
BoolInt CPU_IsSupported_SSSE3()
|
||||
{
|
||||
return (X86_CPUID_ECX_Get_Flags() >> 9) & 1;
|
||||
}
|
||||
|
||||
BoolInt CPU_IsSupported_SSE41()
|
||||
{
|
||||
return (X86_CPUID_ECX_Get_Flags() >> 19) & 1;
|
||||
}
|
||||
|
||||
BoolInt CPU_IsSupported_SHA()
|
||||
{
|
||||
Cx86cpuid p;
|
||||
CHECK_SYS_SSE_SUPPORT
|
||||
if (!x86cpuid_CheckAndRead(&p))
|
||||
return False;
|
||||
|
||||
if (p.maxFunc < 7)
|
||||
return False;
|
||||
{
|
||||
UInt32 d[4] = { 0 };
|
||||
MyCPUID(7, &d[0], &d[1], &d[2], &d[3]);
|
||||
return (d[1] >> 29) & 1;
|
||||
}
|
||||
}
|
||||
|
||||
// #include <stdio.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <Windows.h>
|
||||
#endif
|
||||
|
||||
BoolInt CPU_IsSupported_AVX2()
|
||||
{
|
||||
Cx86cpuid p;
|
||||
CHECK_SYS_SSE_SUPPORT
|
||||
|
||||
#ifdef _WIN32
|
||||
#define MY__PF_XSAVE_ENABLED 17
|
||||
if (!IsProcessorFeaturePresent(MY__PF_XSAVE_ENABLED))
|
||||
return False;
|
||||
#endif
|
||||
|
||||
if (!x86cpuid_CheckAndRead(&p))
|
||||
return False;
|
||||
if (p.maxFunc < 7)
|
||||
return False;
|
||||
{
|
||||
UInt32 d[4] = { 0 };
|
||||
MyCPUID(7, &d[0], &d[1], &d[2], &d[3]);
|
||||
// printf("\ncpuid(7): ebx=%8x ecx=%8x\n", d[1], d[2]);
|
||||
return 1
|
||||
& (d[1] >> 5); // avx2
|
||||
}
|
||||
}
|
||||
|
||||
BoolInt CPU_IsSupported_VAES_AVX2()
|
||||
{
|
||||
Cx86cpuid p;
|
||||
CHECK_SYS_SSE_SUPPORT
|
||||
|
||||
#ifdef _WIN32
|
||||
#define MY__PF_XSAVE_ENABLED 17
|
||||
if (!IsProcessorFeaturePresent(MY__PF_XSAVE_ENABLED))
|
||||
return False;
|
||||
#endif
|
||||
|
||||
if (!x86cpuid_CheckAndRead(&p))
|
||||
return False;
|
||||
if (p.maxFunc < 7)
|
||||
return False;
|
||||
{
|
||||
UInt32 d[4] = { 0 };
|
||||
MyCPUID(7, &d[0], &d[1], &d[2], &d[3]);
|
||||
// printf("\ncpuid(7): ebx=%8x ecx=%8x\n", d[1], d[2]);
|
||||
return 1
|
||||
& (d[1] >> 5) // avx2
|
||||
// & (d[1] >> 31) // avx512vl
|
||||
& (d[2] >> 9); // vaes // VEX-256/EVEX
|
||||
}
|
||||
}
|
||||
|
||||
BoolInt CPU_IsSupported_PageGB()
|
||||
{
|
||||
Cx86cpuid cpuid;
|
||||
if (!x86cpuid_CheckAndRead(&cpuid))
|
||||
return False;
|
||||
{
|
||||
UInt32 d[4] = { 0 };
|
||||
MyCPUID(0x80000000, &d[0], &d[1], &d[2], &d[3]);
|
||||
if (d[0] < 0x80000001)
|
||||
return False;
|
||||
}
|
||||
{
|
||||
UInt32 d[4] = { 0 };
|
||||
MyCPUID(0x80000001, &d[0], &d[1], &d[2], &d[3]);
|
||||
return (d[3] >> 26) & 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#elif defined(MY_CPU_ARM_OR_ARM64)
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
#include <Windows.h>
|
||||
|
||||
BoolInt CPU_IsSupported_CRC32() { return IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE) ? 1 : 0; }
|
||||
BoolInt CPU_IsSupported_CRYPTO() { return IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE) ? 1 : 0; }
|
||||
BoolInt CPU_IsSupported_NEON() { return IsProcessorFeaturePresent(PF_ARM_NEON_INSTRUCTIONS_AVAILABLE) ? 1 : 0; }
|
||||
|
||||
#else
|
||||
|
||||
#if defined(__APPLE__)
|
||||
|
||||
/*
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
static void Print_sysctlbyname(const char *name)
|
||||
{
|
||||
size_t bufSize = 256;
|
||||
char buf[256];
|
||||
int res = sysctlbyname(name, &buf, &bufSize, NULL, 0);
|
||||
{
|
||||
int i;
|
||||
printf("\nres = %d : %s : '%s' : bufSize = %d, numeric", res, name, buf, (unsigned)bufSize);
|
||||
for (i = 0; i < 20; i++)
|
||||
printf(" %2x", (unsigned)(Byte)buf[i]);
|
||||
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
static BoolInt My_sysctlbyname_Get_BoolInt(const char *name)
|
||||
{
|
||||
UInt32 val = 0;
|
||||
if (My_sysctlbyname_Get_UInt32(name, &val) == 0 && val == 1)
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
Print_sysctlbyname("hw.pagesize");
|
||||
Print_sysctlbyname("machdep.cpu.brand_string");
|
||||
*/
|
||||
|
||||
BoolInt CPU_IsSupported_CRC32(void)
|
||||
{
|
||||
return My_sysctlbyname_Get_BoolInt("hw.optional.armv8_crc32");
|
||||
}
|
||||
|
||||
BoolInt CPU_IsSupported_NEON(void)
|
||||
{
|
||||
return My_sysctlbyname_Get_BoolInt("hw.optional.neon");
|
||||
}
|
||||
|
||||
#ifdef MY_CPU_ARM64
|
||||
#define APPLE_CRYPTO_SUPPORT_VAL 1
|
||||
#else
|
||||
#define APPLE_CRYPTO_SUPPORT_VAL 0
|
||||
#endif
|
||||
|
||||
BoolInt CPU_IsSupported_SHA1(void) { return APPLE_CRYPTO_SUPPORT_VAL; }
|
||||
BoolInt CPU_IsSupported_SHA2(void) { return APPLE_CRYPTO_SUPPORT_VAL; }
|
||||
BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYPTO_SUPPORT_VAL; }
|
||||
|
||||
|
||||
#else // __APPLE__
|
||||
|
||||
#include <sys/auxv.h>
|
||||
|
||||
#define USE_HWCAP
|
||||
|
||||
#ifdef USE_HWCAP
|
||||
|
||||
#include <asm/hwcap.h>
|
||||
|
||||
#define MY_HWCAP_CHECK_FUNC_2(name1, name2) \
|
||||
BoolInt CPU_IsSupported_ ## name1() { return (getauxval(AT_HWCAP) & (HWCAP_ ## name2)) ? 1 : 0; }
|
||||
|
||||
#ifdef MY_CPU_ARM64
|
||||
#define MY_HWCAP_CHECK_FUNC(name) \
|
||||
MY_HWCAP_CHECK_FUNC_2(name, name)
|
||||
MY_HWCAP_CHECK_FUNC_2(NEON, ASIMD)
|
||||
// MY_HWCAP_CHECK_FUNC (ASIMD)
|
||||
#elif defined(MY_CPU_ARM)
|
||||
#define MY_HWCAP_CHECK_FUNC(name) \
|
||||
BoolInt CPU_IsSupported_ ## name() { return (getauxval(AT_HWCAP2) & (HWCAP2_ ## name)) ? 1 : 0; }
|
||||
MY_HWCAP_CHECK_FUNC_2(NEON, NEON)
|
||||
#endif
|
||||
|
||||
#else // USE_HWCAP
|
||||
|
||||
#define MY_HWCAP_CHECK_FUNC(name) \
|
||||
BoolInt CPU_IsSupported_ ## name() { return 0; }
|
||||
MY_HWCAP_CHECK_FUNC(NEON)
|
||||
|
||||
#endif // USE_HWCAP
|
||||
|
||||
MY_HWCAP_CHECK_FUNC (CRC32)
|
||||
MY_HWCAP_CHECK_FUNC (SHA1)
|
||||
MY_HWCAP_CHECK_FUNC (SHA2)
|
||||
MY_HWCAP_CHECK_FUNC (AES)
|
||||
|
||||
#endif // __APPLE__
|
||||
#endif // _WIN32
|
||||
|
||||
#endif // MY_CPU_ARM_OR_ARM64
|
||||
|
||||
|
||||
|
||||
#ifdef __APPLE__
|
||||
|
||||
#include <sys/sysctl.h>
|
||||
|
||||
int My_sysctlbyname_Get(const char *name, void *buf, size_t *bufSize)
|
||||
{
|
||||
return sysctlbyname(name, buf, bufSize, NULL, 0);
|
||||
}
|
||||
|
||||
int My_sysctlbyname_Get_UInt32(const char *name, UInt32 *val)
|
||||
{
|
||||
size_t bufSize = sizeof(*val);
|
||||
int res = My_sysctlbyname_Get(name, val, &bufSize);
|
||||
if (res == 0 && bufSize != sizeof(*val))
|
||||
return EFAULT;
|
||||
return res;
|
||||
}
|
||||
|
||||
#endif
|
@ -1,77 +1,290 @@
|
||||
/* CpuArch.h -- CPU specific code
|
||||
2010-10-26: Igor Pavlov : Public domain */
|
||||
2022-07-15 : Igor Pavlov : Public domain */
|
||||
|
||||
#ifndef __CPU_ARCH_H
|
||||
#define __CPU_ARCH_H
|
||||
|
||||
#include "Types.h"
|
||||
#include "7zTypes.h"
|
||||
|
||||
EXTERN_C_BEGIN
|
||||
|
||||
/*
|
||||
MY_CPU_LE means that CPU is LITTLE ENDIAN.
|
||||
If MY_CPU_LE is not defined, we don't know about that property of platform (it can be LITTLE ENDIAN).
|
||||
MY_CPU_BE means that CPU is BIG ENDIAN.
|
||||
If MY_CPU_LE and MY_CPU_BE are not defined, we don't know about ENDIANNESS of platform.
|
||||
|
||||
MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and CPU supports unaligned memory accesses.
|
||||
If MY_CPU_LE_UNALIGN is not defined, we don't know about these properties of platform.
|
||||
|
||||
MY_CPU_64BIT means that processor can work with 64-bit registers.
|
||||
MY_CPU_64BIT can be used to select fast code branch
|
||||
MY_CPU_64BIT doesn't mean that (sizeof(void *) == 8)
|
||||
*/
|
||||
|
||||
#if defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__)
|
||||
#define MY_CPU_AMD64
|
||||
#if defined(_M_X64) \
|
||||
|| defined(_M_AMD64) \
|
||||
|| defined(__x86_64__) \
|
||||
|| defined(__AMD64__) \
|
||||
|| defined(__amd64__)
|
||||
#define MY_CPU_AMD64
|
||||
#ifdef __ILP32__
|
||||
#define MY_CPU_NAME "x32"
|
||||
#define MY_CPU_SIZEOF_POINTER 4
|
||||
#else
|
||||
#define MY_CPU_NAME "x64"
|
||||
#define MY_CPU_SIZEOF_POINTER 8
|
||||
#endif
|
||||
#define MY_CPU_64BIT
|
||||
#endif
|
||||
|
||||
#if defined(MY_CPU_AMD64) || defined(_M_IA64)
|
||||
#define MY_CPU_64BIT
|
||||
|
||||
#if defined(_M_IX86) \
|
||||
|| defined(__i386__)
|
||||
#define MY_CPU_X86
|
||||
#define MY_CPU_NAME "x86"
|
||||
/* #define MY_CPU_32BIT */
|
||||
#define MY_CPU_SIZEOF_POINTER 4
|
||||
#endif
|
||||
|
||||
#if defined(_M_IX86) || defined(__i386__)
|
||||
#define MY_CPU_X86
|
||||
|
||||
#if defined(_M_ARM64) \
|
||||
|| defined(__AARCH64EL__) \
|
||||
|| defined(__AARCH64EB__) \
|
||||
|| defined(__aarch64__)
|
||||
#define MY_CPU_ARM64
|
||||
#define MY_CPU_NAME "arm64"
|
||||
#define MY_CPU_64BIT
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(_M_ARM) \
|
||||
|| defined(_M_ARM_NT) \
|
||||
|| defined(_M_ARMT) \
|
||||
|| defined(__arm__) \
|
||||
|| defined(__thumb__) \
|
||||
|| defined(__ARMEL__) \
|
||||
|| defined(__ARMEB__) \
|
||||
|| defined(__THUMBEL__) \
|
||||
|| defined(__THUMBEB__)
|
||||
#define MY_CPU_ARM
|
||||
|
||||
#if defined(__thumb__) || defined(__THUMBEL__) || defined(_M_ARMT)
|
||||
#define MY_CPU_NAME "armt"
|
||||
#else
|
||||
#define MY_CPU_NAME "arm"
|
||||
#endif
|
||||
/* #define MY_CPU_32BIT */
|
||||
#define MY_CPU_SIZEOF_POINTER 4
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(_M_IA64) \
|
||||
|| defined(__ia64__)
|
||||
#define MY_CPU_IA64
|
||||
#define MY_CPU_NAME "ia64"
|
||||
#define MY_CPU_64BIT
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(__mips64) \
|
||||
|| defined(__mips64__) \
|
||||
|| (defined(__mips) && (__mips == 64 || __mips == 4 || __mips == 3))
|
||||
#define MY_CPU_NAME "mips64"
|
||||
#define MY_CPU_64BIT
|
||||
#elif defined(__mips__)
|
||||
#define MY_CPU_NAME "mips"
|
||||
/* #define MY_CPU_32BIT */
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(__ppc64__) \
|
||||
|| defined(__powerpc64__) \
|
||||
|| defined(__ppc__) \
|
||||
|| defined(__powerpc__) \
|
||||
|| defined(__PPC__) \
|
||||
|| defined(_POWER)
|
||||
|
||||
#if defined(__ppc64__) \
|
||||
|| defined(__powerpc64__) \
|
||||
|| defined(_LP64) \
|
||||
|| defined(__64BIT__)
|
||||
#ifdef __ILP32__
|
||||
#define MY_CPU_NAME "ppc64-32"
|
||||
#define MY_CPU_SIZEOF_POINTER 4
|
||||
#else
|
||||
#define MY_CPU_NAME "ppc64"
|
||||
#define MY_CPU_SIZEOF_POINTER 8
|
||||
#endif
|
||||
#define MY_CPU_64BIT
|
||||
#else
|
||||
#define MY_CPU_NAME "ppc"
|
||||
#define MY_CPU_SIZEOF_POINTER 4
|
||||
/* #define MY_CPU_32BIT */
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(__riscv) \
|
||||
|| defined(__riscv__)
|
||||
#if __riscv_xlen == 32
|
||||
#define MY_CPU_NAME "riscv32"
|
||||
#elif __riscv_xlen == 64
|
||||
#define MY_CPU_NAME "riscv64"
|
||||
#else
|
||||
#define MY_CPU_NAME "riscv"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(MY_CPU_X86) || defined(MY_CPU_AMD64)
|
||||
#define MY_CPU_X86_OR_AMD64
|
||||
#endif
|
||||
|
||||
#if defined(MY_CPU_X86) || defined(_M_ARM)
|
||||
#define MY_CPU_32BIT
|
||||
#if defined(MY_CPU_ARM) || defined(MY_CPU_ARM64)
|
||||
#define MY_CPU_ARM_OR_ARM64
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32) && defined(_M_ARM)
|
||||
#define MY_CPU_ARM_LE
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
#ifdef MY_CPU_ARM
|
||||
#define MY_CPU_ARM_LE
|
||||
#endif
|
||||
|
||||
#ifdef MY_CPU_ARM64
|
||||
#define MY_CPU_ARM64_LE
|
||||
#endif
|
||||
|
||||
#ifdef _M_IA64
|
||||
#define MY_CPU_IA64_LE
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32) && defined(_M_IA64)
|
||||
#define MY_CPU_IA64_LE
|
||||
|
||||
#if defined(MY_CPU_X86_OR_AMD64) \
|
||||
|| defined(MY_CPU_ARM_LE) \
|
||||
|| defined(MY_CPU_ARM64_LE) \
|
||||
|| defined(MY_CPU_IA64_LE) \
|
||||
|| defined(__LITTLE_ENDIAN__) \
|
||||
|| defined(__ARMEL__) \
|
||||
|| defined(__THUMBEL__) \
|
||||
|| defined(__AARCH64EL__) \
|
||||
|| defined(__MIPSEL__) \
|
||||
|| defined(__MIPSEL) \
|
||||
|| defined(_MIPSEL) \
|
||||
|| defined(__BFIN__) \
|
||||
|| (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
|
||||
#define MY_CPU_LE
|
||||
#endif
|
||||
|
||||
#if defined(MY_CPU_X86_OR_AMD64)
|
||||
#define MY_CPU_LE_UNALIGN
|
||||
#if defined(__BIG_ENDIAN__) \
|
||||
|| defined(__ARMEB__) \
|
||||
|| defined(__THUMBEB__) \
|
||||
|| defined(__AARCH64EB__) \
|
||||
|| defined(__MIPSEB__) \
|
||||
|| defined(__MIPSEB) \
|
||||
|| defined(_MIPSEB) \
|
||||
|| defined(__m68k__) \
|
||||
|| defined(__s390__) \
|
||||
|| defined(__s390x__) \
|
||||
|| defined(__zarch__) \
|
||||
|| (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
|
||||
#define MY_CPU_BE
|
||||
#endif
|
||||
|
||||
#if defined(MY_CPU_X86_OR_AMD64) || defined(MY_CPU_ARM_LE) || defined(MY_CPU_IA64_LE) || defined(__ARMEL__) || defined(__MIPSEL__) || defined(__LITTLE_ENDIAN__)
|
||||
#define MY_CPU_LE
|
||||
#endif
|
||||
|
||||
#if defined(__BIG_ENDIAN__)
|
||||
#define MY_CPU_BE
|
||||
#endif
|
||||
|
||||
#if defined(MY_CPU_LE) && defined(MY_CPU_BE)
|
||||
Stop_Compiling_Bad_Endian
|
||||
#error Stop_Compiling_Bad_Endian
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(MY_CPU_32BIT) && defined(MY_CPU_64BIT)
|
||||
#error Stop_Compiling_Bad_32_64_BIT
|
||||
#endif
|
||||
|
||||
#ifdef __SIZEOF_POINTER__
|
||||
#ifdef MY_CPU_SIZEOF_POINTER
|
||||
#if MY_CPU_SIZEOF_POINTER != __SIZEOF_POINTER__
|
||||
#error Stop_Compiling_Bad_MY_CPU_PTR_SIZE
|
||||
#endif
|
||||
#else
|
||||
#define MY_CPU_SIZEOF_POINTER __SIZEOF_POINTER__
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(MY_CPU_SIZEOF_POINTER) && (MY_CPU_SIZEOF_POINTER == 4)
|
||||
#if defined (_LP64)
|
||||
#error Stop_Compiling_Bad_MY_CPU_PTR_SIZE
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#if _MSC_VER >= 1300
|
||||
#define MY_CPU_pragma_pack_push_1 __pragma(pack(push, 1))
|
||||
#define MY_CPU_pragma_pop __pragma(pack(pop))
|
||||
#else
|
||||
#define MY_CPU_pragma_pack_push_1
|
||||
#define MY_CPU_pragma_pop
|
||||
#endif
|
||||
#else
|
||||
#ifdef __xlC__
|
||||
#define MY_CPU_pragma_pack_push_1 _Pragma("pack(1)")
|
||||
#define MY_CPU_pragma_pop _Pragma("pack()")
|
||||
#else
|
||||
#define MY_CPU_pragma_pack_push_1 _Pragma("pack(push, 1)")
|
||||
#define MY_CPU_pragma_pop _Pragma("pack(pop)")
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef MY_CPU_NAME
|
||||
#ifdef MY_CPU_LE
|
||||
#define MY_CPU_NAME "LE"
|
||||
#elif defined(MY_CPU_BE)
|
||||
#define MY_CPU_NAME "BE"
|
||||
#else
|
||||
/*
|
||||
#define MY_CPU_NAME ""
|
||||
*/
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#ifdef MY_CPU_LE
|
||||
#if defined(MY_CPU_X86_OR_AMD64) \
|
||||
|| defined(MY_CPU_ARM64)
|
||||
#define MY_CPU_LE_UNALIGN
|
||||
#define MY_CPU_LE_UNALIGN_64
|
||||
#elif defined(__ARM_FEATURE_UNALIGNED)
|
||||
/* gcc9 for 32-bit arm can use LDRD instruction that requires 32-bit alignment.
|
||||
So we can't use unaligned 64-bit operations. */
|
||||
#define MY_CPU_LE_UNALIGN
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef MY_CPU_LE_UNALIGN
|
||||
|
||||
#define GetUi16(p) (*(const UInt16 *)(p))
|
||||
#define GetUi32(p) (*(const UInt32 *)(p))
|
||||
#define GetUi64(p) (*(const UInt64 *)(p))
|
||||
#define SetUi16(p, d) *(UInt16 *)(p) = (d);
|
||||
#define SetUi32(p, d) *(UInt32 *)(p) = (d);
|
||||
#define SetUi64(p, d) *(UInt64 *)(p) = (d);
|
||||
#define GetUi16(p) (*(const UInt16 *)(const void *)(p))
|
||||
#define GetUi32(p) (*(const UInt32 *)(const void *)(p))
|
||||
#ifdef MY_CPU_LE_UNALIGN_64
|
||||
#define GetUi64(p) (*(const UInt64 *)(const void *)(p))
|
||||
#endif
|
||||
|
||||
#define SetUi16(p, v) { *(UInt16 *)(void *)(p) = (v); }
|
||||
#define SetUi32(p, v) { *(UInt32 *)(void *)(p) = (v); }
|
||||
#ifdef MY_CPU_LE_UNALIGN_64
|
||||
#define SetUi64(p, v) { *(UInt64 *)(void *)(p) = (v); }
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
#define GetUi16(p) (((const Byte *)(p))[0] | ((UInt16)((const Byte *)(p))[1] << 8))
|
||||
#define GetUi16(p) ( (UInt16) ( \
|
||||
((const Byte *)(p))[0] | \
|
||||
((UInt16)((const Byte *)(p))[1] << 8) ))
|
||||
|
||||
#define GetUi32(p) ( \
|
||||
((const Byte *)(p))[0] | \
|
||||
@ -79,30 +292,63 @@ Stop_Compiling_Bad_Endian
|
||||
((UInt32)((const Byte *)(p))[2] << 16) | \
|
||||
((UInt32)((const Byte *)(p))[3] << 24))
|
||||
|
||||
#define GetUi64(p) (GetUi32(p) | ((UInt64)GetUi32(((const Byte *)(p)) + 4) << 32))
|
||||
#define SetUi16(p, v) { Byte *_ppp_ = (Byte *)(p); UInt32 _vvv_ = (v); \
|
||||
_ppp_[0] = (Byte)_vvv_; \
|
||||
_ppp_[1] = (Byte)(_vvv_ >> 8); }
|
||||
|
||||
#define SetUi16(p, d) { UInt32 _x_ = (d); \
|
||||
((Byte *)(p))[0] = (Byte)_x_; \
|
||||
((Byte *)(p))[1] = (Byte)(_x_ >> 8); }
|
||||
|
||||
#define SetUi32(p, d) { UInt32 _x_ = (d); \
|
||||
((Byte *)(p))[0] = (Byte)_x_; \
|
||||
((Byte *)(p))[1] = (Byte)(_x_ >> 8); \
|
||||
((Byte *)(p))[2] = (Byte)(_x_ >> 16); \
|
||||
((Byte *)(p))[3] = (Byte)(_x_ >> 24); }
|
||||
|
||||
#define SetUi64(p, d) { UInt64 _x64_ = (d); \
|
||||
SetUi32(p, (UInt32)_x64_); \
|
||||
SetUi32(((Byte *)(p)) + 4, (UInt32)(_x64_ >> 32)); }
|
||||
#define SetUi32(p, v) { Byte *_ppp_ = (Byte *)(p); UInt32 _vvv_ = (v); \
|
||||
_ppp_[0] = (Byte)_vvv_; \
|
||||
_ppp_[1] = (Byte)(_vvv_ >> 8); \
|
||||
_ppp_[2] = (Byte)(_vvv_ >> 16); \
|
||||
_ppp_[3] = (Byte)(_vvv_ >> 24); }
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(MY_CPU_LE_UNALIGN) && defined(_WIN64) && (_MSC_VER >= 1300)
|
||||
|
||||
#ifndef MY_CPU_LE_UNALIGN_64
|
||||
|
||||
#define GetUi64(p) (GetUi32(p) | ((UInt64)GetUi32(((const Byte *)(p)) + 4) << 32))
|
||||
|
||||
#define SetUi64(p, v) { Byte *_ppp2_ = (Byte *)(p); UInt64 _vvv2_ = (v); \
|
||||
SetUi32(_ppp2_ , (UInt32)_vvv2_); \
|
||||
SetUi32(_ppp2_ + 4, (UInt32)(_vvv2_ >> 32)); }
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
|
||||
#ifdef __has_builtin
|
||||
#define MY__has_builtin(x) __has_builtin(x)
|
||||
#else
|
||||
#define MY__has_builtin(x) 0
|
||||
#endif
|
||||
|
||||
#if defined(MY_CPU_LE_UNALIGN) && /* defined(_WIN64) && */ defined(_MSC_VER) && (_MSC_VER >= 1300)
|
||||
|
||||
/* Note: we use bswap instruction, that is unsupported in 386 cpu */
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#pragma intrinsic(_byteswap_ushort)
|
||||
#pragma intrinsic(_byteswap_ulong)
|
||||
#pragma intrinsic(_byteswap_uint64)
|
||||
#define GetBe32(p) _byteswap_ulong(*(const UInt32 *)(const Byte *)(p))
|
||||
#define GetBe64(p) _byteswap_uint64(*(const UInt64 *)(const Byte *)(p))
|
||||
|
||||
/* #define GetBe16(p) _byteswap_ushort(*(const UInt16 *)(const Byte *)(p)) */
|
||||
#define GetBe32(p) _byteswap_ulong (*(const UInt32 *)(const void *)(p))
|
||||
#define GetBe64(p) _byteswap_uint64(*(const UInt64 *)(const void *)(p))
|
||||
|
||||
#define SetBe32(p, v) (*(UInt32 *)(void *)(p)) = _byteswap_ulong(v)
|
||||
|
||||
#elif defined(MY_CPU_LE_UNALIGN) && ( \
|
||||
(defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) \
|
||||
|| (defined(__clang__) && MY__has_builtin(__builtin_bswap16)) )
|
||||
|
||||
/* #define GetBe16(p) __builtin_bswap16(*(const UInt16 *)(const void *)(p)) */
|
||||
#define GetBe32(p) __builtin_bswap32(*(const UInt32 *)(const void *)(p))
|
||||
#define GetBe64(p) __builtin_bswap64(*(const UInt64 *)(const void *)(p))
|
||||
|
||||
#define SetBe32(p, v) (*(UInt32 *)(void *)(p)) = __builtin_bswap32(v)
|
||||
|
||||
#else
|
||||
|
||||
@ -114,9 +360,23 @@ Stop_Compiling_Bad_Endian
|
||||
|
||||
#define GetBe64(p) (((UInt64)GetBe32(p) << 32) | GetBe32(((const Byte *)(p)) + 4))
|
||||
|
||||
#define SetBe32(p, v) { Byte *_ppp_ = (Byte *)(p); UInt32 _vvv_ = (v); \
|
||||
_ppp_[0] = (Byte)(_vvv_ >> 24); \
|
||||
_ppp_[1] = (Byte)(_vvv_ >> 16); \
|
||||
_ppp_[2] = (Byte)(_vvv_ >> 8); \
|
||||
_ppp_[3] = (Byte)_vvv_; }
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef GetBe16
|
||||
|
||||
#define GetBe16(p) ( (UInt16) ( \
|
||||
((UInt16)((const Byte *)(p))[0] << 8) | \
|
||||
((const Byte *)(p))[1] ))
|
||||
|
||||
#endif
|
||||
|
||||
#define GetBe16(p) (((UInt16)((const Byte *)(p))[0] << 8) | ((const Byte *)(p))[1])
|
||||
|
||||
|
||||
#ifdef MY_CPU_X86_OR_AMD64
|
||||
@ -138,16 +398,46 @@ enum
|
||||
CPU_FIRM_VIA
|
||||
};
|
||||
|
||||
Bool x86cpuid_CheckAndRead(Cx86cpuid *p);
|
||||
void MyCPUID(UInt32 function, UInt32 *a, UInt32 *b, UInt32 *c, UInt32 *d);
|
||||
|
||||
BoolInt x86cpuid_CheckAndRead(Cx86cpuid *p);
|
||||
int x86cpuid_GetFirm(const Cx86cpuid *p);
|
||||
|
||||
#define x86cpuid_GetFamily(p) (((p)->ver >> 8) & 0xFF00F)
|
||||
#define x86cpuid_GetModel(p) (((p)->ver >> 4) & 0xF00F)
|
||||
#define x86cpuid_GetStepping(p) ((p)->ver & 0xF)
|
||||
#define x86cpuid_GetFamily(ver) (((ver >> 16) & 0xFF0) | ((ver >> 8) & 0xF))
|
||||
#define x86cpuid_GetModel(ver) (((ver >> 12) & 0xF0) | ((ver >> 4) & 0xF))
|
||||
#define x86cpuid_GetStepping(ver) (ver & 0xF)
|
||||
|
||||
Bool CPU_Is_InOrder();
|
||||
Bool CPU_Is_Aes_Supported();
|
||||
BoolInt CPU_Is_InOrder(void);
|
||||
|
||||
BoolInt CPU_IsSupported_AES(void);
|
||||
BoolInt CPU_IsSupported_AVX2(void);
|
||||
BoolInt CPU_IsSupported_VAES_AVX2(void);
|
||||
BoolInt CPU_IsSupported_SSSE3(void);
|
||||
BoolInt CPU_IsSupported_SSE41(void);
|
||||
BoolInt CPU_IsSupported_SHA(void);
|
||||
BoolInt CPU_IsSupported_PageGB(void);
|
||||
|
||||
#elif defined(MY_CPU_ARM_OR_ARM64)
|
||||
|
||||
BoolInt CPU_IsSupported_CRC32(void);
|
||||
BoolInt CPU_IsSupported_NEON(void);
|
||||
|
||||
#if defined(_WIN32)
|
||||
BoolInt CPU_IsSupported_CRYPTO(void);
|
||||
#define CPU_IsSupported_SHA1 CPU_IsSupported_CRYPTO
|
||||
#define CPU_IsSupported_SHA2 CPU_IsSupported_CRYPTO
|
||||
#define CPU_IsSupported_AES CPU_IsSupported_CRYPTO
|
||||
#else
|
||||
BoolInt CPU_IsSupported_SHA1(void);
|
||||
BoolInt CPU_IsSupported_SHA2(void);
|
||||
BoolInt CPU_IsSupported_AES(void);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(__APPLE__)
|
||||
int My_sysctlbyname_Get(const char *name, void *buf, size_t *bufSize);
|
||||
int My_sysctlbyname_Get_UInt32(const char *name, UInt32 *val);
|
||||
#endif
|
||||
|
||||
EXTERN_C_END
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,14 +1,12 @@
|
||||
/* LzFind.h -- Match finder for LZ algorithms
|
||||
2009-04-22 : Igor Pavlov : Public domain */
|
||||
2021-07-13 : Igor Pavlov : Public domain */
|
||||
|
||||
#ifndef __LZ_FIND_H
|
||||
#define __LZ_FIND_H
|
||||
|
||||
#include "Types.h"
|
||||
#include "7zTypes.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
EXTERN_C_BEGIN
|
||||
|
||||
typedef UInt32 CLzRef;
|
||||
|
||||
@ -17,12 +15,17 @@ typedef struct _CMatchFinder
|
||||
Byte *buffer;
|
||||
UInt32 pos;
|
||||
UInt32 posLimit;
|
||||
UInt32 streamPos;
|
||||
UInt32 streamPos; /* wrap over Zero is allowed (streamPos < pos). Use (UInt32)(streamPos - pos) */
|
||||
UInt32 lenLimit;
|
||||
|
||||
UInt32 cyclicBufferPos;
|
||||
UInt32 cyclicBufferSize; /* it must be = (historySize + 1) */
|
||||
|
||||
Byte streamEndWasReached;
|
||||
Byte btMode;
|
||||
Byte bigHash;
|
||||
Byte directInput;
|
||||
|
||||
UInt32 matchMaxLen;
|
||||
CLzRef *hash;
|
||||
CLzRef *son;
|
||||
@ -31,32 +34,36 @@ typedef struct _CMatchFinder
|
||||
|
||||
Byte *bufferBase;
|
||||
ISeqInStream *stream;
|
||||
int streamEndWasReached;
|
||||
|
||||
UInt32 blockSize;
|
||||
UInt32 keepSizeBefore;
|
||||
UInt32 keepSizeAfter;
|
||||
|
||||
UInt32 numHashBytes;
|
||||
int directInput;
|
||||
size_t directInputRem;
|
||||
int btMode;
|
||||
int bigHash;
|
||||
UInt32 historySize;
|
||||
UInt32 fixedHashSize;
|
||||
UInt32 hashSizeSum;
|
||||
UInt32 numSons;
|
||||
SRes result;
|
||||
UInt32 crc[256];
|
||||
size_t numRefs;
|
||||
|
||||
UInt64 expectedDataSize;
|
||||
} CMatchFinder;
|
||||
|
||||
#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((p)->buffer)
|
||||
#define Inline_MatchFinder_GetIndexByte(p, index) ((p)->buffer[(Int32)(index)])
|
||||
#define Inline_MatchFinder_GetPointerToCurrentPos(p) ((const Byte *)(p)->buffer)
|
||||
|
||||
#define Inline_MatchFinder_GetNumAvailableBytes(p) ((p)->streamPos - (p)->pos)
|
||||
#define Inline_MatchFinder_GetNumAvailableBytes(p) ((UInt32)((p)->streamPos - (p)->pos))
|
||||
|
||||
/*
|
||||
#define Inline_MatchFinder_IsFinishedOK(p) \
|
||||
((p)->streamEndWasReached \
|
||||
&& (p)->streamPos == (p)->pos \
|
||||
&& (!(p)->directInput || (p)->directInputRem == 0))
|
||||
*/
|
||||
|
||||
int MatchFinder_NeedMove(CMatchFinder *p);
|
||||
Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p);
|
||||
/* Byte *MatchFinder_GetPointerToCurrentPos(CMatchFinder *p); */
|
||||
void MatchFinder_MoveBlock(CMatchFinder *p);
|
||||
void MatchFinder_ReadIfRequired(CMatchFinder *p);
|
||||
|
||||
@ -68,13 +75,24 @@ void MatchFinder_Construct(CMatchFinder *p);
|
||||
*/
|
||||
int MatchFinder_Create(CMatchFinder *p, UInt32 historySize,
|
||||
UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
|
||||
ISzAlloc *alloc);
|
||||
void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
|
||||
void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, UInt32 numItems);
|
||||
void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
|
||||
ISzAllocPtr alloc);
|
||||
void MatchFinder_Free(CMatchFinder *p, ISzAllocPtr alloc);
|
||||
void MatchFinder_Normalize3(UInt32 subValue, CLzRef *items, size_t numItems);
|
||||
// void MatchFinder_ReduceOffsets(CMatchFinder *p, UInt32 subValue);
|
||||
|
||||
/*
|
||||
#define Inline_MatchFinder_InitPos(p, val) \
|
||||
(p)->pos = (val); \
|
||||
(p)->streamPos = (val);
|
||||
*/
|
||||
|
||||
#define Inline_MatchFinder_ReduceOffsets(p, subValue) \
|
||||
(p)->pos -= (subValue); \
|
||||
(p)->streamPos -= (subValue);
|
||||
|
||||
|
||||
UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *buffer, CLzRef *son,
|
||||
UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
|
||||
size_t _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 _cutValue,
|
||||
UInt32 *distances, UInt32 maxLen);
|
||||
|
||||
/*
|
||||
@ -84,32 +102,35 @@ Conditions:
|
||||
*/
|
||||
|
||||
typedef void (*Mf_Init_Func)(void *object);
|
||||
typedef Byte (*Mf_GetIndexByte_Func)(void *object, Int32 index);
|
||||
typedef UInt32 (*Mf_GetNumAvailableBytes_Func)(void *object);
|
||||
typedef const Byte * (*Mf_GetPointerToCurrentPos_Func)(void *object);
|
||||
typedef UInt32 (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
|
||||
typedef UInt32 * (*Mf_GetMatches_Func)(void *object, UInt32 *distances);
|
||||
typedef void (*Mf_Skip_Func)(void *object, UInt32);
|
||||
|
||||
typedef struct _IMatchFinder
|
||||
{
|
||||
Mf_Init_Func Init;
|
||||
Mf_GetIndexByte_Func GetIndexByte;
|
||||
Mf_GetNumAvailableBytes_Func GetNumAvailableBytes;
|
||||
Mf_GetPointerToCurrentPos_Func GetPointerToCurrentPos;
|
||||
Mf_GetMatches_Func GetMatches;
|
||||
Mf_Skip_Func Skip;
|
||||
} IMatchFinder;
|
||||
} IMatchFinder2;
|
||||
|
||||
void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder *vTable);
|
||||
void MatchFinder_CreateVTable(CMatchFinder *p, IMatchFinder2 *vTable);
|
||||
|
||||
void MatchFinder_Init_LowHash(CMatchFinder *p);
|
||||
void MatchFinder_Init_HighHash(CMatchFinder *p);
|
||||
void MatchFinder_Init_4(CMatchFinder *p);
|
||||
void MatchFinder_Init(CMatchFinder *p);
|
||||
UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
|
||||
UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
|
||||
|
||||
UInt32* Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
|
||||
UInt32* Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances);
|
||||
|
||||
void Bt3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
|
||||
void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
void LzFindPrepare(void);
|
||||
|
||||
EXTERN_C_END
|
||||
|
||||
#endif
|
||||
|
@ -1,54 +1,34 @@
|
||||
/* LzHash.h -- HASH functions for LZ algorithms
|
||||
2009-02-07 : Igor Pavlov : Public domain */
|
||||
2019-10-30 : Igor Pavlov : Public domain */
|
||||
|
||||
#ifndef __LZ_HASH_H
|
||||
#define __LZ_HASH_H
|
||||
|
||||
/*
|
||||
(kHash2Size >= (1 << 8)) : Required
|
||||
(kHash3Size >= (1 << 16)) : Required
|
||||
*/
|
||||
|
||||
#define kHash2Size (1 << 10)
|
||||
#define kHash3Size (1 << 16)
|
||||
#define kHash4Size (1 << 20)
|
||||
// #define kHash4Size (1 << 20)
|
||||
|
||||
#define kFix3HashSize (kHash2Size)
|
||||
#define kFix4HashSize (kHash2Size + kHash3Size)
|
||||
#define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)
|
||||
// #define kFix5HashSize (kHash2Size + kHash3Size + kHash4Size)
|
||||
|
||||
#define HASH2_CALC hashValue = cur[0] | ((UInt32)cur[1] << 8);
|
||||
/*
|
||||
We use up to 3 crc values for hash:
|
||||
crc0
|
||||
crc1 << Shift_1
|
||||
crc2 << Shift_2
|
||||
(Shift_1 = 5) and (Shift_2 = 10) is good tradeoff.
|
||||
Small values for Shift are not good for collision rate.
|
||||
Big value for Shift_2 increases the minimum size
|
||||
of hash table, that will be slow for small files.
|
||||
*/
|
||||
|
||||
#define HASH3_CALC { \
|
||||
UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
|
||||
hash2Value = temp & (kHash2Size - 1); \
|
||||
hashValue = (temp ^ ((UInt32)cur[2] << 8)) & p->hashMask; }
|
||||
|
||||
#define HASH4_CALC { \
|
||||
UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
|
||||
hash2Value = temp & (kHash2Size - 1); \
|
||||
hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
|
||||
hashValue = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & p->hashMask; }
|
||||
|
||||
#define HASH5_CALC { \
|
||||
UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
|
||||
hash2Value = temp & (kHash2Size - 1); \
|
||||
hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
|
||||
hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)); \
|
||||
hashValue = (hash4Value ^ (p->crc[cur[4]] << 3)) & p->hashMask; \
|
||||
hash4Value &= (kHash4Size - 1); }
|
||||
|
||||
/* #define HASH_ZIP_CALC hashValue = ((cur[0] | ((UInt32)cur[1] << 8)) ^ p->crc[cur[2]]) & 0xFFFF; */
|
||||
#define HASH_ZIP_CALC hashValue = ((cur[2] | ((UInt32)cur[0] << 8)) ^ p->crc[cur[1]]) & 0xFFFF;
|
||||
|
||||
|
||||
#define MT_HASH2_CALC \
|
||||
hash2Value = (p->crc[cur[0]] ^ cur[1]) & (kHash2Size - 1);
|
||||
|
||||
#define MT_HASH3_CALC { \
|
||||
UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
|
||||
hash2Value = temp & (kHash2Size - 1); \
|
||||
hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); }
|
||||
|
||||
#define MT_HASH4_CALC { \
|
||||
UInt32 temp = p->crc[cur[0]] ^ cur[1]; \
|
||||
hash2Value = temp & (kHash2Size - 1); \
|
||||
hash3Value = (temp ^ ((UInt32)cur[2] << 8)) & (kHash3Size - 1); \
|
||||
hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
|
||||
#define kLzHash_CrcShift_1 5
|
||||
#define kLzHash_CrcShift_2 10
|
||||
|
||||
#endif
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,24 +1,24 @@
|
||||
/* LzmaDec.h -- LZMA Decoder
|
||||
2009-02-07 : Igor Pavlov : Public domain */
|
||||
2020-03-19 : Igor Pavlov : Public domain */
|
||||
|
||||
#ifndef __LZMA_DEC_H
|
||||
#define __LZMA_DEC_H
|
||||
|
||||
#include "Types.h"
|
||||
#include "7zTypes.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
EXTERN_C_BEGIN
|
||||
|
||||
/* #define _LZMA_PROB32 */
|
||||
/* _LZMA_PROB32 can increase the speed on some CPUs,
|
||||
but memory usage for CLzmaDec::probs will be doubled in that case */
|
||||
|
||||
typedef
|
||||
#ifdef _LZMA_PROB32
|
||||
#define CLzmaProb UInt32
|
||||
UInt32
|
||||
#else
|
||||
#define CLzmaProb UInt16
|
||||
UInt16
|
||||
#endif
|
||||
CLzmaProb;
|
||||
|
||||
|
||||
/* ---------- LZMA Properties ---------- */
|
||||
@ -27,7 +27,10 @@ extern "C" {
|
||||
|
||||
typedef struct _CLzmaProps
|
||||
{
|
||||
unsigned lc, lp, pb;
|
||||
Byte lc;
|
||||
Byte lp;
|
||||
Byte pb;
|
||||
Byte _pad_;
|
||||
UInt32 dicSize;
|
||||
} CLzmaProps;
|
||||
|
||||
@ -49,32 +52,34 @@ SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
|
||||
|
||||
typedef struct
|
||||
{
|
||||
/* Don't change this structure. ASM code can use it. */
|
||||
CLzmaProps prop;
|
||||
CLzmaProb *probs;
|
||||
CLzmaProb *probs_1664;
|
||||
Byte *dic;
|
||||
const Byte *buf;
|
||||
UInt32 range, code;
|
||||
SizeT dicPos;
|
||||
SizeT dicBufSize;
|
||||
SizeT dicPos;
|
||||
const Byte *buf;
|
||||
UInt32 range;
|
||||
UInt32 code;
|
||||
UInt32 processedPos;
|
||||
UInt32 checkDicSize;
|
||||
unsigned state;
|
||||
UInt32 reps[4];
|
||||
unsigned remainLen;
|
||||
int needFlush;
|
||||
int needInitState;
|
||||
UInt32 state;
|
||||
UInt32 remainLen;
|
||||
|
||||
UInt32 numProbs;
|
||||
unsigned tempBufSize;
|
||||
Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
|
||||
} CLzmaDec;
|
||||
|
||||
#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
|
||||
#define LzmaDec_Construct(p) { (p)->dic = NULL; (p)->probs = NULL; }
|
||||
|
||||
void LzmaDec_Init(CLzmaDec *p);
|
||||
|
||||
/* There are two types of LZMA streams:
|
||||
0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
|
||||
1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
|
||||
- Stream with end mark. That end mark adds about 6 bytes to compressed size.
|
||||
- Stream without end mark. You must know exact uncompressed size to decompress such stream. */
|
||||
|
||||
typedef enum
|
||||
{
|
||||
@ -131,11 +136,11 @@ LzmaDec_Allocate* can return:
|
||||
SZ_ERROR_UNSUPPORTED - Unsupported properties
|
||||
*/
|
||||
|
||||
SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
|
||||
void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
|
||||
SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAllocPtr alloc);
|
||||
void LzmaDec_FreeProbs(CLzmaDec *p, ISzAllocPtr alloc);
|
||||
|
||||
SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
|
||||
void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
|
||||
SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAllocPtr alloc);
|
||||
void LzmaDec_Free(CLzmaDec *p, ISzAllocPtr alloc);
|
||||
|
||||
/* ---------- Dictionary Interface ---------- */
|
||||
|
||||
@ -144,7 +149,7 @@ void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
|
||||
You must work with CLzmaDec variables directly in this interface.
|
||||
|
||||
STEPS:
|
||||
LzmaDec_Constr()
|
||||
LzmaDec_Construct()
|
||||
LzmaDec_Allocate()
|
||||
for (each new stream)
|
||||
{
|
||||
@ -176,6 +181,7 @@ Returns:
|
||||
LZMA_STATUS_NEEDS_MORE_INPUT
|
||||
LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
|
||||
SZ_ERROR_DATA - Data error
|
||||
SZ_ERROR_FAIL - Some unexpected error: internal error of code, memory corruption or hardware failure
|
||||
*/
|
||||
|
||||
SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
|
||||
@ -218,14 +224,13 @@ Returns:
|
||||
SZ_ERROR_MEM - Memory allocation error
|
||||
SZ_ERROR_UNSUPPORTED - Unsupported properties
|
||||
SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
|
||||
SZ_ERROR_FAIL - Some unexpected error: internal error of code, memory corruption or hardware failure
|
||||
*/
|
||||
|
||||
SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
|
||||
const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
|
||||
ELzmaStatus *status, ISzAlloc *alloc);
|
||||
ELzmaStatus *status, ISzAllocPtr alloc);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
EXTERN_C_END
|
||||
|
||||
#endif
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,14 +1,12 @@
|
||||
/* LzmaEnc.h -- LZMA Encoder
|
||||
2009-02-07 : Igor Pavlov : Public domain */
|
||||
2019-10-30 : Igor Pavlov : Public domain */
|
||||
|
||||
#ifndef __LZMA_ENC_H
|
||||
#define __LZMA_ENC_H
|
||||
|
||||
#include "Types.h"
|
||||
#include "7zTypes.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
EXTERN_C_BEGIN
|
||||
|
||||
#define LZMA_PROPS_SIZE 5
|
||||
|
||||
@ -16,7 +14,7 @@ typedef struct _CLzmaEncProps
|
||||
{
|
||||
int level; /* 0 <= level <= 9 */
|
||||
UInt32 dictSize; /* (1 << 12) <= dictSize <= (1 << 27) for 32-bit version
|
||||
(1 << 12) <= dictSize <= (1 << 30) for 64-bit version
|
||||
(1 << 12) <= dictSize <= (3 << 29) for 64-bit version
|
||||
default = (1 << 24) */
|
||||
int lc; /* 0 <= lc <= 8, default = 3 */
|
||||
int lp; /* 0 <= lp <= 4, default = 0 */
|
||||
@ -28,6 +26,11 @@ typedef struct _CLzmaEncProps
|
||||
UInt32 mc; /* 1 <= mc <= (1 << 30), default = 32 */
|
||||
unsigned writeEndMark; /* 0 - do not write EOPM, 1 - write EOPM, default = 0 */
|
||||
int numThreads; /* 1 or 2, default = 2 */
|
||||
|
||||
UInt64 reduceSize; /* estimated size of data that will be compressed. default = (UInt64)(Int64)-1.
|
||||
Encoder uses this value to reduce dictionary size */
|
||||
|
||||
UInt64 affinity;
|
||||
} CLzmaEncProps;
|
||||
|
||||
void LzmaEncProps_Init(CLzmaEncProps *p);
|
||||
@ -37,44 +40,39 @@ UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2);
|
||||
|
||||
/* ---------- CLzmaEncHandle Interface ---------- */
|
||||
|
||||
/* LzmaEnc_* functions can return the following exit codes:
|
||||
Returns:
|
||||
/* LzmaEnc* functions can return the following exit codes:
|
||||
SRes:
|
||||
SZ_OK - OK
|
||||
SZ_ERROR_MEM - Memory allocation error
|
||||
SZ_ERROR_PARAM - Incorrect paramater in props
|
||||
SZ_ERROR_WRITE - Write callback error.
|
||||
SZ_ERROR_WRITE - ISeqOutStream write callback error
|
||||
SZ_ERROR_OUTPUT_EOF - output buffer overflow - version with (Byte *) output
|
||||
SZ_ERROR_PROGRESS - some break from progress callback
|
||||
SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
|
||||
SZ_ERROR_THREAD - error in multithreading functions (only for Mt version)
|
||||
*/
|
||||
|
||||
typedef void * CLzmaEncHandle;
|
||||
|
||||
CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc);
|
||||
void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig);
|
||||
CLzmaEncHandle LzmaEnc_Create(ISzAllocPtr alloc);
|
||||
void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAllocPtr alloc, ISzAllocPtr allocBig);
|
||||
|
||||
SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props);
|
||||
void LzmaEnc_SetDataSize(CLzmaEncHandle p, UInt64 expectedDataSiize);
|
||||
SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size);
|
||||
unsigned LzmaEnc_IsWriteEndMark(CLzmaEncHandle p);
|
||||
|
||||
SRes LzmaEnc_Encode(CLzmaEncHandle p, ISeqOutStream *outStream, ISeqInStream *inStream,
|
||||
ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
|
||||
ICompressProgress *progress, ISzAllocPtr alloc, ISzAllocPtr allocBig);
|
||||
SRes LzmaEnc_MemEncode(CLzmaEncHandle p, Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
|
||||
int writeEndMark, ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
|
||||
int writeEndMark, ICompressProgress *progress, ISzAllocPtr alloc, ISzAllocPtr allocBig);
|
||||
|
||||
|
||||
/* ---------- One Call Interface ---------- */
|
||||
|
||||
/* LzmaEncode
|
||||
Return code:
|
||||
SZ_OK - OK
|
||||
SZ_ERROR_MEM - Memory allocation error
|
||||
SZ_ERROR_PARAM - Incorrect paramater
|
||||
SZ_ERROR_OUTPUT_EOF - output buffer overflow
|
||||
SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)
|
||||
*/
|
||||
|
||||
SRes LzmaEncode(Byte *dest, SizeT *destLen, const Byte *src, SizeT srcLen,
|
||||
const CLzmaEncProps *props, Byte *propsEncoded, SizeT *propsSize, int writeEndMark,
|
||||
ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
|
||||
ICompressProgress *progress, ISzAllocPtr alloc, ISzAllocPtr allocBig);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
EXTERN_C_END
|
||||
|
||||
#endif
|
||||
|
12
common/LZMA/SDK/C/Precomp.h
Normal file
12
common/LZMA/SDK/C/Precomp.h
Normal file
@ -0,0 +1,12 @@
|
||||
/* Precomp.h -- StdAfx
|
||||
2013-11-12 : Igor Pavlov : Public domain */
|
||||
|
||||
#ifndef __7Z_PRECOMP_H
|
||||
#define __7Z_PRECOMP_H
|
||||
|
||||
#include "Compiler.h"
|
||||
/* #include "7zTypes.h" */
|
||||
|
||||
#define _7ZIP_ST
|
||||
|
||||
#endif
|
@ -1,256 +0,0 @@
|
||||
/* Types.h -- Basic types
|
||||
2010-10-09 : Igor Pavlov : Public domain */
|
||||
|
||||
#ifndef __7Z_TYPES_H
|
||||
#define __7Z_TYPES_H
|
||||
|
||||
#include "../../UefiLzma.h"
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
#ifndef EXTERN_C_BEGIN
|
||||
#ifdef __cplusplus
|
||||
#define EXTERN_C_BEGIN extern "C" {
|
||||
#define EXTERN_C_END }
|
||||
#else
|
||||
#define EXTERN_C_BEGIN
|
||||
#define EXTERN_C_END
|
||||
#endif
|
||||
#endif
|
||||
|
||||
EXTERN_C_BEGIN
|
||||
|
||||
#define SZ_OK 0
|
||||
|
||||
#define SZ_ERROR_DATA 1
|
||||
#define SZ_ERROR_MEM 2
|
||||
#define SZ_ERROR_CRC 3
|
||||
#define SZ_ERROR_UNSUPPORTED 4
|
||||
#define SZ_ERROR_PARAM 5
|
||||
#define SZ_ERROR_INPUT_EOF 6
|
||||
#define SZ_ERROR_OUTPUT_EOF 7
|
||||
#define SZ_ERROR_READ 8
|
||||
#define SZ_ERROR_WRITE 9
|
||||
#define SZ_ERROR_PROGRESS 10
|
||||
#define SZ_ERROR_FAIL 11
|
||||
#define SZ_ERROR_THREAD 12
|
||||
|
||||
#define SZ_ERROR_ARCHIVE 16
|
||||
#define SZ_ERROR_NO_ARCHIVE 17
|
||||
|
||||
typedef int SRes;
|
||||
|
||||
#ifdef _WIN32
|
||||
typedef DWORD WRes;
|
||||
#else
|
||||
typedef int WRes;
|
||||
#endif
|
||||
|
||||
#ifndef RINOK
|
||||
#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
|
||||
#endif
|
||||
|
||||
typedef unsigned char Byte;
|
||||
typedef short Int16;
|
||||
typedef unsigned short UInt16;
|
||||
|
||||
#ifdef _LZMA_UINT32_IS_ULONG
|
||||
typedef long Int32;
|
||||
typedef unsigned long UInt32;
|
||||
#else
|
||||
typedef int Int32;
|
||||
typedef unsigned int UInt32;
|
||||
#endif
|
||||
|
||||
#ifdef _SZ_NO_INT_64
|
||||
|
||||
/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
|
||||
NOTES: Some code will work incorrectly in that case! */
|
||||
|
||||
typedef long Int64;
|
||||
typedef unsigned long UInt64;
|
||||
|
||||
#else
|
||||
|
||||
#if defined(_MSC_VER) || defined(__BORLANDC__)
|
||||
typedef __int64 Int64;
|
||||
typedef unsigned __int64 UInt64;
|
||||
#define UINT64_CONST(n) n
|
||||
#else
|
||||
typedef long long int Int64;
|
||||
typedef unsigned long long int UInt64;
|
||||
#define UINT64_CONST(n) n ## ULL
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef _LZMA_NO_SYSTEM_SIZE_T
|
||||
typedef UInt32 SizeT;
|
||||
#else
|
||||
typedef size_t SizeT;
|
||||
#endif
|
||||
|
||||
typedef int Bool;
|
||||
#define True 1
|
||||
#define False 0
|
||||
|
||||
|
||||
#ifdef _WIN32
|
||||
#define MY_STD_CALL __stdcall
|
||||
#else
|
||||
#define MY_STD_CALL
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
|
||||
#if _MSC_VER >= 1300
|
||||
#define MY_NO_INLINE __declspec(noinline)
|
||||
#else
|
||||
#define MY_NO_INLINE
|
||||
#endif
|
||||
|
||||
#define MY_CDECL __cdecl
|
||||
#define MY_FAST_CALL __fastcall
|
||||
|
||||
#else
|
||||
|
||||
#define MY_CDECL
|
||||
#define MY_FAST_CALL
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
/* The following interfaces use first parameter as pointer to structure */
|
||||
|
||||
typedef struct
|
||||
{
|
||||
Byte (*Read)(void *p); /* reads one byte, returns 0 in case of EOF or error */
|
||||
} IByteIn;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
void (*Write)(void *p, Byte b);
|
||||
} IByteOut;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
SRes (*Read)(void *p, void *buf, size_t *size);
|
||||
/* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
|
||||
(output(*size) < input(*size)) is allowed */
|
||||
} ISeqInStream;
|
||||
|
||||
/* it can return SZ_ERROR_INPUT_EOF */
|
||||
SRes SeqInStream_Read(ISeqInStream *stream, void *buf, size_t size);
|
||||
SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType);
|
||||
SRes SeqInStream_ReadByte(ISeqInStream *stream, Byte *buf);
|
||||
|
||||
typedef struct
|
||||
{
|
||||
size_t (*Write)(void *p, const void *buf, size_t size);
|
||||
/* Returns: result - the number of actually written bytes.
|
||||
(result < size) means error */
|
||||
} ISeqOutStream;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
SZ_SEEK_SET = 0,
|
||||
SZ_SEEK_CUR = 1,
|
||||
SZ_SEEK_END = 2
|
||||
} ESzSeek;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
SRes (*Read)(void *p, void *buf, size_t *size); /* same as ISeqInStream::Read */
|
||||
SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
|
||||
} ISeekInStream;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
SRes (*Look)(void *p, const void **buf, size_t *size);
|
||||
/* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
|
||||
(output(*size) > input(*size)) is not allowed
|
||||
(output(*size) < input(*size)) is allowed */
|
||||
SRes (*Skip)(void *p, size_t offset);
|
||||
/* offset must be <= output(*size) of Look */
|
||||
|
||||
SRes (*Read)(void *p, void *buf, size_t *size);
|
||||
/* reads directly (without buffer). It's same as ISeqInStream::Read */
|
||||
SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
|
||||
} ILookInStream;
|
||||
|
||||
SRes LookInStream_LookRead(ILookInStream *stream, void *buf, size_t *size);
|
||||
SRes LookInStream_SeekTo(ILookInStream *stream, UInt64 offset);
|
||||
|
||||
/* reads via ILookInStream::Read */
|
||||
SRes LookInStream_Read2(ILookInStream *stream, void *buf, size_t size, SRes errorType);
|
||||
SRes LookInStream_Read(ILookInStream *stream, void *buf, size_t size);
|
||||
|
||||
#define LookToRead_BUF_SIZE (1 << 14)
|
||||
|
||||
typedef struct
|
||||
{
|
||||
ILookInStream s;
|
||||
ISeekInStream *realStream;
|
||||
size_t pos;
|
||||
size_t size;
|
||||
Byte buf[LookToRead_BUF_SIZE];
|
||||
} CLookToRead;
|
||||
|
||||
void LookToRead_CreateVTable(CLookToRead *p, int lookahead);
|
||||
void LookToRead_Init(CLookToRead *p);
|
||||
|
||||
typedef struct
|
||||
{
|
||||
ISeqInStream s;
|
||||
ILookInStream *realStream;
|
||||
} CSecToLook;
|
||||
|
||||
void SecToLook_CreateVTable(CSecToLook *p);
|
||||
|
||||
typedef struct
|
||||
{
|
||||
ISeqInStream s;
|
||||
ILookInStream *realStream;
|
||||
} CSecToRead;
|
||||
|
||||
void SecToRead_CreateVTable(CSecToRead *p);
|
||||
|
||||
typedef struct
|
||||
{
|
||||
SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize);
|
||||
/* Returns: result. (result != SZ_OK) means break.
|
||||
Value (UInt64)(Int64)-1 for size means unknown value. */
|
||||
} ICompressProgress;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
void *(*Alloc)(void *p, size_t size);
|
||||
void (*Free)(void *p, void *address); /* address can be 0 */
|
||||
} ISzAlloc;
|
||||
|
||||
#define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
|
||||
#define IAlloc_Free(p, a) (p)->Free((p), a)
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
#define CHAR_PATH_SEPARATOR '\\'
|
||||
#define WCHAR_PATH_SEPARATOR L'\\'
|
||||
#define STRING_PATH_SEPARATOR "\\"
|
||||
#define WSTRING_PATH_SEPARATOR L"\\"
|
||||
|
||||
#else
|
||||
|
||||
#define CHAR_PATH_SEPARATOR '/'
|
||||
#define WCHAR_PATH_SEPARATOR L'/'
|
||||
#define STRING_PATH_SEPARATOR "/"
|
||||
#define WSTRING_PATH_SEPARATOR L"/"
|
||||
|
||||
#endif
|
||||
|
||||
EXTERN_C_END
|
||||
|
||||
#endif
|
@ -64,8 +64,8 @@ typedef size_t USTATUS;
|
||||
#define U_INVALID_FIT 42
|
||||
#define U_INVALID_MICROCODE 43
|
||||
#define U_INVALID_ACM 44
|
||||
#define U_INVALID_BG_KEY_MANIFEST 45
|
||||
#define U_INVALID_BG_BOOT_POLICY 46
|
||||
#define U_INVALID_BOOT_GUARD_KEY_MANIFEST 45
|
||||
#define U_INVALID_BOOT_GUARD_BOOT_POLICY 46
|
||||
#define U_INVALID_TXT_CONF 47
|
||||
#define U_ELEMENTS_NOT_FOUND 48
|
||||
#define U_PEI_CORE_ENTRY_POINT_NOT_FOUND 49
|
||||
@ -203,7 +203,30 @@ typedef struct EFI_TIME_ {
|
||||
#include <assert.h>
|
||||
#define ASSERT(x) assert(x)
|
||||
|
||||
// SHA256 hash size in bytes
|
||||
// Hash sizes in bytes
|
||||
#define SHA1_HASH_SIZE 0x14
|
||||
#define SHA256_HASH_SIZE 0x20
|
||||
#define SHA384_HASH_SIZE 0x30
|
||||
#define SHA512_HASH_SIZE 0x40
|
||||
#define SM3_HASH_SIZE 0x20
|
||||
|
||||
// TCG Algorithm Registry: Table 2
|
||||
#define TCG_HASH_ALGORITHM_ID_SHA1 0x0004
|
||||
#define TCG_HASH_ALGORITHM_ID_SHA256 0x000B
|
||||
#define TCG_HASH_ALGORITHM_ID_SHA384 0x000C
|
||||
#define TCG_HASH_ALGORITHM_ID_SHA512 0x000D
|
||||
#define TCG_HASH_ALGORITHM_ID_NULL 0x0010
|
||||
#define TCG_HASH_ALGORITHM_ID_SM3 0x0012
|
||||
|
||||
// A workaround for compilers not supporting c++11 and c11
|
||||
// for using PRIX64.
|
||||
#define __STDC_FORMAT_MACROS
|
||||
#include <inttypes.h>
|
||||
|
||||
#if defined(__clang__) || defined(__GNUC__)
|
||||
#define ATTRIBUTE_FORMAT_(t,f,a) __attribute__((format(t, f, a)))
|
||||
#else
|
||||
#define ATTRIBUTE_FORMAT_(t,f,a)
|
||||
#endif
|
||||
|
||||
#endif // BASETYPES_H
|
||||
|
@ -1,210 +0,0 @@
|
||||
/* bootguard.h
|
||||
|
||||
Copyright (c) 2017, LongSoft. 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
|
||||
http://opensource.org/licenses/bsd-license.php
|
||||
|
||||
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
|
||||
*/
|
||||
|
||||
#ifndef BOOTGUARD_H
|
||||
#define BOOTGUARD_H
|
||||
|
||||
#include "basetypes.h"
|
||||
#include "sha256.h"
|
||||
|
||||
#pragma pack(push, 1)
|
||||
|
||||
const UByteArray BG_VENDOR_HASH_FILE_GUID_PHOENIX // 389CC6F2-1EA8-467B-AB8A-78E769AE2A15
|
||||
("\xF2\xC6\x9C\x38\xA8\x1E\x7B\x46\xAB\x8A\x78\xE7\x69\xAE\x2A\x15", 16);
|
||||
|
||||
#define BG_VENDOR_HASH_FILE_SIGNATURE_PHOENIX (*(UINT64 *)"$HASHTBL")
|
||||
|
||||
const UByteArray BG_VENDOR_HASH_FILE_GUID_AMI // CBC91F44-A4BC-4A5B-8696-703451D0B053
|
||||
("\x44\x1F\xC9\xCB\xBC\xA4\x5B\x4A\x86\x96\x70\x34\x51\xD0\xB0\x53", 16);
|
||||
|
||||
typedef struct BG_VENDOR_HASH_FILE_ENTRY
|
||||
{
|
||||
UINT8 Hash[SHA256_DIGEST_SIZE];
|
||||
UINT32 Offset;
|
||||
UINT32 Size;
|
||||
} BG_VENDOR_HASH_FILE_ENTRY;
|
||||
|
||||
typedef struct BG_VENDOR_HASH_FILE_HEADER_PHOENIX_
|
||||
{
|
||||
UINT64 Signature;
|
||||
UINT32 NumEntries;
|
||||
//BG_VENDOR_HASH_FILE_ENTRY Entries[];
|
||||
} BG_VENDOR_HASH_FILE_HEADER_PHOENIX;
|
||||
|
||||
typedef struct BG_VENDOR_HASH_FILE_HEADER_AMI_NEW_
|
||||
{
|
||||
BG_VENDOR_HASH_FILE_ENTRY Entries[2];
|
||||
} BG_VENDOR_HASH_FILE_HEADER_AMI_NEW;
|
||||
|
||||
typedef struct BG_VENDOR_HASH_FILE_HEADER_AMI_OLD_
|
||||
{
|
||||
UINT8 Hash[SHA256_DIGEST_SIZE];
|
||||
UINT32 Size;
|
||||
// Offset is derived from flash map, will be detected as root volume with DXE core
|
||||
} BG_VENDOR_HASH_FILE_HEADER_AMI_OLD;
|
||||
|
||||
typedef struct BG_MICROSOFT_PMDA_HEADER_
|
||||
{
|
||||
UINT32 Version;
|
||||
UINT32 NumEntries;
|
||||
} BG_MICROSOFT_PMDA_HEADER;
|
||||
|
||||
#define BG_MICROSOFT_PMDA_VERSION 0x00000001
|
||||
|
||||
typedef struct BG_MICROSOFT_PMDA_ENTRY_
|
||||
{
|
||||
UINT32 Address;
|
||||
UINT32 Size;
|
||||
UINT8 Hash[SHA256_DIGEST_SIZE];
|
||||
} BG_MICROSOFT_PMDA_ENTRY;
|
||||
|
||||
//
|
||||
// Intel ACM
|
||||
//
|
||||
|
||||
#define INTEL_ACM_MODULE_TYPE 0x2
|
||||
#define INTEL_ACM_MODULE_SUBTYPE_TXT_ACM 0x0
|
||||
#define INTEL_ACM_MODULE_SUBTYPE_S_ACM 0x1
|
||||
#define INTEL_ACM_MODULE_SUBTYPE_BOOTGUARD 0x3
|
||||
#define INTEL_ACM_MODULE_VENDOR 0x8086
|
||||
|
||||
typedef struct INTEL_ACM_HEADER_ {
|
||||
UINT16 ModuleType;
|
||||
UINT16 ModuleSubtype;
|
||||
UINT32 HeaderType;
|
||||
UINT32 HeaderVersion;
|
||||
UINT16 ChipsetId;
|
||||
UINT16 Flags;
|
||||
UINT32 ModuleVendor;
|
||||
UINT8 DateDay;
|
||||
UINT8 DateMonth;
|
||||
UINT16 DateYear;
|
||||
UINT32 ModuleSize;
|
||||
UINT16 AcmSvn;
|
||||
UINT16 : 16;
|
||||
UINT32 Unknown1;
|
||||
UINT32 Unknown2;
|
||||
UINT32 GdtMax;
|
||||
UINT32 GdtBase;
|
||||
UINT32 SegmentSel;
|
||||
UINT32 EntryPoint;
|
||||
UINT8 Unknown3[64];
|
||||
UINT32 KeySize;
|
||||
UINT32 Unknown4;
|
||||
UINT8 RsaPubKey[256];
|
||||
UINT32 RsaPubExp;
|
||||
UINT8 RsaSig[256];
|
||||
} INTEL_ACM_HEADER;
|
||||
|
||||
//
|
||||
// Intel BootGuard Key Manifest
|
||||
//
|
||||
#define BG_BOOT_POLICY_MANIFEST_HEADER_TAG (*(UINT64 *)"__ACBP__")
|
||||
typedef struct BG_BOOT_POLICY_MANIFEST_HEADER_ {
|
||||
UINT64 Tag;
|
||||
UINT8 Version;
|
||||
UINT8 HeaderVersion;
|
||||
UINT8 PMBPMVersion;
|
||||
UINT8 BPSVN;
|
||||
UINT8 ACMSVN;
|
||||
UINT8 : 8;
|
||||
UINT16 NEMDataSize;
|
||||
} BG_BOOT_POLICY_MANIFEST_HEADER;
|
||||
|
||||
typedef struct SHA256_HASH_ {
|
||||
UINT16 HashAlgorithmId;
|
||||
UINT16 Size;
|
||||
UINT8 HashBuffer[32];
|
||||
} SHA256_HASH;
|
||||
|
||||
typedef struct RSA_PUBLIC_KEY_ {
|
||||
UINT8 Version;
|
||||
UINT16 KeySize;
|
||||
UINT32 Exponent;
|
||||
UINT8 Modulus[256];
|
||||
} RSA_PUBLIC_KEY;
|
||||
|
||||
typedef struct RSA_SIGNATURE_ {
|
||||
UINT8 Version;
|
||||
UINT16 KeySize;
|
||||
UINT16 HashId;
|
||||
UINT8 Signature[256];
|
||||
} RSA_SIGNATURE;
|
||||
|
||||
typedef struct KEY_SIGNATURE_ {
|
||||
UINT8 Version;
|
||||
UINT16 KeyId;
|
||||
RSA_PUBLIC_KEY PubKey;
|
||||
UINT16 SigScheme;
|
||||
RSA_SIGNATURE Signature;
|
||||
} BG_KEY_SIGNATURE;
|
||||
|
||||
#define BG_IBB_SEGMENT_FLAG_IBB 0x0
|
||||
#define BG_IBB_SEGMENT_FLAG_NON_IBB 0x1
|
||||
typedef struct BG_IBB_SEGMENT_ELEMENT_ {
|
||||
UINT16: 16;
|
||||
UINT16 Flags;
|
||||
UINT32 Base;
|
||||
UINT32 Size;
|
||||
} BG_IBB_SEGMENT_ELEMENT;
|
||||
|
||||
#define BG_BOOT_POLICY_MANIFEST_IBB_ELEMENT_TAG (*(UINT64 *)"__IBBS__")
|
||||
#define BG_IBB_FLAG_AUTHORITY_MEASURE 0x4
|
||||
|
||||
typedef struct BG_IBB_ELEMENT_ {
|
||||
UINT64 Tag;
|
||||
UINT8 Version;
|
||||
UINT16 : 16;
|
||||
UINT8 Unknown;
|
||||
UINT32 Flags;
|
||||
UINT64 IbbMchBar;
|
||||
UINT64 VtdBar;
|
||||
UINT32 PmrlBase;
|
||||
UINT32 PmrlLimit;
|
||||
UINT64 Unknown3;
|
||||
UINT64 Unknown4;
|
||||
SHA256_HASH IbbHash;
|
||||
UINT32 EntryPoint;
|
||||
SHA256_HASH Digest;
|
||||
UINT8 IbbSegCount;
|
||||
// BG_IBB_SEGMENT_ELEMENT IbbSegment[];
|
||||
} BG_IBB_ELEMENT;
|
||||
|
||||
#define BG_BOOT_POLICY_MANIFEST_PLATFORM_MANUFACTURER_ELEMENT_TAG (*(UINT64 *)"__PMDA__")
|
||||
typedef struct BG_PLATFORM_MANUFACTURER_ELEMENT_ {
|
||||
UINT64 Tag;
|
||||
UINT8 Version;
|
||||
UINT16 DataSize;
|
||||
} BG_PLATFORM_MANUFACTURER_ELEMENT;
|
||||
|
||||
#define BG_BOOT_POLICY_MANIFEST_SIGNATURE_ELEMENT_TAG (*(UINT64 *)"__PMSG__")
|
||||
typedef struct BG_BOOT_POLICY_MANIFEST_SIGNATURE_ELEMENT_ {
|
||||
UINT64 Tag;
|
||||
UINT8 Version;
|
||||
BG_KEY_SIGNATURE KeySignature;
|
||||
} BG_BOOT_POLICY_MANIFEST_SIGNATURE_ELEMENT;
|
||||
|
||||
#define BG_KEY_MANIFEST_TAG (*(UINT64 *)"__KEYM__")
|
||||
typedef struct BG_KEY_MANIFEST_ {
|
||||
UINT64 Tag;
|
||||
UINT8 Version;
|
||||
UINT8 KmVersion;
|
||||
UINT8 KmSvn;
|
||||
UINT8 KmId;
|
||||
SHA256_HASH BpKeyHash;
|
||||
BG_KEY_SIGNATURE KeyManifestSignature;
|
||||
} BG_KEY_MANIFEST;
|
||||
|
||||
#pragma pack(pop)
|
||||
|
||||
#endif // BOOTGUARD_H
|
@ -22,7 +22,7 @@ extern "C" {
|
||||
#include <string.h>
|
||||
#include <limits.h>
|
||||
#include <ctype.h>
|
||||
#include "../uinttypes.h"
|
||||
#include "../basetypes.h"
|
||||
|
||||
#if !defined (BSTRLIB_VSNP_OK) && !defined (BSTRLIB_NOVSNP)
|
||||
# if defined (__TURBOC__) && !defined (__BORLANDC__)
|
||||
|
@ -52,7 +52,7 @@
|
||||
#include <stdlib.h>
|
||||
#include "bstrlib.h"
|
||||
#include "../ubytearray.h"
|
||||
#include "../uinttypes.h"
|
||||
#include "../basetypes.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
@ -365,6 +365,7 @@ struct CBString : public tagbstring {
|
||||
// QString compatibility methods
|
||||
const char *toLocal8Bit() const { return *this; }
|
||||
bool contains(const char *str) { return find(str) >= 0; }
|
||||
bool startsWith(const char *str) { return find(str) == 0; }
|
||||
bool endsWith(const char *str) { int len = strlen(str); return (slen >= len && (find(str, slen - len) == (slen - len))); }
|
||||
bool isEmpty() const { return slen == 0; }
|
||||
void clear() { *this = ""; }
|
||||
|
@ -246,5 +246,5 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
|
||||
case 0x9D7019: return UString("ISSI Ix25WP256");
|
||||
}
|
||||
|
||||
return UString("Unknown");
|
||||
return usprintf("Unknown %08Xh", jedecId);
|
||||
}
|
||||
|
230
common/digest/sha1.c
Normal file
230
common/digest/sha1.c
Normal file
@ -0,0 +1,230 @@
|
||||
/* sha1.c
|
||||
|
||||
Copyright (c) 2022, 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
|
||||
http://opensource.org/licenses/bsd-license.php
|
||||
|
||||
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
|
||||
*/
|
||||
|
||||
//
|
||||
// This implementations are based on LibTomCrypt that was released into
|
||||
// public domain by Tom St Denis.
|
||||
//
|
||||
#include "sha1.h"
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
|
||||
/* ulong64: 64-bit data type */
|
||||
#ifdef _MSC_VER
|
||||
#define CONST64(n) n ## ui64
|
||||
typedef unsigned __int64 ulong64;
|
||||
#else
|
||||
#define CONST64(n) n ## ULL
|
||||
typedef uint64_t ulong64;
|
||||
#endif
|
||||
|
||||
typedef uint32_t ulong32;
|
||||
|
||||
#define LOAD32H(x, y) \
|
||||
do { x = ((ulong32)((y)[0] & 255)<<24) | \
|
||||
((ulong32)((y)[1] & 255)<<16) | \
|
||||
((ulong32)((y)[2] & 255)<<8) | \
|
||||
((ulong32)((y)[3] & 255)); } while(0)
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(x, y) (((x) < (y)) ? (x) : (y))
|
||||
#endif
|
||||
|
||||
#define ROL(x, y) ( (((ulong32)(x)<<(ulong32)((y)&31)) | (((ulong32)(x)&0xFFFFFFFFUL)>>(ulong32)((32-((y)&31))&31))) & 0xFFFFFFFFUL)
|
||||
#define ROLc(x, y) ( (((ulong32)(x)<<(ulong32)((y)&31)) | (((ulong32)(x)&0xFFFFFFFFUL)>>(ulong32)((32-((y)&31))&31))) & 0xFFFFFFFFUL)
|
||||
|
||||
#define STORE32H(x, y) \
|
||||
do { (y)[0] = (unsigned char)(((x)>>24)&255); (y)[1] = (unsigned char)(((x)>>16)&255); \
|
||||
(y)[2] = (unsigned char)(((x)>>8)&255); (y)[3] = (unsigned char)((x)&255); } while(0)
|
||||
|
||||
#define STORE64H(x, y) \
|
||||
do { (y)[0] = (unsigned char)(((x)>>56)&255); (y)[1] = (unsigned char)(((x)>>48)&255); \
|
||||
(y)[2] = (unsigned char)(((x)>>40)&255); (y)[3] = (unsigned char)(((x)>>32)&255); \
|
||||
(y)[4] = (unsigned char)(((x)>>24)&255); (y)[5] = (unsigned char)(((x)>>16)&255); \
|
||||
(y)[6] = (unsigned char)(((x)>>8)&255); (y)[7] = (unsigned char)((x)&255); } while(0)
|
||||
|
||||
#define F0(x,y,z) (z ^ (x & (y ^ z)))
|
||||
#define F1(x,y,z) (x ^ y ^ z)
|
||||
#define F2(x,y,z) ((x & y) | (z & (x | y)))
|
||||
#define F3(x,y,z) (x ^ y ^ z)
|
||||
|
||||
struct sha1_state {
|
||||
ulong64 length;
|
||||
ulong32 state[5], curlen;
|
||||
unsigned char buf[64];
|
||||
};
|
||||
|
||||
static int s_sha1_compress(struct sha1_state *md, const unsigned char *buf)
|
||||
{
|
||||
ulong32 a,b,c,d,e,W[80],i;
|
||||
ulong32 t;
|
||||
|
||||
/* copy the state into 512-bits into W[0..15] */
|
||||
for (i = 0; i < 16; i++) {
|
||||
LOAD32H(W[i], buf + (4*i));
|
||||
}
|
||||
|
||||
/* copy state */
|
||||
a = md->state[0];
|
||||
b = md->state[1];
|
||||
c = md->state[2];
|
||||
d = md->state[3];
|
||||
e = md->state[4];
|
||||
|
||||
/* expand it */
|
||||
for (i = 16; i < 80; i++) {
|
||||
W[i] = ROL(W[i-3] ^ W[i-8] ^ W[i-14] ^ W[i-16], 1);
|
||||
}
|
||||
|
||||
/* compress */
|
||||
/* round one */
|
||||
#define FF0(a,b,c,d,e,i) e = (ROLc(a, 5) + F0(b,c,d) + e + W[i] + 0x5a827999UL); b = ROLc(b, 30);
|
||||
#define FF1(a,b,c,d,e,i) e = (ROLc(a, 5) + F1(b,c,d) + e + W[i] + 0x6ed9eba1UL); b = ROLc(b, 30);
|
||||
#define FF2(a,b,c,d,e,i) e = (ROLc(a, 5) + F2(b,c,d) + e + W[i] + 0x8f1bbcdcUL); b = ROLc(b, 30);
|
||||
#define FF3(a,b,c,d,e,i) e = (ROLc(a, 5) + F3(b,c,d) + e + W[i] + 0xca62c1d6UL); b = ROLc(b, 30);
|
||||
|
||||
for (i = 0; i < 20; ) {
|
||||
FF0(a,b,c,d,e,i++); t = e; e = d; d = c; c = b; b = a; a = t;
|
||||
}
|
||||
for (; i < 40; ) {
|
||||
FF1(a,b,c,d,e,i++); t = e; e = d; d = c; c = b; b = a; a = t;
|
||||
}
|
||||
for (; i < 60; ) {
|
||||
FF2(a,b,c,d,e,i++); t = e; e = d; d = c; c = b; b = a; a = t;
|
||||
}
|
||||
for (; i < 80; ) {
|
||||
FF3(a,b,c,d,e,i++); t = e; e = d; d = c; c = b; b = a; a = t;
|
||||
}
|
||||
|
||||
#undef FF0
|
||||
#undef FF1
|
||||
#undef FF2
|
||||
#undef FF3
|
||||
|
||||
/* store */
|
||||
md->state[0] = md->state[0] + a;
|
||||
md->state[1] = md->state[1] + b;
|
||||
md->state[2] = md->state[2] + c;
|
||||
md->state[3] = md->state[3] + d;
|
||||
md->state[4] = md->state[4] + e;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sha1_init(struct sha1_state * md)
|
||||
{
|
||||
if (md == NULL) return -1;
|
||||
md->state[0] = 0x67452301UL;
|
||||
md->state[1] = 0xefcdab89UL;
|
||||
md->state[2] = 0x98badcfeUL;
|
||||
md->state[3] = 0x10325476UL;
|
||||
md->state[4] = 0xc3d2e1f0UL;
|
||||
md->curlen = 0;
|
||||
md->length = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sha1_process(struct sha1_state * md, const unsigned char *in, unsigned long inlen)
|
||||
{
|
||||
unsigned long n;
|
||||
int err;
|
||||
if (md == NULL) return -1;
|
||||
if (in == NULL) return -1;
|
||||
if (md->curlen > sizeof(md->buf)) {
|
||||
return -1;
|
||||
}
|
||||
if (((md->length + inlen * 8) < md->length)
|
||||
|| ((inlen * 8) < inlen)) {
|
||||
return -1;
|
||||
}
|
||||
while (inlen > 0) {
|
||||
if (md->curlen == 0 && inlen >= 64) {
|
||||
if ((err = s_sha1_compress(md, in)) != 0) {
|
||||
return err;
|
||||
}
|
||||
md->length += 64 * 8;
|
||||
in += 64;
|
||||
inlen -= 64;
|
||||
} else {
|
||||
n = MIN(inlen, (64 - md->curlen));
|
||||
memcpy(md->buf + md->curlen, in, (size_t)n);
|
||||
md->curlen += n;
|
||||
in += n;
|
||||
inlen -= n;
|
||||
if (md->curlen == 64) {
|
||||
if ((err = s_sha1_compress(md, md->buf)) != 0) {
|
||||
return err;
|
||||
}
|
||||
md->length += 8 * 64;
|
||||
md->curlen = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sha1_done(struct sha1_state * md, unsigned char *out)
|
||||
{
|
||||
int i;
|
||||
|
||||
if (md == NULL) return -1;
|
||||
if (out == NULL) return -1;
|
||||
|
||||
if (md->curlen >= sizeof(md->buf)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* increase the length of the message */
|
||||
md->length += md->curlen * 8;
|
||||
|
||||
/* append the '1' bit */
|
||||
md->buf[md->curlen++] = (unsigned char)0x80;
|
||||
|
||||
/* if the length is currently above 56 bytes we append zeros
|
||||
* then compress. Then we can fall back to padding zeros and length
|
||||
* encoding like normal.
|
||||
*/
|
||||
if (md->curlen > 56) {
|
||||
while (md->curlen < 64) {
|
||||
md->buf[md->curlen++] = (unsigned char)0;
|
||||
}
|
||||
s_sha1_compress(md, md->buf);
|
||||
md->curlen = 0;
|
||||
}
|
||||
|
||||
/* pad upto 56 bytes of zeroes */
|
||||
while (md->curlen < 56) {
|
||||
md->buf[md->curlen++] = (unsigned char)0;
|
||||
}
|
||||
|
||||
/* store length */
|
||||
STORE64H(md->length, md->buf+56);
|
||||
s_sha1_compress(md, md->buf);
|
||||
|
||||
/* copy output */
|
||||
for (i = 0; i < 5; i++) {
|
||||
STORE32H(md->state[i], out+(4*i));
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void sha1(const void *in, unsigned long inlen, void* out)
|
||||
{
|
||||
struct sha1_state ctx;
|
||||
sha1_init(&ctx);
|
||||
sha1_process(&ctx, (const unsigned char*)in, inlen);
|
||||
sha1_done(&ctx, (unsigned char *)out);
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
/* uinttypes.h
|
||||
/* sha1.h
|
||||
|
||||
Copyright (c) 2021, Nikolaj Schlej. All rights reserved.
|
||||
Copyright (c) 2022, 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
|
||||
@ -8,20 +8,18 @@ http://opensource.org/licenses/bsd-license.php
|
||||
|
||||
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
|
||||
*/
|
||||
|
||||
#ifndef UINTTYPES_H
|
||||
#define UINTTYPES_H
|
||||
|
||||
// A workaround for compilers not supporting c++11 and c11
|
||||
// for using PRIX64.
|
||||
#define __STDC_FORMAT_MACROS
|
||||
#include <inttypes.h>
|
||||
|
||||
#if defined(__clang__) || defined(__GNUC__)
|
||||
#define ATTRIBUTE_FORMAT_(t,f,a) __attribute__((format(t, f, a)))
|
||||
#else
|
||||
#define ATTRIBUTE_FORMAT_(t,f,a)
|
||||
#ifndef SHA1_H
|
||||
#define SHA1_H
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#endif // UINTTYPES_H
|
||||
void sha1(const void *in, unsigned long inlen, void* out);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif // SHA2_H
|
@ -1,6 +1,6 @@
|
||||
/* sha256.h
|
||||
/* sha2.h
|
||||
|
||||
Copyright (c) 2017, LongSoft. All rights reserved.
|
||||
Copyright (c) 2017, 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
|
||||
@ -11,17 +11,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
|
||||
*/
|
||||
|
||||
#ifndef SHA256_H
|
||||
#define SHA256_H
|
||||
#ifndef SHA2_H
|
||||
#define SHA2_H
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define SHA256_DIGEST_SIZE 32
|
||||
|
||||
void sha256(const void *in, unsigned long inlen, void* out);
|
||||
void sha384(const void *in, unsigned long inlen, void* out);
|
||||
void sha512(const void *in, unsigned long inlen, void* out);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif // SHA256_H
|
||||
#endif // SHA2_H
|
279
common/digest/sha256.c
Normal file
279
common/digest/sha256.c
Normal file
@ -0,0 +1,279 @@
|
||||
/* sha256.c
|
||||
|
||||
Copyright (c) 2017, 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
|
||||
http://opensource.org/licenses/bsd-license.php
|
||||
|
||||
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
|
||||
*/
|
||||
|
||||
//
|
||||
// This implementations are based on LibTomCrypt that was released into
|
||||
// public domain by Tom St Denis.
|
||||
//
|
||||
|
||||
#include "sha2.h"
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
|
||||
/* ulong64: 64-bit data type */
|
||||
#ifdef _MSC_VER
|
||||
#define CONST64(n) n ## ui64
|
||||
typedef unsigned __int64 ulong64;
|
||||
#else
|
||||
#define CONST64(n) n ## ULL
|
||||
typedef uint64_t ulong64;
|
||||
#endif
|
||||
|
||||
typedef uint32_t ulong32;
|
||||
|
||||
#define LOAD32H(x, y) \
|
||||
do { x = ((ulong32)((y)[0] & 255)<<24) | \
|
||||
((ulong32)((y)[1] & 255)<<16) | \
|
||||
((ulong32)((y)[2] & 255)<<8) | \
|
||||
((ulong32)((y)[3] & 255)); } while(0)
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(x, y) (((x) < (y)) ? (x) : (y))
|
||||
#endif
|
||||
|
||||
#define RORc(x, y) ( ((((ulong32)(x)&0xFFFFFFFFUL)>>(ulong32)((y)&31)) | ((ulong32)(x)<<(ulong32)((32-((y)&31))&31))) & 0xFFFFFFFFUL)
|
||||
|
||||
#define STORE32H(x, y) \
|
||||
do { (y)[0] = (unsigned char)(((x)>>24)&255); (y)[1] = (unsigned char)(((x)>>16)&255); \
|
||||
(y)[2] = (unsigned char)(((x)>>8)&255); (y)[3] = (unsigned char)((x)&255); } while(0)
|
||||
|
||||
#define STORE64H(x, y) \
|
||||
do { (y)[0] = (unsigned char)(((x)>>56)&255); (y)[1] = (unsigned char)(((x)>>48)&255); \
|
||||
(y)[2] = (unsigned char)(((x)>>40)&255); (y)[3] = (unsigned char)(((x)>>32)&255); \
|
||||
(y)[4] = (unsigned char)(((x)>>24)&255); (y)[5] = (unsigned char)(((x)>>16)&255); \
|
||||
(y)[6] = (unsigned char)(((x)>>8)&255); (y)[7] = (unsigned char)((x)&255); } while(0)
|
||||
|
||||
/* Various logical functions */
|
||||
#define Ch(x,y,z) (z ^ (x & (y ^ z)))
|
||||
#define Maj(x,y,z) (((x | y) & z) | (x & y))
|
||||
#define S(x, n) RORc((x),(n))
|
||||
#define R(x, n) (((x)&0xFFFFFFFFUL)>>(n))
|
||||
#define Sigma0(x) (S(x, 2) ^ S(x, 13) ^ S(x, 22))
|
||||
#define Sigma1(x) (S(x, 6) ^ S(x, 11) ^ S(x, 25))
|
||||
#define Gamma0(x) (S(x, 7) ^ S(x, 18) ^ R(x, 3))
|
||||
#define Gamma1(x) (S(x, 17) ^ S(x, 19) ^ R(x, 10))
|
||||
|
||||
struct sha256_state {
|
||||
ulong64 length;
|
||||
ulong32 state[8], curlen;
|
||||
unsigned char buf[32*2];
|
||||
};
|
||||
|
||||
/* compress 512-bits */
|
||||
static int s_sha256_compress(struct sha256_state * md, const unsigned char *buf)
|
||||
{
|
||||
ulong32 S[8], W[64], t0, t1;
|
||||
int i;
|
||||
|
||||
/* copy state into S */
|
||||
for (i = 0; i < 8; i++) {
|
||||
S[i] = md->state[i];
|
||||
}
|
||||
|
||||
/* copy the state into 512-bits into W[0..15] */
|
||||
for (i = 0; i < 16; i++) {
|
||||
LOAD32H(W[i], buf + (4*i));
|
||||
}
|
||||
|
||||
/* fill W[16..63] */
|
||||
for (i = 16; i < 64; i++) {
|
||||
W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16];
|
||||
}
|
||||
|
||||
/* Compress */
|
||||
#define RND(a,b,c,d,e,f,g,h,i,ki) \
|
||||
t0 = h + Sigma1(e) + Ch(e, f, g) + ki + W[i]; \
|
||||
t1 = Sigma0(a) + Maj(a, b, c); \
|
||||
d += t0; \
|
||||
h = t0 + t1;
|
||||
|
||||
RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],0,0x428a2f98);
|
||||
RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],1,0x71374491);
|
||||
RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],2,0xb5c0fbcf);
|
||||
RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],3,0xe9b5dba5);
|
||||
RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],4,0x3956c25b);
|
||||
RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],5,0x59f111f1);
|
||||
RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],6,0x923f82a4);
|
||||
RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],7,0xab1c5ed5);
|
||||
RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],8,0xd807aa98);
|
||||
RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],9,0x12835b01);
|
||||
RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],10,0x243185be);
|
||||
RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],11,0x550c7dc3);
|
||||
RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],12,0x72be5d74);
|
||||
RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],13,0x80deb1fe);
|
||||
RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],14,0x9bdc06a7);
|
||||
RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],15,0xc19bf174);
|
||||
RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],16,0xe49b69c1);
|
||||
RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],17,0xefbe4786);
|
||||
RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],18,0x0fc19dc6);
|
||||
RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],19,0x240ca1cc);
|
||||
RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],20,0x2de92c6f);
|
||||
RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],21,0x4a7484aa);
|
||||
RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],22,0x5cb0a9dc);
|
||||
RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],23,0x76f988da);
|
||||
RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],24,0x983e5152);
|
||||
RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],25,0xa831c66d);
|
||||
RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],26,0xb00327c8);
|
||||
RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],27,0xbf597fc7);
|
||||
RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],28,0xc6e00bf3);
|
||||
RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],29,0xd5a79147);
|
||||
RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],30,0x06ca6351);
|
||||
RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],31,0x14292967);
|
||||
RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],32,0x27b70a85);
|
||||
RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],33,0x2e1b2138);
|
||||
RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],34,0x4d2c6dfc);
|
||||
RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],35,0x53380d13);
|
||||
RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],36,0x650a7354);
|
||||
RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],37,0x766a0abb);
|
||||
RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],38,0x81c2c92e);
|
||||
RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],39,0x92722c85);
|
||||
RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],40,0xa2bfe8a1);
|
||||
RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],41,0xa81a664b);
|
||||
RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],42,0xc24b8b70);
|
||||
RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],43,0xc76c51a3);
|
||||
RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],44,0xd192e819);
|
||||
RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],45,0xd6990624);
|
||||
RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],46,0xf40e3585);
|
||||
RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],47,0x106aa070);
|
||||
RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],48,0x19a4c116);
|
||||
RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],49,0x1e376c08);
|
||||
RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],50,0x2748774c);
|
||||
RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],51,0x34b0bcb5);
|
||||
RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],52,0x391c0cb3);
|
||||
RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],53,0x4ed8aa4a);
|
||||
RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],54,0x5b9cca4f);
|
||||
RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],55,0x682e6ff3);
|
||||
RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],56,0x748f82ee);
|
||||
RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],57,0x78a5636f);
|
||||
RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],58,0x84c87814);
|
||||
RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],59,0x8cc70208);
|
||||
RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],60,0x90befffa);
|
||||
RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],61,0xa4506ceb);
|
||||
RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],62,0xbef9a3f7);
|
||||
RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],63,0xc67178f2);
|
||||
#undef RND
|
||||
|
||||
/* feedback */
|
||||
for (i = 0; i < 8; i++) {
|
||||
md->state[i] = md->state[i] + S[i];
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sha256_init(struct sha256_state * md)
|
||||
{
|
||||
if (md == NULL) return -1;
|
||||
md->curlen = 0;
|
||||
md->length = 0;
|
||||
md->state[0] = 0x6A09E667UL;
|
||||
md->state[1] = 0xBB67AE85UL;
|
||||
md->state[2] = 0x3C6EF372UL;
|
||||
md->state[3] = 0xA54FF53AUL;
|
||||
md->state[4] = 0x510E527FUL;
|
||||
md->state[5] = 0x9B05688CUL;
|
||||
md->state[6] = 0x1F83D9ABUL;
|
||||
md->state[7] = 0x5BE0CD19UL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sha256_process(struct sha256_state * md, const unsigned char *in, unsigned long inlen)
|
||||
{
|
||||
unsigned long n;
|
||||
int err;
|
||||
if (md == NULL) return -1;
|
||||
if (in == NULL) return -1;
|
||||
if (md->curlen > sizeof(md->buf)) {
|
||||
return -1;
|
||||
}
|
||||
if (((md->length + inlen * 8) < md->length)
|
||||
|| ((inlen * 8) < inlen)) {
|
||||
return -1;
|
||||
}
|
||||
while (inlen > 0) {
|
||||
if (md->curlen == 0 && inlen >= 64) {
|
||||
if ((err = s_sha256_compress(md, in)) != 0) {
|
||||
return err;
|
||||
}
|
||||
md->length += 64 * 8;
|
||||
in += 64;
|
||||
inlen -= 64;
|
||||
} else {
|
||||
n = MIN(inlen, (64 - md->curlen));
|
||||
memcpy(md->buf + md->curlen, in, (size_t)n);
|
||||
md->curlen += n;
|
||||
in += n;
|
||||
inlen -= n;
|
||||
if (md->curlen == 64) {
|
||||
if ((err = s_sha256_compress(md, md->buf)) != 0) {
|
||||
return err;
|
||||
}
|
||||
md->length += 8 * 64;
|
||||
md->curlen = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sha256_done(struct sha256_state * md, unsigned char *out)
|
||||
{
|
||||
int i;
|
||||
|
||||
if (md == NULL) return -1;
|
||||
if (out == NULL) return -1;
|
||||
|
||||
if (md->curlen >= sizeof(md->buf)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* increase the length of the message */
|
||||
md->length += md->curlen * 8;
|
||||
|
||||
/* append the '1' bit */
|
||||
md->buf[md->curlen++] = (unsigned char)0x80;
|
||||
|
||||
/* if the length is currently above 56 bytes we append zeros
|
||||
* then compress. Then we can fall back to padding zeros and length
|
||||
* encoding like normal.
|
||||
*/
|
||||
if (md->curlen > 56) {
|
||||
while (md->curlen < 64) {
|
||||
md->buf[md->curlen++] = (unsigned char)0;
|
||||
}
|
||||
s_sha256_compress(md, md->buf);
|
||||
md->curlen = 0;
|
||||
}
|
||||
|
||||
/* pad upto 56 bytes of zeroes */
|
||||
while (md->curlen < 56) {
|
||||
md->buf[md->curlen++] = (unsigned char)0;
|
||||
}
|
||||
|
||||
/* store length */
|
||||
STORE64H(md->length, md->buf+56);
|
||||
s_sha256_compress(md, md->buf);
|
||||
|
||||
/* copy output */
|
||||
for (i = 0; i < 8; i++) {
|
||||
STORE32H(md->state[i], out+(4*i));
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void sha256(const void *in, unsigned long inlen, void* out)
|
||||
{
|
||||
struct sha256_state ctx;
|
||||
sha256_init(&ctx);
|
||||
sha256_process(&ctx, (const unsigned char*)in, inlen);
|
||||
sha256_done(&ctx, (unsigned char *)out);
|
||||
}
|
312
common/digest/sha512.c
Normal file
312
common/digest/sha512.c
Normal file
@ -0,0 +1,312 @@
|
||||
/* sha512.c
|
||||
|
||||
Copyright (c) 2022, 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
|
||||
http://opensource.org/licenses/bsd-license.php
|
||||
|
||||
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
|
||||
*/
|
||||
|
||||
//
|
||||
// This implementations are based on LibTomCrypt that was released into
|
||||
// public domain by Tom St Denis.
|
||||
//
|
||||
|
||||
#include "sha2.h"
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
|
||||
/* ulong64: 64-bit data type */
|
||||
#ifdef _MSC_VER
|
||||
#define CONST64(n) n ## ui64
|
||||
typedef unsigned __int64 ulong64;
|
||||
typedef __int64 long64;
|
||||
#else
|
||||
#define CONST64(n) n ## ULL
|
||||
typedef unsigned long long ulong64;
|
||||
typedef long long long64;
|
||||
#endif
|
||||
|
||||
#define ROR64c(x, y) \
|
||||
( ((((x)&CONST64(0xFFFFFFFFFFFFFFFF))>>((ulong64)(y)&CONST64(63))) | \
|
||||
((x)<<(((ulong64)64-((y)&63))&63))) & CONST64(0xFFFFFFFFFFFFFFFF))
|
||||
|
||||
#define LOAD64H(x, y) \
|
||||
do { x = (((ulong64)((y)[0] & 255))<<56)|(((ulong64)((y)[1] & 255))<<48) | \
|
||||
(((ulong64)((y)[2] & 255))<<40)|(((ulong64)((y)[3] & 255))<<32) | \
|
||||
(((ulong64)((y)[4] & 255))<<24)|(((ulong64)((y)[5] & 255))<<16) | \
|
||||
(((ulong64)((y)[6] & 255))<<8)|(((ulong64)((y)[7] & 255))); } while(0)
|
||||
|
||||
#define STORE64H(x, y) \
|
||||
do { (y)[0] = (unsigned char)(((x)>>56)&255); (y)[1] = (unsigned char)(((x)>>48)&255); \
|
||||
(y)[2] = (unsigned char)(((x)>>40)&255); (y)[3] = (unsigned char)(((x)>>32)&255); \
|
||||
(y)[4] = (unsigned char)(((x)>>24)&255); (y)[5] = (unsigned char)(((x)>>16)&255); \
|
||||
(y)[6] = (unsigned char)(((x)>>8)&255); (y)[7] = (unsigned char)((x)&255); } while(0)
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(x, y) (((x) < (y)) ? (x) : (y))
|
||||
#endif
|
||||
|
||||
/* the K array */
|
||||
static const ulong64 K[80] = {
|
||||
CONST64(0x428a2f98d728ae22), CONST64(0x7137449123ef65cd),
|
||||
CONST64(0xb5c0fbcfec4d3b2f), CONST64(0xe9b5dba58189dbbc),
|
||||
CONST64(0x3956c25bf348b538), CONST64(0x59f111f1b605d019),
|
||||
CONST64(0x923f82a4af194f9b), CONST64(0xab1c5ed5da6d8118),
|
||||
CONST64(0xd807aa98a3030242), CONST64(0x12835b0145706fbe),
|
||||
CONST64(0x243185be4ee4b28c), CONST64(0x550c7dc3d5ffb4e2),
|
||||
CONST64(0x72be5d74f27b896f), CONST64(0x80deb1fe3b1696b1),
|
||||
CONST64(0x9bdc06a725c71235), CONST64(0xc19bf174cf692694),
|
||||
CONST64(0xe49b69c19ef14ad2), CONST64(0xefbe4786384f25e3),
|
||||
CONST64(0x0fc19dc68b8cd5b5), CONST64(0x240ca1cc77ac9c65),
|
||||
CONST64(0x2de92c6f592b0275), CONST64(0x4a7484aa6ea6e483),
|
||||
CONST64(0x5cb0a9dcbd41fbd4), CONST64(0x76f988da831153b5),
|
||||
CONST64(0x983e5152ee66dfab), CONST64(0xa831c66d2db43210),
|
||||
CONST64(0xb00327c898fb213f), CONST64(0xbf597fc7beef0ee4),
|
||||
CONST64(0xc6e00bf33da88fc2), CONST64(0xd5a79147930aa725),
|
||||
CONST64(0x06ca6351e003826f), CONST64(0x142929670a0e6e70),
|
||||
CONST64(0x27b70a8546d22ffc), CONST64(0x2e1b21385c26c926),
|
||||
CONST64(0x4d2c6dfc5ac42aed), CONST64(0x53380d139d95b3df),
|
||||
CONST64(0x650a73548baf63de), CONST64(0x766a0abb3c77b2a8),
|
||||
CONST64(0x81c2c92e47edaee6), CONST64(0x92722c851482353b),
|
||||
CONST64(0xa2bfe8a14cf10364), CONST64(0xa81a664bbc423001),
|
||||
CONST64(0xc24b8b70d0f89791), CONST64(0xc76c51a30654be30),
|
||||
CONST64(0xd192e819d6ef5218), CONST64(0xd69906245565a910),
|
||||
CONST64(0xf40e35855771202a), CONST64(0x106aa07032bbd1b8),
|
||||
CONST64(0x19a4c116b8d2d0c8), CONST64(0x1e376c085141ab53),
|
||||
CONST64(0x2748774cdf8eeb99), CONST64(0x34b0bcb5e19b48a8),
|
||||
CONST64(0x391c0cb3c5c95a63), CONST64(0x4ed8aa4ae3418acb),
|
||||
CONST64(0x5b9cca4f7763e373), CONST64(0x682e6ff3d6b2b8a3),
|
||||
CONST64(0x748f82ee5defb2fc), CONST64(0x78a5636f43172f60),
|
||||
CONST64(0x84c87814a1f0ab72), CONST64(0x8cc702081a6439ec),
|
||||
CONST64(0x90befffa23631e28), CONST64(0xa4506cebde82bde9),
|
||||
CONST64(0xbef9a3f7b2c67915), CONST64(0xc67178f2e372532b),
|
||||
CONST64(0xca273eceea26619c), CONST64(0xd186b8c721c0c207),
|
||||
CONST64(0xeada7dd6cde0eb1e), CONST64(0xf57d4f7fee6ed178),
|
||||
CONST64(0x06f067aa72176fba), CONST64(0x0a637dc5a2c898a6),
|
||||
CONST64(0x113f9804bef90dae), CONST64(0x1b710b35131c471b),
|
||||
CONST64(0x28db77f523047d84), CONST64(0x32caab7b40c72493),
|
||||
CONST64(0x3c9ebe0a15c9bebc), CONST64(0x431d67c49c100d4c),
|
||||
CONST64(0x4cc5d4becb3e42b6), CONST64(0x597f299cfc657e2a),
|
||||
CONST64(0x5fcb6fab3ad6faec), CONST64(0x6c44198c4a475817)
|
||||
};
|
||||
|
||||
/* Various logical functions */
|
||||
#define Ch(x,y,z) (z ^ (x & (y ^ z)))
|
||||
#define Maj(x,y,z) (((x | y) & z) | (x & y))
|
||||
#define S(x, n) ROR64c(x, n)
|
||||
#define R(x, n) (((x)&CONST64(0xFFFFFFFFFFFFFFFF))>>((ulong64)n))
|
||||
#define Sigma0(x) (S(x, 28) ^ S(x, 34) ^ S(x, 39))
|
||||
#define Sigma1(x) (S(x, 14) ^ S(x, 18) ^ S(x, 41))
|
||||
#define Gamma0(x) (S(x, 1) ^ S(x, 8) ^ R(x, 7))
|
||||
#define Gamma1(x) (S(x, 19) ^ S(x, 61) ^ R(x, 6))
|
||||
|
||||
struct sha512_state {
|
||||
ulong64 length, state[8];
|
||||
unsigned long curlen;
|
||||
unsigned char buf[128];
|
||||
};
|
||||
|
||||
/* compress 1024-bits */
|
||||
static int s_sha512_compress(struct sha512_state * md, const unsigned char *buf)
|
||||
{
|
||||
ulong64 S[8], W[80], t0, t1;
|
||||
int i;
|
||||
|
||||
/* copy state into S */
|
||||
for (i = 0; i < 8; i++) {
|
||||
S[i] = md->state[i];
|
||||
}
|
||||
|
||||
/* copy the state into 1024-bits into W[0..15] */
|
||||
for (i = 0; i < 16; i++) {
|
||||
LOAD64H(W[i], buf + (8*i));
|
||||
}
|
||||
|
||||
/* fill W[16..79] */
|
||||
for (i = 16; i < 80; i++) {
|
||||
W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16];
|
||||
}
|
||||
|
||||
/* Compress */
|
||||
#define RND(a,b,c,d,e,f,g,h,i) \
|
||||
t0 = h + Sigma1(e) + Ch(e, f, g) + K[i] + W[i]; \
|
||||
t1 = Sigma0(a) + Maj(a, b, c); \
|
||||
d += t0; \
|
||||
h = t0 + t1;
|
||||
|
||||
for (i = 0; i < 80; i += 8) {
|
||||
RND(S[0],S[1],S[2],S[3],S[4],S[5],S[6],S[7],i+0);
|
||||
RND(S[7],S[0],S[1],S[2],S[3],S[4],S[5],S[6],i+1);
|
||||
RND(S[6],S[7],S[0],S[1],S[2],S[3],S[4],S[5],i+2);
|
||||
RND(S[5],S[6],S[7],S[0],S[1],S[2],S[3],S[4],i+3);
|
||||
RND(S[4],S[5],S[6],S[7],S[0],S[1],S[2],S[3],i+4);
|
||||
RND(S[3],S[4],S[5],S[6],S[7],S[0],S[1],S[2],i+5);
|
||||
RND(S[2],S[3],S[4],S[5],S[6],S[7],S[0],S[1],i+6);
|
||||
RND(S[1],S[2],S[3],S[4],S[5],S[6],S[7],S[0],i+7);
|
||||
}
|
||||
|
||||
/* feedback */
|
||||
for (i = 0; i < 8; i++) {
|
||||
md->state[i] = md->state[i] + S[i];
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sha512_init(struct sha512_state * md)
|
||||
{
|
||||
if (md == NULL) return -1;
|
||||
md->curlen = 0;
|
||||
md->length = 0;
|
||||
md->state[0] = CONST64(0x6a09e667f3bcc908);
|
||||
md->state[1] = CONST64(0xbb67ae8584caa73b);
|
||||
md->state[2] = CONST64(0x3c6ef372fe94f82b);
|
||||
md->state[3] = CONST64(0xa54ff53a5f1d36f1);
|
||||
md->state[4] = CONST64(0x510e527fade682d1);
|
||||
md->state[5] = CONST64(0x9b05688c2b3e6c1f);
|
||||
md->state[6] = CONST64(0x1f83d9abfb41bd6b);
|
||||
md->state[7] = CONST64(0x5be0cd19137e2179);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sha512_process(struct sha512_state * md, const unsigned char *in, unsigned long inlen)
|
||||
{
|
||||
unsigned long n;
|
||||
int err;
|
||||
if (md == NULL) return -1;
|
||||
if (in == NULL) return -1;
|
||||
if (md->curlen > sizeof(md->buf)) {
|
||||
return -1;
|
||||
}
|
||||
if (((md->length + inlen * 8) < md->length)
|
||||
|| ((inlen * 8) < inlen)) {
|
||||
return -1;
|
||||
}
|
||||
while (inlen > 0) {
|
||||
if (md->curlen == 0 && inlen >= 128) {
|
||||
if ((err = s_sha512_compress(md, in)) != 0) {
|
||||
return err;
|
||||
}
|
||||
md->length += 128 * 8;
|
||||
in += 128;
|
||||
inlen -= 128;
|
||||
} else {
|
||||
n = MIN(inlen, (128 - md->curlen));
|
||||
memcpy(md->buf + md->curlen, in, (size_t)n);
|
||||
md->curlen += n;
|
||||
in += n;
|
||||
inlen -= n;
|
||||
if (md->curlen == 128) {
|
||||
if ((err = s_sha512_compress(md, md->buf)) != 0) {
|
||||
return err;
|
||||
}
|
||||
md->length += 8 * 128;
|
||||
md->curlen = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sha512_done(struct sha512_state * md, unsigned char *out)
|
||||
{
|
||||
int i;
|
||||
|
||||
if (md == NULL) return -1;
|
||||
if (out == NULL) return -1;
|
||||
|
||||
if (md->curlen >= sizeof(md->buf)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* increase the length of the message */
|
||||
md->length += md->curlen * CONST64(8);
|
||||
|
||||
/* append the '1' bit */
|
||||
md->buf[md->curlen++] = (unsigned char)0x80;
|
||||
|
||||
/* if the length is currently above 112 bytes we append zeros
|
||||
* then compress. Then we can fall back to padding zeros and length
|
||||
* encoding like normal.
|
||||
*/
|
||||
if (md->curlen > 112) {
|
||||
while (md->curlen < 128) {
|
||||
md->buf[md->curlen++] = (unsigned char)0;
|
||||
}
|
||||
s_sha512_compress(md, md->buf);
|
||||
md->curlen = 0;
|
||||
}
|
||||
|
||||
/* pad upto 120 bytes of zeroes
|
||||
* note: that from 112 to 120 is the 64 MSB of the length. We assume that you won't hash
|
||||
* > 2^64 bits of data... :-)
|
||||
*/
|
||||
while (md->curlen < 120) {
|
||||
md->buf[md->curlen++] = (unsigned char)0;
|
||||
}
|
||||
|
||||
/* store length */
|
||||
STORE64H(md->length, md->buf+120);
|
||||
s_sha512_compress(md, md->buf);
|
||||
|
||||
/* copy output */
|
||||
for (i = 0; i < 8; i++) {
|
||||
STORE64H(md->state[i], out+(8*i));
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sha384_init(struct sha512_state * md)
|
||||
{
|
||||
if (md == NULL) return -1;
|
||||
|
||||
md->curlen = 0;
|
||||
md->length = 0;
|
||||
md->state[0] = CONST64(0xcbbb9d5dc1059ed8);
|
||||
md->state[1] = CONST64(0x629a292a367cd507);
|
||||
md->state[2] = CONST64(0x9159015a3070dd17);
|
||||
md->state[3] = CONST64(0x152fecd8f70e5939);
|
||||
md->state[4] = CONST64(0x67332667ffc00b31);
|
||||
md->state[5] = CONST64(0x8eb44a8768581511);
|
||||
md->state[6] = CONST64(0xdb0c2e0d64f98fa7);
|
||||
md->state[7] = CONST64(0x47b5481dbefa4fa4);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sha384_done(struct sha512_state * md, unsigned char *out)
|
||||
{
|
||||
unsigned char buf[64];
|
||||
|
||||
if (md == NULL) return -1;
|
||||
if (out == NULL) return -1;;
|
||||
|
||||
if (md->curlen >= sizeof(md->buf)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
sha512_done(md, buf);
|
||||
memcpy(out, buf, 48);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void sha384(const void *in, unsigned long inlen, void* out)
|
||||
{
|
||||
struct sha512_state ctx;
|
||||
sha384_init(&ctx);
|
||||
sha512_process(&ctx, (const unsigned char*)in, inlen);
|
||||
sha384_done(&ctx, (unsigned char *)out);
|
||||
}
|
||||
|
||||
void sha512(const void *in, unsigned long inlen, void* out)
|
||||
{
|
||||
struct sha512_state ctx;
|
||||
sha512_init(&ctx);
|
||||
sha512_process(&ctx, (const unsigned char*)in, inlen);
|
||||
sha512_done(&ctx, (unsigned char *)out);
|
||||
}
|
234
common/digest/sm3.c
Normal file
234
common/digest/sm3.c
Normal file
@ -0,0 +1,234 @@
|
||||
// SPDX-License-Identifier: BSD-2-Clause
|
||||
/*
|
||||
* Copyright (c) 2019 Huawei Technologies Co., Ltd
|
||||
*/
|
||||
#include "sm3.h"
|
||||
#include <string.h>
|
||||
|
||||
struct sm3_context {
|
||||
uint32_t total[2]; /* number of bytes processed */
|
||||
uint32_t state[8]; /* intermediate digest state */
|
||||
uint8_t buffer[64]; /* data block being processed */
|
||||
uint8_t ipad[64]; /* HMAC: inner padding */
|
||||
uint8_t opad[64]; /* HMAC: outer padding */
|
||||
};
|
||||
|
||||
static void sm3_init(struct sm3_context *ctx);
|
||||
static void sm3_update(struct sm3_context *ctx, const uint8_t *input, size_t ilen);
|
||||
static void sm3_final(struct sm3_context *ctx, uint8_t* output);
|
||||
|
||||
#define GET_UINT32_BE(n, b, i) \
|
||||
do { \
|
||||
(n) = ((uint32_t)(b)[(i)] << 24) | \
|
||||
((uint32_t)(b)[(i) + 1] << 16) | \
|
||||
((uint32_t)(b)[(i) + 2] << 8) | \
|
||||
((uint32_t)(b)[(i) + 3]); \
|
||||
} while (0)
|
||||
|
||||
#define PUT_UINT32_BE(n, b, i) \
|
||||
do { \
|
||||
(b)[(i)] = (uint8_t)((n) >> 24); \
|
||||
(b)[(i) + 1] = (uint8_t)((n) >> 16); \
|
||||
(b)[(i) + 2] = (uint8_t)((n) >> 8); \
|
||||
(b)[(i) + 3] = (uint8_t)((n)); \
|
||||
} while (0)
|
||||
|
||||
static void sm3_init(struct sm3_context *ctx)
|
||||
{
|
||||
ctx->total[0] = 0;
|
||||
ctx->total[1] = 0;
|
||||
|
||||
ctx->state[0] = 0x7380166F;
|
||||
ctx->state[1] = 0x4914B2B9;
|
||||
ctx->state[2] = 0x172442D7;
|
||||
ctx->state[3] = 0xDA8A0600;
|
||||
ctx->state[4] = 0xA96F30BC;
|
||||
ctx->state[5] = 0x163138AA;
|
||||
ctx->state[6] = 0xE38DEE4D;
|
||||
ctx->state[7] = 0xB0FB0E4E;
|
||||
}
|
||||
|
||||
static void sm3_process(struct sm3_context *ctx, const uint8_t data[64])
|
||||
{
|
||||
uint32_t SS1, SS2, TT1, TT2, W[68], W1[64];
|
||||
uint32_t A, B, C, D, E, F, G, H;
|
||||
uint32_t T[64];
|
||||
uint32_t Temp1, Temp2, Temp3, Temp4, Temp5;
|
||||
int j;
|
||||
|
||||
for (j = 0; j < 16; j++)
|
||||
T[j] = 0x79CC4519;
|
||||
for (j = 16; j < 64; j++)
|
||||
T[j] = 0x7A879D8A;
|
||||
|
||||
GET_UINT32_BE(W[0], data, 0);
|
||||
GET_UINT32_BE(W[1], data, 4);
|
||||
GET_UINT32_BE(W[2], data, 8);
|
||||
GET_UINT32_BE(W[3], data, 12);
|
||||
GET_UINT32_BE(W[4], data, 16);
|
||||
GET_UINT32_BE(W[5], data, 20);
|
||||
GET_UINT32_BE(W[6], data, 24);
|
||||
GET_UINT32_BE(W[7], data, 28);
|
||||
GET_UINT32_BE(W[8], data, 32);
|
||||
GET_UINT32_BE(W[9], data, 36);
|
||||
GET_UINT32_BE(W[10], data, 40);
|
||||
GET_UINT32_BE(W[11], data, 44);
|
||||
GET_UINT32_BE(W[12], data, 48);
|
||||
GET_UINT32_BE(W[13], data, 52);
|
||||
GET_UINT32_BE(W[14], data, 56);
|
||||
GET_UINT32_BE(W[15], data, 60);
|
||||
|
||||
#define FF0(x, y, z) ((x) ^ (y) ^ (z))
|
||||
#define FF1(x, y, z) (((x) & (y)) | ((x) & (z)) | ((y) & (z)))
|
||||
|
||||
#define GG0(x, y, z) ((x) ^ (y) ^ (z))
|
||||
#define GG1(x, y, z) (((x) & (y)) | ((~(x)) & (z)))
|
||||
|
||||
#define SHL(x, n) ((x) << (n))
|
||||
#define ROTL(x, y) ( (((uint32_t)(x)<<(uint32_t)((y)&31)) | (((uint32_t)(x)&0xFFFFFFFFUL)>>(uint32_t)((32-((y)&31))&31))) & 0xFFFFFFFFUL)
|
||||
|
||||
#define P0(x) ((x) ^ ROTL((x), 9) ^ ROTL((x), 17))
|
||||
#define P1(x) ((x) ^ ROTL((x), 15) ^ ROTL((x), 23))
|
||||
|
||||
for (j = 16; j < 68; j++) {
|
||||
/*
|
||||
* W[j] = P1( W[j-16] ^ W[j-9] ^ ROTL(W[j-3],15)) ^
|
||||
* ROTL(W[j - 13],7 ) ^ W[j-6];
|
||||
*/
|
||||
|
||||
Temp1 = W[j - 16] ^ W[j - 9];
|
||||
Temp2 = ROTL(W[j - 3], 15);
|
||||
Temp3 = Temp1 ^ Temp2;
|
||||
Temp4 = P1(Temp3);
|
||||
Temp5 = ROTL(W[j - 13], 7) ^ W[j - 6];
|
||||
W[j] = Temp4 ^ Temp5;
|
||||
}
|
||||
|
||||
for (j = 0; j < 64; j++)
|
||||
W1[j] = W[j] ^ W[j + 4];
|
||||
|
||||
A = ctx->state[0];
|
||||
B = ctx->state[1];
|
||||
C = ctx->state[2];
|
||||
D = ctx->state[3];
|
||||
E = ctx->state[4];
|
||||
F = ctx->state[5];
|
||||
G = ctx->state[6];
|
||||
H = ctx->state[7];
|
||||
|
||||
for (j = 0; j < 16; j++) {
|
||||
SS1 = ROTL(ROTL(A, 12) + E + ROTL(T[j], j), 7);
|
||||
SS2 = SS1 ^ ROTL(A, 12);
|
||||
TT1 = FF0(A, B, C) + D + SS2 + W1[j];
|
||||
TT2 = GG0(E, F, G) + H + SS1 + W[j];
|
||||
D = C;
|
||||
C = ROTL(B, 9);
|
||||
B = A;
|
||||
A = TT1;
|
||||
H = G;
|
||||
G = ROTL(F, 19);
|
||||
F = E;
|
||||
E = P0(TT2);
|
||||
}
|
||||
|
||||
for (j = 16; j < 64; j++) {
|
||||
SS1 = ROTL(ROTL(A, 12) + E + ROTL(T[j], j), 7);
|
||||
SS2 = SS1 ^ ROTL(A, 12);
|
||||
TT1 = FF1(A, B, C) + D + SS2 + W1[j];
|
||||
TT2 = GG1(E, F, G) + H + SS1 + W[j];
|
||||
D = C;
|
||||
C = ROTL(B, 9);
|
||||
B = A;
|
||||
A = TT1;
|
||||
H = G;
|
||||
G = ROTL(F, 19);
|
||||
F = E;
|
||||
E = P0(TT2);
|
||||
}
|
||||
|
||||
ctx->state[0] ^= A;
|
||||
ctx->state[1] ^= B;
|
||||
ctx->state[2] ^= C;
|
||||
ctx->state[3] ^= D;
|
||||
ctx->state[4] ^= E;
|
||||
ctx->state[5] ^= F;
|
||||
ctx->state[6] ^= G;
|
||||
ctx->state[7] ^= H;
|
||||
}
|
||||
|
||||
static void sm3_update(struct sm3_context *ctx, const uint8_t *input, size_t ilen)
|
||||
{
|
||||
size_t fill;
|
||||
size_t left;
|
||||
|
||||
if (!ilen)
|
||||
return;
|
||||
|
||||
left = ctx->total[0] & 0x3F;
|
||||
fill = 64 - left;
|
||||
|
||||
ctx->total[0] += ilen;
|
||||
|
||||
if (ctx->total[0] < ilen)
|
||||
ctx->total[1]++;
|
||||
|
||||
if (left && ilen >= fill) {
|
||||
memcpy(ctx->buffer + left, input, fill);
|
||||
sm3_process(ctx, ctx->buffer);
|
||||
input += fill;
|
||||
ilen -= fill;
|
||||
left = 0;
|
||||
}
|
||||
|
||||
while (ilen >= 64) {
|
||||
sm3_process(ctx, input);
|
||||
input += 64;
|
||||
ilen -= 64;
|
||||
}
|
||||
|
||||
if (ilen > 0)
|
||||
memcpy(ctx->buffer + left, input, ilen);
|
||||
}
|
||||
|
||||
static const uint8_t sm3_padding[64] = {
|
||||
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
|
||||
};
|
||||
|
||||
static void sm3_final(struct sm3_context *ctx, uint8_t* output)
|
||||
{
|
||||
uint32_t last, padn;
|
||||
uint32_t high, low;
|
||||
uint8_t msglen[8];
|
||||
|
||||
high = (ctx->total[0] >> 29) | (ctx->total[1] << 3);
|
||||
low = ctx->total[0] << 3;
|
||||
|
||||
PUT_UINT32_BE(high, msglen, 0);
|
||||
PUT_UINT32_BE(low, msglen, 4);
|
||||
|
||||
last = ctx->total[0] & 0x3F;
|
||||
padn = (last < 56) ? (56 - last) : (120 - last);
|
||||
|
||||
sm3_update(ctx, sm3_padding, padn);
|
||||
sm3_update(ctx, msglen, 8);
|
||||
|
||||
PUT_UINT32_BE(ctx->state[0], output, 0);
|
||||
PUT_UINT32_BE(ctx->state[1], output, 4);
|
||||
PUT_UINT32_BE(ctx->state[2], output, 8);
|
||||
PUT_UINT32_BE(ctx->state[3], output, 12);
|
||||
PUT_UINT32_BE(ctx->state[4], output, 16);
|
||||
PUT_UINT32_BE(ctx->state[5], output, 20);
|
||||
PUT_UINT32_BE(ctx->state[6], output, 24);
|
||||
PUT_UINT32_BE(ctx->state[7], output, 28);
|
||||
}
|
||||
|
||||
void sm3(const void *in, unsigned long inlen, void* out)
|
||||
{
|
||||
struct sm3_context ctx;
|
||||
sm3_init(&ctx);
|
||||
sm3_update(&ctx, (const uint8_t *)in, (size_t)inlen);
|
||||
sm3_final(&ctx, (uint8_t*)out);
|
||||
}
|
32
common/digest/sm3.h
Normal file
32
common/digest/sm3.h
Normal file
@ -0,0 +1,32 @@
|
||||
/* sm3.h
|
||||
|
||||
Copyright (c) 2022, 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
|
||||
http://opensource.org/licenses/bsd-license.php
|
||||
|
||||
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
|
||||
*/
|
||||
|
||||
/* SPDX-License-Identifier: BSD-2-Clause */
|
||||
/*
|
||||
* Copyright (c) 2019 Huawei Technologies Co., Ltd
|
||||
*/
|
||||
#ifndef SM3_H
|
||||
#define SM3_H
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
|
||||
void sm3(const void *in, unsigned long inlen, void* out);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif /* SM3_H */
|
112
common/ffs.cpp
112
common/ffs.cpp
@ -14,9 +14,100 @@
|
||||
|
||||
#include "ffs.h"
|
||||
#include "guiddatabase.h"
|
||||
#include "ubytearray.h"
|
||||
|
||||
// This is a workaround for the lack of static std::vector initializer before C++11
|
||||
const UByteArray FFSv2VolumesInt[] = {
|
||||
//
|
||||
// GUIDs mentioned in by ffs.h
|
||||
//
|
||||
// Standard FMP capsule GUID
|
||||
extern const UByteArray EFI_FMP_CAPSULE_GUID // 6DCBD5ED-E82D-4C44-BDA1-7194199AD92A
|
||||
("\xED\xD5\xCB\x6D\x2D\xE8\x44\x4C\xBD\xA1\x71\x94\x19\x9A\xD9\x2A", 16);
|
||||
// Standard EFI capsule GUID
|
||||
extern const UByteArray EFI_CAPSULE_GUID // 3B6686BD-0D76-4030-B70E-B5519E2FC5A0
|
||||
("\xBD\x86\x66\x3B\x76\x0D\x30\x40\xB7\x0E\xB5\x51\x9E\x2F\xC5\xA0", 16);
|
||||
// Intel capsule GUID
|
||||
extern const UByteArray INTEL_CAPSULE_GUID // 539182B9-ABB5-4391-B69A-E3A943F72FCC
|
||||
("\xB9\x82\x91\x53\xB5\xAB\x91\x43\xB6\x9A\xE3\xA9\x43\xF7\x2F\xCC", 16);
|
||||
// Lenovo capsule GUID
|
||||
extern const UByteArray LENOVO_CAPSULE_GUID // E20BAFD3-9914-4F4F-9537-3129E090EB3C
|
||||
("\xD3\xAF\x0B\xE2\x14\x99\x4F\x4F\x95\x37\x31\x29\xE0\x90\xEB\x3C", 16);
|
||||
// Another Lenovo capsule GUID
|
||||
extern const UByteArray LENOVO2_CAPSULE_GUID // 25B5FE76-8243-4A5C-A9BD-7EE3246198B5
|
||||
("\x76\xFE\xB5\x25\x43\x82\x5C\x4A\xA9\xBD\x7E\xE3\x24\x61\x98\xB5", 16);
|
||||
// Toshiba capsule GUID
|
||||
extern const UByteArray TOSHIBA_CAPSULE_GUID // 3BE07062-1D51-45D2-832B-F093257ED461
|
||||
("\x62\x70\xE0\x3B\x51\x1D\xD2\x45\x83\x2B\xF0\x93\x25\x7E\xD4\x61", 16);
|
||||
// AMI Aptio signed extended capsule GUID
|
||||
extern const UByteArray APTIO_SIGNED_CAPSULE_GUID // 4A3CA68B-7723-48FB-803D-578CC1FEC44D
|
||||
("\x8B\xA6\x3C\x4A\x23\x77\xFB\x48\x80\x3D\x57\x8C\xC1\xFE\xC4\x4D", 16);
|
||||
// AMI Aptio unsigned extended capsule GUID
|
||||
extern const UByteArray APTIO_UNSIGNED_CAPSULE_GUID // 14EEBB90-890A-43DB-AED1-5D3C4588A418
|
||||
("\x90\xBB\xEE\x14\x0A\x89\xDB\x43\xAE\xD1\x5D\x3C\x45\x88\xA4\x18", 16);
|
||||
// Standard file system GUIDs
|
||||
extern const UByteArray EFI_FIRMWARE_FILE_SYSTEM_GUID // 7A9354D9-0468-444A-81CE-0BF617D890DF
|
||||
("\xD9\x54\x93\x7A\x68\x04\x4A\x44\x81\xCE\x0B\xF6\x17\xD8\x90\xDF", 16);
|
||||
extern const UByteArray EFI_FIRMWARE_FILE_SYSTEM2_GUID // 8C8CE578-8A3D-4F1C-9935-896185C32DD3
|
||||
("\x78\xE5\x8C\x8C\x3D\x8A\x1C\x4F\x99\x35\x89\x61\x85\xC3\x2D\xD3", 16);
|
||||
extern const UByteArray EFI_FIRMWARE_FILE_SYSTEM3_GUID // 5473C07A-3DCB-4DCA-BD6F-1E9689E7349A
|
||||
("\x7A\xC0\x73\x54\xCB\x3D\xCA\x4D\xBD\x6F\x1E\x96\x89\xE7\x34\x9A", 16);
|
||||
// Vendor-specific file system GUIDs
|
||||
extern const UByteArray EFI_APPLE_IMMUTABLE_FV_GUID // 04ADEEAD-61FF-4D31-B6BA-64F8BF901F5A
|
||||
("\xAD\xEE\xAD\x04\xFF\x61\x31\x4D\xB6\xBA\x64\xF8\xBF\x90\x1F\x5A", 16);
|
||||
extern const UByteArray EFI_APPLE_AUTHENTICATION_FV_GUID // BD001B8C-6A71-487B-A14F-0C2A2DCF7A5D
|
||||
("\x8C\x1B\x00\xBD\x71\x6A\x7B\x48\xA1\x4F\x0C\x2A\x2D\xCF\x7A\x5D", 16);
|
||||
extern const UByteArray EFI_APPLE_MICROCODE_VOLUME_GUID // 153D2197-29BD-44DC-AC59-887F70E41A6B
|
||||
("\x97\x21\x3D\x15\xBD\x29\xDC\x44\xAC\x59\x88\x7F\x70\xE4\x1A\x6B", 16);
|
||||
extern const UByteArray EFI_INTEL_FILE_SYSTEM_GUID // AD3FFFFF-D28B-44C4-9F13-9EA98A97F9F0
|
||||
("\xFF\xFF\x3F\xAD\x8B\xD2\xC4\x44\x9F\x13\x9E\xA9\x8A\x97\xF9\xF0", 16);
|
||||
extern const UByteArray EFI_INTEL_FILE_SYSTEM2_GUID // D6A1CD70-4B33-4994-A6EA-375F2CCC5437
|
||||
("\x70\xCD\xA1\xD6\x33\x4B\x94\x49\xA6\xEA\x37\x5F\x2C\xCC\x54\x37", 16);
|
||||
extern const UByteArray EFI_SONY_FILE_SYSTEM_GUID // 4F494156-AED6-4D64-A537-B8A5557BCEEC
|
||||
("\x56\x41\x49\x4F\xD6\xAE\x64\x4D\xA5\x37\xB8\xA5\x55\x7B\xCE\xEC", 16);
|
||||
// PEI apriori file
|
||||
extern const UByteArray EFI_PEI_APRIORI_FILE_GUID // 1B45CC0A-156A-428A-AF62-49864DA0E6E6
|
||||
("\x0A\xCC\x45\x1B\x6A\x15\x8A\x42\xAF\x62\x49\x86\x4D\xA0\xE6\xE6", 16);
|
||||
// DXE apriori file
|
||||
extern const UByteArray EFI_DXE_APRIORI_FILE_GUID // FC510EE7-FFDC-11D4-BD41-0080C73C8881
|
||||
("\xE7\x0E\x51\xFC\xDC\xFF\xD4\x11\xBD\x41\x00\x80\xC7\x3C\x88\x81", 16);
|
||||
// Volume top file
|
||||
extern const UByteArray EFI_FFS_VOLUME_TOP_FILE_GUID // 1BA0062E-C779-4582-8566-336AE8F78F09
|
||||
("\x2E\x06\xA0\x1B\x79\xC7\x82\x45\x85\x66\x33\x6A\xE8\xF7\x8F\x09", 16);
|
||||
// Pad file GUID
|
||||
extern const UByteArray EFI_FFS_PAD_FILE_GUID // E4536585-7909-4A60-B5C6-ECDEA6EBFB5
|
||||
("\x85\x65\x53\xE4\x09\x79\x60\x4A\xB5\xC6\xEC\xDE\xA6\xEB\xFB\x54", 16);
|
||||
// AMI DXE core file
|
||||
extern const UByteArray AMI_CORE_DXE_GUID // 5AE3F37E-4EAE-41AE-8240-35465B5E81EB
|
||||
("\x7E\xF3\xE3\x5A\xAE\x4E\xAE\x41\x82\x40\x35\x46\x5B\x5E\x81\xEB", 16);
|
||||
// EDK2 DXE core file
|
||||
extern const UByteArray EFI_DXE_CORE_GUID // D6A2CB7F-6A18-4E2F-B43B-9920A733700A
|
||||
("\x7F\xCB\xA2\xD6\x18\x6A\x2F\x4E\xB4\x3B\x99\x20\xA7\x33\x70\x0A", 16);
|
||||
// GUIDs of GUID-defined sections
|
||||
extern const UByteArray EFI_GUIDED_SECTION_CRC32 // FC1BCDB0-7D31-49AA-936A-A4600D9DD083
|
||||
("\xB0\xCD\x1B\xFC\x31\x7D\xAA\x49\x93\x6A\xA4\x60\x0D\x9D\xD0\x83", 16);
|
||||
extern const UByteArray EFI_GUIDED_SECTION_TIANO // A31280AD-481E-41B6-95E8-127F4C984779
|
||||
("\xAD\x80\x12\xA3\x1E\x48\xB6\x41\x95\xE8\x12\x7F\x4C\x98\x47\x79", 16);
|
||||
extern const UByteArray EFI_GUIDED_SECTION_LZMA // EE4E5898-3914-4259-9D6E-DC7BD79403CF
|
||||
("\x98\x58\x4E\xEE\x14\x39\x59\x42\x9D\x6E\xDC\x7B\xD7\x94\x03\xCF", 16);
|
||||
extern const UByteArray EFI_GUIDED_SECTION_LZMA_HP // 0ED85E23-F253-413F-A03C-901987B04397
|
||||
("\x23\x5E\xD8\x0E\x53\xF2\x3F\x41\xA0\x3C\x90\x19\x87\xB0\x43\x97", 16);
|
||||
extern const UByteArray EFI_GUIDED_SECTION_LZMAF86 // D42AE6BD-1352-4BFB-909A-CA72A6EAE889
|
||||
("\xBD\xE6\x2A\xD4\x52\x13\xFB\x4B\x90\x9A\xCA\x72\xA6\xEA\xE8\x89", 16);
|
||||
extern const UByteArray EFI_GUIDED_SECTION_GZIP // 1D301FE9-BE79-4353-91C2-D23BC959AE0C
|
||||
("\xE9\x1F\x30\x1D\x79\xBE\x53\x43\x91\xC2\xD2\x3B\xC9\x59\xAE\x0C", 16);
|
||||
extern const UByteArray EFI_FIRMWARE_CONTENTS_SIGNED_GUID // 0F9D89E8-9259-4F76-A5AF-0C89E34023DF
|
||||
("\xE8\x89\x9D\x0F\x59\x92\x76\x4F\xA5\xAF\x0C\x89\xE3\x40\x23\xDF", 16);
|
||||
extern const UByteArray EFI_CERT_TYPE_RSA2048_SHA256_GUID // A7717414-C616-4977-9420-844712A735BF
|
||||
("\x14\x74\x71\xA7\x16\xC6\x77\x49\x94\x20\x84\x47\x12\xA7\x35\xBF");
|
||||
extern const UByteArray EFI_HASH_ALGORITHM_SHA256_GUID // 51AA59DE-FDF2-4EA3-BC63-875FB7842EE9
|
||||
("\xde\x59\xAA\x51\xF2\xFD\xA3\x4E\xBC\x63\x87\x5F\xB7\x84\x2E\xE9");
|
||||
|
||||
// Protected range files
|
||||
extern const UByteArray PROTECTED_RANGE_VENDOR_HASH_FILE_GUID_PHOENIX // 389CC6F2-1EA8-467B-AB8A-78E769AE2A15
|
||||
("\xF2\xC6\x9C\x38\xA8\x1E\x7B\x46\xAB\x8A\x78\xE7\x69\xAE\x2A\x15", 16);
|
||||
extern const UByteArray PROTECTED_RANGE_VENDOR_HASH_FILE_GUID_AMI // CBC91F44-A4BC-4A5B-8696-703451D0B053
|
||||
("\x44\x1F\xC9\xCB\xBC\xA4\x5B\x4A\x86\x96\x70\x34\x51\xD0\xB0\x53", 16);
|
||||
|
||||
const std::vector<UByteArray> FFSv2Volumes({
|
||||
EFI_FIRMWARE_FILE_SYSTEM_GUID,
|
||||
EFI_FIRMWARE_FILE_SYSTEM2_GUID,
|
||||
EFI_APPLE_AUTHENTICATION_FV_GUID,
|
||||
@ -24,12 +115,9 @@ const UByteArray FFSv2VolumesInt[] = {
|
||||
EFI_INTEL_FILE_SYSTEM_GUID,
|
||||
EFI_INTEL_FILE_SYSTEM2_GUID,
|
||||
EFI_SONY_FILE_SYSTEM_GUID
|
||||
};
|
||||
// This number must be updated if the array above is grown
|
||||
#define FFSv2VolumesIntSize 7
|
||||
const std::vector<UByteArray> FFSv2Volumes(FFSv2VolumesInt, FFSv2VolumesInt + FFSv2VolumesIntSize);
|
||||
// Luckily, FFSv3Volumes now only has 1 element
|
||||
const std::vector<UByteArray> FFSv3Volumes(1, EFI_FIRMWARE_FILE_SYSTEM3_GUID);
|
||||
});
|
||||
|
||||
const std::vector<UByteArray> FFSv3Volumes({EFI_FIRMWARE_FILE_SYSTEM3_GUID});
|
||||
|
||||
const UINT8 ffsAlignmentTable[] =
|
||||
{ 0, 4, 7, 9, 10, 12, 15, 16 };
|
||||
@ -118,8 +206,8 @@ UString fileTypeToUString(const UINT8 type)
|
||||
case EFI_FV_FILETYPE_MM_STANDALONE: return UString("MM standalone module");
|
||||
case EFI_FV_FILETYPE_MM_CORE_STANDALONE: return UString("MM standalone core");
|
||||
case EFI_FV_FILETYPE_PAD: return UString("Pad");
|
||||
default: return usprintf("Unknown %u", type);
|
||||
};
|
||||
return usprintf("Unknown %02Xh", type);
|
||||
}
|
||||
|
||||
UString sectionTypeToUString(const UINT8 type)
|
||||
@ -142,8 +230,8 @@ UString sectionTypeToUString(const UINT8 type)
|
||||
case EFI_SECTION_MM_DEPEX: return UString("MM dependency");
|
||||
case INSYDE_SECTION_POSTCODE: return UString("Insyde postcode");
|
||||
case PHOENIX_SECTION_POSTCODE: return UString("Phoenix postcode");
|
||||
default: return usprintf("Unknown %u", type);
|
||||
}
|
||||
return usprintf("Unknown %02Xh", type);
|
||||
}
|
||||
|
||||
UString bpdtEntryTypeToUString(const UINT16 type)
|
||||
@ -179,8 +267,8 @@ UString bpdtEntryTypeToUString(const UINT16 type)
|
||||
case BPDT_ENTRY_TYPE_PCHC: return UString("PCHC");
|
||||
case BPDT_ENTRY_TYPE_SAMF: return UString("SAMF");
|
||||
case BPDT_ENTRY_TYPE_PPHY: return UString("PPHY");
|
||||
default: return usprintf("Unknown %u", type);
|
||||
}
|
||||
return usprintf("Unknown %04Xh", type);
|
||||
}
|
||||
|
||||
UString cpdExtensionTypeToUstring(const UINT32 type)
|
||||
@ -218,6 +306,6 @@ UString cpdExtensionTypeToUstring(const UINT32 type)
|
||||
case CPD_EXT_TYPE_KEY_MANIFEST_EXT: return UString("Extended Key Manifest");
|
||||
case CPD_EXT_TYPE_SIGNED_PACKAGE_INFO_EXT: return UString("Extended Signed Package Info");
|
||||
case CPD_EXT_TYPE_SPS_PLATFORM_ID: return UString("SPS Platform ID");
|
||||
default: return usprintf("Unknown %u", type);
|
||||
}
|
||||
return usprintf("Unknown %08Xh", type);
|
||||
}
|
||||
|
153
common/ffs.h
153
common/ffs.h
@ -45,24 +45,19 @@ typedef struct EFI_CAPSULE_HEADER_ {
|
||||
#define EFI_CAPSULE_HEADER_FLAG_POPULATE_SYSTEM_TABLE 0x00020000
|
||||
|
||||
// Standard FMP capsule GUID
|
||||
const UByteArray EFI_FMP_CAPSULE_GUID // 6DCBD5ED-E82D-4C44-BDA1-7194199AD92A
|
||||
("\xED\xD5\xCB\x6D\x2D\xE8\x44\x4C\xBD\xA1\x71\x94\x19\x9A\xD9\x2A", 16);
|
||||
extern const UByteArray EFI_FMP_CAPSULE_GUID; // 6DCBD5ED-E82D-4C44-BDA1-7194199AD92A
|
||||
|
||||
// Standard EFI capsule GUID
|
||||
const UByteArray EFI_CAPSULE_GUID // 3B6686BD-0D76-4030-B70E-B5519E2FC5A0
|
||||
("\xBD\x86\x66\x3B\x76\x0D\x30\x40\xB7\x0E\xB5\x51\x9E\x2F\xC5\xA0", 16);
|
||||
extern const UByteArray EFI_CAPSULE_GUID; // 3B6686BD-0D76-4030-B70E-B5519E2FC5A0
|
||||
|
||||
// Intel capsule GUID
|
||||
const UByteArray INTEL_CAPSULE_GUID
|
||||
("\xB9\x82\x91\x53\xB5\xAB\x91\x43\xB6\x9A\xE3\xA9\x43\xF7\x2F\xCC", 16);
|
||||
extern const UByteArray INTEL_CAPSULE_GUID; // 539182B9-ABB5-4391-B69A-E3A943F72FCC
|
||||
|
||||
// Lenovo capsule GUID
|
||||
const UByteArray LENOVO_CAPSULE_GUID
|
||||
("\xD3\xAF\x0B\xE2\x14\x99\x4F\x4F\x95\x37\x31\x29\xE0\x90\xEB\x3C", 16);
|
||||
extern const UByteArray LENOVO_CAPSULE_GUID; // E20BAFD3-9914-4F4F-9537-3129E090EB3C
|
||||
|
||||
// Another Lenovo capsule GUID
|
||||
const UByteArray LENOVO2_CAPSULE_GUID
|
||||
("\x76\xFE\xB5\x25\x43\x82\x5C\x4A\xA9\xBD\x7E\xE3\x24\x61\x98\xB5", 16);
|
||||
extern const UByteArray LENOVO2_CAPSULE_GUID; // 25B5FE76-8243-4A5C-A9BD-7EE3246198B5
|
||||
|
||||
// Toshiba EFI Capsule header
|
||||
typedef struct TOSHIBA_CAPSULE_HEADER_ {
|
||||
@ -73,8 +68,7 @@ typedef struct TOSHIBA_CAPSULE_HEADER_ {
|
||||
} TOSHIBA_CAPSULE_HEADER;
|
||||
|
||||
// Toshiba capsule GUID
|
||||
const UByteArray TOSHIBA_CAPSULE_GUID // 3BE07062-1D51-45D2-832B-F093257ED461
|
||||
("\x62\x70\xE0\x3B\x51\x1D\xD2\x45\x83\x2B\xF0\x93\x25\x7E\xD4\x61", 16);
|
||||
extern const UByteArray TOSHIBA_CAPSULE_GUID; // 3BE07062-1D51-45D2-832B-F093257ED461
|
||||
|
||||
// AMI Aptio extended capsule header
|
||||
typedef struct APTIO_CAPSULE_HEADER_ {
|
||||
@ -86,12 +80,10 @@ typedef struct APTIO_CAPSULE_HEADER_ {
|
||||
} APTIO_CAPSULE_HEADER;
|
||||
|
||||
// AMI Aptio signed extended capsule GUID
|
||||
const UByteArray APTIO_SIGNED_CAPSULE_GUID
|
||||
("\x8B\xA6\x3C\x4A\x23\x77\xFB\x48\x80\x3D\x57\x8C\xC1\xFE\xC4\x4D", 16);
|
||||
extern const UByteArray APTIO_SIGNED_CAPSULE_GUID; // 4A3CA68B-7723-48FB-803D-578CC1FEC44D
|
||||
|
||||
// AMI Aptio unsigned extended capsule GUID
|
||||
const UByteArray APTIO_UNSIGNED_CAPSULE_GUID
|
||||
("\x90\xBB\xEE\x14\x0A\x89\xDB\x43\xAE\xD1\x5D\x3C\x45\x88\xA4\x18", 16);
|
||||
extern const UByteArray APTIO_UNSIGNED_CAPSULE_GUID; // 14EEBB90-890A-43DB-AED1-5D3C4588A418
|
||||
|
||||
//*****************************************************************************
|
||||
// EFI Firmware Volume
|
||||
@ -119,34 +111,25 @@ typedef struct EFI_FIRMWARE_VOLUME_HEADER_ {
|
||||
} EFI_FIRMWARE_VOLUME_HEADER;
|
||||
|
||||
// Standard file system GUIDs
|
||||
const UByteArray EFI_FIRMWARE_FILE_SYSTEM_GUID // 7A9354D9-0468-444A-81CE-0BF617D890DF
|
||||
("\xD9\x54\x93\x7A\x68\x04\x4A\x44\x81\xCE\x0B\xF6\x17\xD8\x90\xDF", 16);
|
||||
extern const UByteArray EFI_FIRMWARE_FILE_SYSTEM_GUID; // 7A9354D9-0468-444A-81CE-0BF617D890DF
|
||||
|
||||
const UByteArray EFI_FIRMWARE_FILE_SYSTEM2_GUID // 8C8CE578-8A3D-4F1C-9935-896185C32DD3
|
||||
("\x78\xE5\x8C\x8C\x3D\x8A\x1C\x4F\x99\x35\x89\x61\x85\xC3\x2D\xD3", 16);
|
||||
extern const UByteArray EFI_FIRMWARE_FILE_SYSTEM2_GUID; // 8C8CE578-8A3D-4F1C-9935-896185C32DD3
|
||||
|
||||
const UByteArray EFI_FIRMWARE_FILE_SYSTEM3_GUID // 5473C07A-3DCB-4DCA-BD6F-1E9689E7349A
|
||||
("\x7A\xC0\x73\x54\xCB\x3D\xCA\x4D\xBD\x6F\x1E\x96\x89\xE7\x34\x9A", 16);
|
||||
extern const UByteArray EFI_FIRMWARE_FILE_SYSTEM3_GUID; // 5473C07A-3DCB-4DCA-BD6F-1E9689E7349A
|
||||
|
||||
// Vendor-specific file system GUIDs
|
||||
const UByteArray EFI_APPLE_IMMUTABLE_FV_GUID // 04ADEEAD-61FF-4D31-B6BA-64F8BF901F5A
|
||||
("\xAD\xEE\xAD\x04\xFF\x61\x31\x4D\xB6\xBA\x64\xF8\xBF\x90\x1F\x5A", 16);
|
||||
extern const UByteArray EFI_APPLE_IMMUTABLE_FV_GUID; // 04ADEEAD-61FF-4D31-B6BA-64F8BF901F5A
|
||||
|
||||
const UByteArray EFI_APPLE_AUTHENTICATION_FV_GUID // BD001B8C-6A71-487B-A14F-0C2A2DCF7A5D
|
||||
("\x8C\x1B\x00\xBD\x71\x6A\x7B\x48\xA1\x4F\x0C\x2A\x2D\xCF\x7A\x5D", 16);
|
||||
extern const UByteArray EFI_APPLE_AUTHENTICATION_FV_GUID; // BD001B8C-6A71-487B-A14F-0C2A2DCF7A5D
|
||||
|
||||
const UByteArray EFI_APPLE_MICROCODE_VOLUME_GUID // 153D2197-29BD-44DC-AC59-887F70E41A6B
|
||||
("\x97\x21\x3D\x15\xBD\x29\xDC\x44\xAC\x59\x88\x7F\x70\xE4\x1A\x6B", 16);
|
||||
extern const UByteArray EFI_APPLE_MICROCODE_VOLUME_GUID; // 153D2197-29BD-44DC-AC59-887F70E41A6B
|
||||
#define EFI_APPLE_MICROCODE_VOLUME_HEADER_SIZE 0x100
|
||||
|
||||
const UByteArray EFI_INTEL_FILE_SYSTEM_GUID // AD3FFFFF-D28B-44C4-9F13-9EA98A97F9F0
|
||||
("\xFF\xFF\x3F\xAD\x8B\xD2\xC4\x44\x9F\x13\x9E\xA9\x8A\x97\xF9\xF0", 16);
|
||||
extern const UByteArray EFI_INTEL_FILE_SYSTEM_GUID; // AD3FFFFF-D28B-44C4-9F13-9EA98A97F9F0
|
||||
|
||||
const UByteArray EFI_INTEL_FILE_SYSTEM2_GUID // D6A1CD70-4B33-4994-A6EA-375F2CCC5437
|
||||
("\x70\xCD\xA1\xD6\x33\x4B\x94\x49\xA6\xEA\x37\x5F\x2C\xCC\x54\x37", 16);
|
||||
extern const UByteArray EFI_INTEL_FILE_SYSTEM2_GUID; // D6A1CD70-4B33-4994-A6EA-375F2CCC5437
|
||||
|
||||
const UByteArray EFI_SONY_FILE_SYSTEM_GUID // 4F494156-AED6-4D64-A537-B8A5557BCEEC
|
||||
("\x56\x41\x49\x4F\xD6\xAE\x64\x4D\xA5\x37\xB8\xA5\x55\x7B\xCE\xEC", 16);
|
||||
extern const UByteArray EFI_SONY_FILE_SYSTEM_GUID; // 4F494156-AED6-4D64-A537-B8A5557BCEEC
|
||||
|
||||
// Vector of volume GUIDs with FFSv2-compatible files
|
||||
extern const std::vector<UByteArray> FFSv2Volumes;
|
||||
@ -357,32 +340,22 @@ extern const UINT8 ffsAlignment2Table[];
|
||||
#define EFI_FILE_ERASE_POLARITY 0x80 // Defined as "all other bits must be set to ERASE_POLARITY" in UEFI PI
|
||||
|
||||
// PEI apriori file
|
||||
const UByteArray EFI_PEI_APRIORI_FILE_GUID
|
||||
("\x0A\xCC\x45\x1B\x6A\x15\x8A\x42\xAF\x62\x49\x86\x4D\xA0\xE6\xE6", 16);
|
||||
extern const UByteArray EFI_PEI_APRIORI_FILE_GUID; // 1B45CC0A-156A-428A-AF62-49864DA0E6E6
|
||||
|
||||
// DXE apriori file
|
||||
const UByteArray EFI_DXE_APRIORI_FILE_GUID
|
||||
("\xE7\x0E\x51\xFC\xDC\xFF\xD4\x11\xBD\x41\x00\x80\xC7\x3C\x88\x81", 16);
|
||||
extern const UByteArray EFI_DXE_APRIORI_FILE_GUID; // FC510EE7-FFDC-11D4-BD41-0080C73C8881
|
||||
|
||||
// Volume top file
|
||||
const UByteArray EFI_FFS_VOLUME_TOP_FILE_GUID
|
||||
("\x2E\x06\xA0\x1B\x79\xC7\x82\x45\x85\x66\x33\x6A\xE8\xF7\x8F\x09", 16);
|
||||
extern const UByteArray EFI_FFS_VOLUME_TOP_FILE_GUID; // 1BA0062E-C779-4582-8566-336AE8F78F09
|
||||
|
||||
// Pad file GUID
|
||||
const UByteArray EFI_FFS_PAD_FILE_GUID
|
||||
("\x85\x65\x53\xE4\x09\x79\x60\x4A\xB5\xC6\xEC\xDE\xA6\xEB\xFB\x54", 16);
|
||||
// AMI pad file GUID
|
||||
extern const UByteArray EFI_FFS_PAD_FILE_GUID; // E4536585-7909-4A60-B5C6-ECDEA6EBFB5
|
||||
|
||||
// AMI DXE core file
|
||||
const UByteArray AMI_CORE_DXE_GUID // 5AE3F37E-4EAE-41AE-8240-35465B5E81EB
|
||||
("\x7E\xF3\xE3\x5A\xAE\x4E\xAE\x41\x82\x40\x35\x46\x5B\x5E\x81\xEB", 16);
|
||||
extern const UByteArray AMI_CORE_DXE_GUID; // 5AE3F37E-4EAE-41AE-8240-35465B5E81EB
|
||||
|
||||
// EDK2 DXE code file
|
||||
const UByteArray EFI_DXE_CORE_GUID // D6A2CB7F-6A18-4E2F-B43B-9920A733700A
|
||||
("\x7F\xCB\xA2\xD6\x18\x6A\x2F\x4E\xB4\x3B\x99\x20\xA7\x33\x70\x0A", 16);
|
||||
|
||||
// TXT ACM
|
||||
const UByteArray EFI_TXT_ACM_GUID // 2D27C618-7DCD-41F5-BB10-21166BE7E143
|
||||
("\x18\xC6\x27\x2D\xCD\x7D\xF5\x41\xBB\x10\x21\x16\x6B\xE7\xE1\x43", 16);
|
||||
// EDK2 DXE core file
|
||||
extern const UByteArray EFI_DXE_CORE_GUID; // D6A2CB7F-6A18-4E2F-B43B-9920A733700A
|
||||
|
||||
// FFS size conversion routines
|
||||
extern VOID uint32ToUint24(UINT32 size, UINT8* ffsSize);
|
||||
@ -474,26 +447,13 @@ typedef struct EFI_GUID_DEFINED_SECTION_APPLE_ {
|
||||
#define EFI_GUIDED_SECTION_AUTH_STATUS_VALID 0x02
|
||||
|
||||
// GUIDs of GUID-defined sections
|
||||
const UByteArray EFI_GUIDED_SECTION_CRC32 // FC1BCDB0-7D31-49AA-936A-A4600D9DD083
|
||||
("\xB0\xCD\x1B\xFC\x31\x7D\xAA\x49\x93\x6A\xA4\x60\x0D\x9D\xD0\x83", 16);
|
||||
|
||||
const UByteArray EFI_GUIDED_SECTION_TIANO // A31280AD-481E-41B6-95E8-127F4C984779
|
||||
("\xAD\x80\x12\xA3\x1E\x48\xB6\x41\x95\xE8\x12\x7F\x4C\x98\x47\x79", 16);
|
||||
|
||||
const UByteArray EFI_GUIDED_SECTION_LZMA // EE4E5898-3914-4259-9D6E-DC7BD79403CF
|
||||
("\x98\x58\x4E\xEE\x14\x39\x59\x42\x9D\x6E\xDC\x7B\xD7\x94\x03\xCF", 16);
|
||||
|
||||
const UByteArray EFI_GUIDED_SECTION_LZMA_HP // 0ED85E23-F253-413F-A03C-901987B04397
|
||||
("\x23\x5E\xD8\x0E\x53\xF2\x3F\x41\xA0\x3C\x90\x19\x87\xB0\x43\x97", 16);
|
||||
|
||||
const UByteArray EFI_GUIDED_SECTION_LZMAF86 // D42AE6BD-1352-4BFB-909A-CA72A6EAE889
|
||||
("\xBD\xE6\x2A\xD4\x52\x13\xFB\x4B\x90\x9A\xCA\x72\xA6\xEA\xE8\x89", 16);
|
||||
|
||||
const UByteArray EFI_GUIDED_SECTION_GZIP // 1D301FE9-BE79-4353-91C2-D23BC959AE0C
|
||||
("\xE9\x1F\x30\x1D\x79\xBE\x53\x43\x91\xC2\xD2\x3B\xC9\x59\xAE\x0C", 16);
|
||||
|
||||
const UByteArray EFI_FIRMWARE_CONTENTS_SIGNED_GUID // 0F9D89E8-9259-4F76-A5AF-0C89E34023DF
|
||||
("\xE8\x89\x9D\x0F\x59\x92\x76\x4F\xA5\xAF\x0C\x89\xE3\x40\x23\xDF", 16);
|
||||
extern const UByteArray EFI_GUIDED_SECTION_CRC32; // FC1BCDB0-7D31-49AA-936A-A4600D9DD083
|
||||
extern const UByteArray EFI_GUIDED_SECTION_TIANO; // A31280AD-481E-41B6-95E8-127F4C984779
|
||||
extern const UByteArray EFI_GUIDED_SECTION_LZMA; // EE4E5898-3914-4259-9D6E-DC7BD79403CF
|
||||
extern const UByteArray EFI_GUIDED_SECTION_LZMA_HP; // 0ED85E23-F253-413F-A03C-901987B04397
|
||||
extern const UByteArray EFI_GUIDED_SECTION_LZMAF86; // D42AE6BD-1352-4BFB-909A-CA72A6EAE889
|
||||
extern const UByteArray EFI_GUIDED_SECTION_GZIP; // 1D301FE9-BE79-4353-91C2-D23BC959AE0C
|
||||
extern const UByteArray EFI_FIRMWARE_CONTENTS_SIGNED_GUID; // 0F9D89E8-9259-4F76-A5AF-0C89E34023DF
|
||||
|
||||
//#define WIN_CERT_TYPE_PKCS_SIGNED_DATA 0x0002
|
||||
#define WIN_CERT_TYPE_EFI_GUID 0x0EF1
|
||||
@ -512,8 +472,7 @@ typedef struct WIN_CERTIFICATE_UEFI_GUID_ {
|
||||
} WIN_CERTIFICATE_UEFI_GUID;
|
||||
|
||||
// WIN_CERTIFICATE_UEFI_GUID.CertType
|
||||
const UByteArray EFI_CERT_TYPE_RSA2048_SHA256_GUID // A7717414-C616-4977-9420-844712A735BF
|
||||
("\x14\x74\x71\xA7\x16\xC6\x77\x49\x94\x20\x84\x47\x12\xA7\x35\xBF");
|
||||
extern const UByteArray EFI_CERT_TYPE_RSA2048_SHA256_GUID; // A7717414-C616-4977-9420-844712A735BF
|
||||
|
||||
// WIN_CERTIFICATE_UEFI_GUID.CertData
|
||||
typedef struct EFI_CERT_BLOCK_RSA2048_SHA256_ {
|
||||
@ -522,8 +481,7 @@ typedef struct EFI_CERT_BLOCK_RSA2048_SHA256_ {
|
||||
UINT8 Signature[256];
|
||||
} EFI_CERT_BLOCK_RSA2048_SHA256;
|
||||
|
||||
const UByteArray EFI_HASH_ALGORITHM_SHA256_GUID // 51aa59de-fdf2-4ea3-bc63-875fb7842ee9
|
||||
("\xde\x59\xAA\x51\xF2\xFD\xA3\x4E\xBC\x63\x87\x5F\xB7\x84\x2E\xE9");
|
||||
extern const UByteArray EFI_HASH_ALGORITHM_SHA256_GUID; // 51AA59DE-FDF2-4EA3-BC63-875FB7842EE9
|
||||
|
||||
// Version section
|
||||
typedef struct EFI_VERSION_SECTION_ {
|
||||
@ -811,6 +769,49 @@ typedef struct CPD_EXT_IFWI_PARTITION_MANIFEST_ {
|
||||
UINT8 Reserved[4];
|
||||
} CPD_EXT_IFWI_PARTITION_MANIFEST;
|
||||
|
||||
//*****************************************************************************
|
||||
// Protected range
|
||||
//*****************************************************************************
|
||||
extern const UByteArray PROTECTED_RANGE_VENDOR_HASH_FILE_GUID_PHOENIX; // 389CC6F2-1EA8-467B-AB8A-78E769AE2A15
|
||||
|
||||
#define BG_VENDOR_HASH_FILE_SIGNATURE_PHOENIX 0x4C42544853414824ULL // '$HASHTBL'
|
||||
|
||||
extern const UByteArray PROTECTED_RANGE_VENDOR_HASH_FILE_GUID_AMI; // CBC91F44-A4BC-4A5B-8696-703451D0B053
|
||||
|
||||
typedef struct BG_VENDOR_HASH_FILE_ENTRY
|
||||
{
|
||||
UINT8 Hash[SHA256_HASH_SIZE];
|
||||
UINT32 Base;
|
||||
UINT32 Size;
|
||||
} PROTECTED_RANGE_VENDOR_HASH_FILE_ENTRY;
|
||||
|
||||
typedef struct PROTECTED_RANGE_VENDOR_HASH_FILE_HEADER_PHOENIX_
|
||||
{
|
||||
UINT64 Signature;
|
||||
UINT32 NumEntries;
|
||||
//BG_VENDOR_HASH_FILE_ENTRY Entries[];
|
||||
} PROTECTED_RANGE_VENDOR_HASH_FILE_HEADER_PHOENIX;
|
||||
|
||||
typedef struct PROTECTED_RANGE_VENDOR_HASH_FILE_HEADER_AMI_V1_
|
||||
{
|
||||
UINT8 Hash[SHA256_HASH_SIZE];
|
||||
UINT32 Size;
|
||||
// Base is derived from flash map, will be detected as root volume with DXE core
|
||||
} PROTECTED_RANGE_VENDOR_HASH_FILE_HEADER_AMI_V1;
|
||||
|
||||
typedef struct PROTECTED_RANGE_VENDOR_HASH_FILE_HEADER_AMI_V2_
|
||||
{
|
||||
BG_VENDOR_HASH_FILE_ENTRY Hash0;
|
||||
BG_VENDOR_HASH_FILE_ENTRY Hash1;
|
||||
} PROTECTED_RANGE_VENDOR_HASH_FILE_HEADER_AMI_V2;
|
||||
|
||||
typedef struct PROTECTED_RANGE_VENDOR_HASH_FILE_HEADER_AMI_V3_
|
||||
{
|
||||
UINT8 Hash[SHA256_HASH_SIZE];
|
||||
// UINT32 Base[SOME_HARDCODED_N]
|
||||
// UINT32 Size[SOME_HARDCODED_N];
|
||||
} PROTECTED_RANGE_VENDOR_HASH_FILE_HEADER_AMI_V3;
|
||||
|
||||
// Restore previous packing rules
|
||||
#pragma pack(pop)
|
||||
|
||||
|
1056
common/ffsparser.cpp
1056
common/ffsparser.cpp
File diff suppressed because it is too large
Load Diff
@ -19,23 +19,28 @@ WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
#include "ustring.h"
|
||||
#include "ubytearray.h"
|
||||
#include "treemodel.h"
|
||||
#include "bootguard.h"
|
||||
#include "fit.h"
|
||||
#include "intel_microcode.h"
|
||||
#include "fitparser.h"
|
||||
|
||||
typedef struct BG_PROTECTED_RANGE_ {
|
||||
typedef struct PROTECTED_RANGE_ {
|
||||
UINT32 Offset;
|
||||
UINT32 Size;
|
||||
UINT16 AlgorithmId;
|
||||
UINT8 Type;
|
||||
UINT8 : 8;
|
||||
UByteArray Hash;
|
||||
} BG_PROTECTED_RANGE;
|
||||
} PROTECTED_RANGE;
|
||||
|
||||
#define BG_PROTECTED_RANGE_INTEL_BOOT_GUARD_IBB 0x01
|
||||
#define BG_PROTECTED_RANGE_INTEL_BOOT_GUARD_POST_IBB 0x02
|
||||
#define BG_PROTECTED_RANGE_VENDOR_HASH_PHOENIX 0x03
|
||||
#define BG_PROTECTED_RANGE_VENDOR_HASH_AMI_OLD 0x04
|
||||
#define BG_PROTECTED_RANGE_VENDOR_HASH_AMI_NEW 0x05
|
||||
#define BG_PROTECTED_RANGE_VENDOR_HASH_MICROSOFT 0x06
|
||||
#define PROTECTED_RANGE_INTEL_BOOT_GUARD_IBB 0x01
|
||||
#define PROTECTED_RANGE_INTEL_BOOT_GUARD_POST_IBB 0x02
|
||||
#define PROTECTED_RANGE_INTEL_BOOT_GUARD_OBB 0x03
|
||||
#define PROTECTED_RANGE_VENDOR_HASH_PHOENIX 0x04
|
||||
#define PROTECTED_RANGE_VENDOR_HASH_AMI_V1 0x05
|
||||
#define PROTECTED_RANGE_VENDOR_HASH_AMI_V2 0x06
|
||||
#define PROTECTED_RANGE_VENDOR_HASH_AMI_V3 0x07
|
||||
#define PROTECTED_RANGE_VENDOR_HASH_MICROSOFT_PMDA 0x08
|
||||
|
||||
class FitParser;
|
||||
class NvramParser;
|
||||
class MeParser;
|
||||
|
||||
@ -55,10 +60,10 @@ public:
|
||||
USTATUS parse(const UByteArray &buffer);
|
||||
|
||||
// Obtain parsed FIT table
|
||||
std::vector<std::pair<std::vector<UString>, UModelIndex> > getFitTable() const { return fitTable; }
|
||||
std::vector<std::pair<std::vector<UString>, UModelIndex> > getFitTable() const;
|
||||
|
||||
// Obtain Security Info
|
||||
UString getSecurityInfo() const { return securityInfo; }
|
||||
UString getSecurityInfo() const;
|
||||
|
||||
// Obtain offset/address difference
|
||||
UINT64 getAddressDiff() { return addressDiff; }
|
||||
@ -73,6 +78,7 @@ private:
|
||||
messagesVector.push_back(std::pair<UString, UModelIndex>(message, index));
|
||||
};
|
||||
|
||||
FitParser* fitParser;
|
||||
NvramParser* nvramParser;
|
||||
MeParser* meParser;
|
||||
|
||||
@ -80,18 +86,12 @@ private:
|
||||
UModelIndex lastVtf;
|
||||
UINT32 imageBase;
|
||||
UINT64 addressDiff;
|
||||
std::vector<std::pair<std::vector<UString>, UModelIndex> > fitTable;
|
||||
|
||||
UString securityInfo;
|
||||
bool bgAcmFound;
|
||||
bool bgKeyManifestFound;
|
||||
bool bgBootPolicyFound;
|
||||
UByteArray bgKmHash;
|
||||
UByteArray bgBpHash;
|
||||
UByteArray bgBpDigest;
|
||||
std::vector<BG_PROTECTED_RANGE> bgProtectedRanges;
|
||||
UINT64 bgProtectedRegionsBase;
|
||||
UModelIndex bgDxeCoreIndex;
|
||||
|
||||
std::vector<PROTECTED_RANGE> protectedRanges;
|
||||
UINT64 protectedRegionsBase;
|
||||
UModelIndex dxeCore;
|
||||
|
||||
// First pass
|
||||
USTATUS performFirstPass(const UByteArray & imageFile, UModelIndex & index);
|
||||
@ -149,27 +149,20 @@ private:
|
||||
USTATUS parseIntelMicrocodeHeader(const UByteArray & store, const UINT32 localOffset, const UModelIndex & parent, UModelIndex & index);
|
||||
BOOLEAN microcodeHeaderValid(const INTEL_MICROCODE_HEADER* ucodeHeader);
|
||||
|
||||
USTATUS parseVendorHashFile(const UByteArray & fileGuid, const UModelIndex & index);
|
||||
|
||||
// Second pass
|
||||
USTATUS performSecondPass(const UModelIndex & index);
|
||||
USTATUS addInfoRecursive(const UModelIndex & index);
|
||||
USTATUS checkTeImageBase(const UModelIndex & index);
|
||||
|
||||
USTATUS checkProtectedRanges(const UModelIndex & index);
|
||||
USTATUS markProtectedRangeRecursive(const UModelIndex & index, const BG_PROTECTED_RANGE & range);
|
||||
USTATUS markProtectedRangeRecursive(const UModelIndex & index, const PROTECTED_RANGE & range);
|
||||
|
||||
USTATUS parseResetVectorData();
|
||||
USTATUS parseFit(const UModelIndex & index);
|
||||
USTATUS parseVendorHashFile(const UByteArray & fileGuid, const UModelIndex & index);
|
||||
|
||||
|
||||
#ifdef U_ENABLE_FIT_PARSING_SUPPORT
|
||||
void findFitRecursive(const UModelIndex & index, UModelIndex & found, UINT32 & fitOffset);
|
||||
|
||||
// FIT entries
|
||||
USTATUS parseFitEntryMicrocode(const UByteArray & microcode, const UINT32 localOffset, const UModelIndex & parent, UString & info, UINT32 &realSize);
|
||||
USTATUS parseFitEntryAcm(const UByteArray & acm, const UINT32 localOffset, const UModelIndex & parent, UString & info, UINT32 &realSize);
|
||||
USTATUS parseFitEntryBootGuardKeyManifest(const UByteArray & keyManifest, const UINT32 localOffset, const UModelIndex & parent, UString & info, UINT32 &realSize);
|
||||
USTATUS parseFitEntryBootGuardBootPolicy(const UByteArray & bootPolicy, const UINT32 localOffset, const UModelIndex & parent, UString & info, UINT32 &realSize);
|
||||
USTATUS findNextBootGuardBootPolicyElement(const UByteArray & bootPolicy, const UINT32 elementOffset, UINT32 & nextElementOffset, UINT32 & nextElementSize);
|
||||
friend class FitParser; // Make FFS parsing routines accessible to FitParser
|
||||
#endif
|
||||
|
||||
#ifdef U_ENABLE_NVRAM_PARSING_SUPPORT
|
||||
|
@ -14,7 +14,6 @@
|
||||
#include "ffsreport.h"
|
||||
#include "ffs.h"
|
||||
#include "utility.h"
|
||||
#include "uinttypes.h"
|
||||
|
||||
std::vector<UString> FfsReport::generate()
|
||||
{
|
||||
|
1116
common/fitparser.cpp
Normal file
1116
common/fitparser.cpp
Normal file
File diff suppressed because it is too large
Load Diff
100
common/fitparser.h
Normal file
100
common/fitparser.h
Normal file
@ -0,0 +1,100 @@
|
||||
/* fitparser.h
|
||||
|
||||
Copyright (c) 2022, 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
|
||||
http://opensource.org/licenses/bsd-license.php.
|
||||
|
||||
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
|
||||
*/
|
||||
|
||||
#ifndef FITPARSER_H
|
||||
#define FITPARSER_H
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "basetypes.h"
|
||||
#include "ustring.h"
|
||||
#include "ubytearray.h"
|
||||
#include "treemodel.h"
|
||||
#include "intel_fit.h"
|
||||
#include "intel_microcode.h"
|
||||
#include "ffsparser.h"
|
||||
|
||||
class FfsParser;
|
||||
|
||||
#ifdef U_ENABLE_FIT_PARSING_SUPPORT
|
||||
class FitParser
|
||||
{
|
||||
public:
|
||||
// Default constructor and destructor
|
||||
FitParser(TreeModel* treeModel, FfsParser* parser) : model(treeModel), ffsParser(parser),
|
||||
bgAcmFound(false), bgKeyManifestFound(false), bgBootPolicyFound(false) {}
|
||||
~FitParser() {}
|
||||
|
||||
// Returns messages
|
||||
std::vector<std::pair<UString, UModelIndex> > getMessages() const { return messagesVector; }
|
||||
// Clears messages
|
||||
void clearMessages() { messagesVector.clear(); }
|
||||
|
||||
// Obtain parsed FIT table
|
||||
std::vector<std::pair<std::vector<UString>, UModelIndex> > getFitTable() const { return fitTable; }
|
||||
|
||||
// Obtain security info
|
||||
UString getSecurityInfo() const { return securityInfo; }
|
||||
|
||||
// FIT parsing
|
||||
USTATUS parseFit(const UModelIndex & index);
|
||||
|
||||
private:
|
||||
TreeModel *model;
|
||||
FfsParser *ffsParser;
|
||||
std::vector<std::pair<UString, UModelIndex> > messagesVector;
|
||||
|
||||
std::vector<std::pair<std::vector<UString>, UModelIndex> > fitTable;
|
||||
bool bgAcmFound;
|
||||
bool bgKeyManifestFound;
|
||||
bool bgBootPolicyFound;
|
||||
UByteArray bgKmHash;
|
||||
UByteArray bgBpHashSha256;
|
||||
UByteArray bgBpHashSha384;
|
||||
UString securityInfo;
|
||||
|
||||
void msg(const UString message, const UModelIndex index = UModelIndex()) {
|
||||
messagesVector.push_back(std::pair<UString, UModelIndex>(message, index));
|
||||
}
|
||||
|
||||
void findFitRecursive(const UModelIndex & index, UModelIndex & found, UINT32 & fitOffset);
|
||||
USTATUS parseFitEntryMicrocode(const UByteArray & microcode, const UINT32 localOffset, const UModelIndex & parent, UString & info, UINT32 &realSize);
|
||||
USTATUS parseFitEntryAcm(const UByteArray & acm, const UINT32 localOffset, const UModelIndex & parent, UString & info, UINT32 &realSize);
|
||||
USTATUS parseFitEntryBootGuardKeyManifest(const UByteArray & keyManifest, const UINT32 localOffset, const UModelIndex & parent, UString & info, UINT32 &realSize);
|
||||
USTATUS parseFitEntryBootGuardBootPolicy(const UByteArray & bootPolicy, const UINT32 localOffset, const UModelIndex & parent, UString & info, UINT32 &realSize);
|
||||
};
|
||||
#else // U_ENABLE_FIT_PARSING_SUPPORT
|
||||
class FitParser
|
||||
{
|
||||
public:
|
||||
// Default constructor and destructor
|
||||
FitParser(TreeModel* treeModel, FfsParser* parser) { U_UNUSED_PARAMETER(treeModel); U_UNUSED_PARAMETER(parser); }
|
||||
~FitParser() {}
|
||||
|
||||
// Returns messages
|
||||
std::vector<std::pair<UString, UModelIndex> > getMessages() const { return std::vector<std::pair<UString, UModelIndex> >(); }
|
||||
// Clears messages
|
||||
void clearMessages() {}
|
||||
|
||||
// Obtain parsed FIT table
|
||||
std::vector<std::pair<std::vector<UString>, UModelIndex> > getFitTable() const { return std::vector<std::pair<std::vector<UString>, UModelIndex> >(); }
|
||||
|
||||
// Obtain security info
|
||||
UString getSecurityInfo() const { return UString(); }
|
||||
|
||||
// FIT parsing
|
||||
USTATUS parseFit(const UModelIndex & index) { U_UNUSED_PARAMETER(index); return U_SUCCESS; }
|
||||
};
|
||||
#endif // U_ENABLE_FIT_PARSING_SUPPORT
|
||||
#endif // FITPARSER_H
|
472
common/generated/intel_acbp_v1.cpp
Normal file
472
common/generated/intel_acbp_v1.cpp
Normal file
@ -0,0 +1,472 @@
|
||||
// This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
|
||||
|
||||
#include "intel_acbp_v1.h"
|
||||
#include "../kaitai/exceptions.h"
|
||||
|
||||
intel_acbp_v1_t::intel_acbp_v1_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent, intel_acbp_v1_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = this; (void)p__root;
|
||||
m_elements = 0;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::_read() {
|
||||
m_structure_id = static_cast<intel_acbp_v1_t::structure_ids_t>(m__io->read_u8le());
|
||||
if (!(structure_id() == intel_acbp_v1_t::STRUCTURE_IDS_ACBP)) {
|
||||
throw kaitai::validation_not_equal_error<intel_acbp_v1_t::structure_ids_t>(intel_acbp_v1_t::STRUCTURE_IDS_ACBP, structure_id(), _io(), std::string("/seq/0"));
|
||||
}
|
||||
m_version = m__io->read_u1();
|
||||
{
|
||||
uint8_t _ = version();
|
||||
if (!(_ < 32)) {
|
||||
throw kaitai::validation_expr_error<uint8_t>(version(), _io(), std::string("/seq/1"));
|
||||
}
|
||||
}
|
||||
m_reserved0 = m__io->read_u1();
|
||||
m_bpm_revision = m__io->read_u1();
|
||||
m_bp_svn = m__io->read_u1();
|
||||
m_acm_svn = m__io->read_u1();
|
||||
m_reserved1 = m__io->read_u1();
|
||||
m_nem_data_size = m__io->read_u2le();
|
||||
m_elements = new std::vector<acbp_element_t*>();
|
||||
{
|
||||
int i = 0;
|
||||
acbp_element_t* _;
|
||||
do {
|
||||
_ = new acbp_element_t(m__io, this, m__root);
|
||||
m_elements->push_back(_);
|
||||
i++;
|
||||
} while (!( ((_->header()->structure_id() == intel_acbp_v1_t::STRUCTURE_IDS_PMSG) || (_io()->is_eof())) ));
|
||||
}
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::~intel_acbp_v1_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::_clean_up() {
|
||||
if (m_elements) {
|
||||
for (std::vector<acbp_element_t*>::iterator it = m_elements->begin(); it != m_elements->end(); ++it) {
|
||||
delete *it;
|
||||
}
|
||||
delete m_elements; m_elements = 0;
|
||||
}
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::pmsg_body_t::pmsg_body_t(kaitai::kstream* p__io, intel_acbp_v1_t::acbp_element_t* p__parent, intel_acbp_v1_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
m_public_key = 0;
|
||||
m_signature = 0;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::pmsg_body_t::_read() {
|
||||
m_version = m__io->read_u1();
|
||||
m_key_id = m__io->read_u2le();
|
||||
m_public_key = new public_key_t(m__io, this, m__root);
|
||||
m_sig_scheme = m__io->read_u2le();
|
||||
m_signature = new signature_t(m__io, this, m__root);
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::pmsg_body_t::~pmsg_body_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::pmsg_body_t::_clean_up() {
|
||||
if (m_public_key) {
|
||||
delete m_public_key; m_public_key = 0;
|
||||
}
|
||||
if (m_signature) {
|
||||
delete m_signature; m_signature = 0;
|
||||
}
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::acbp_element_t::acbp_element_t(kaitai::kstream* p__io, intel_acbp_v1_t* p__parent, intel_acbp_v1_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
m_header = 0;
|
||||
m_ibbs_body = 0;
|
||||
m_pmda_body = 0;
|
||||
m_pmsg_body = 0;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::acbp_element_t::_read() {
|
||||
m_header = new common_header_t(m__io, this, m__root);
|
||||
n_ibbs_body = true;
|
||||
if (header()->structure_id() == intel_acbp_v1_t::STRUCTURE_IDS_IBBS) {
|
||||
n_ibbs_body = false;
|
||||
m_ibbs_body = new ibbs_body_t(m__io, this, m__root);
|
||||
}
|
||||
n_pmda_body = true;
|
||||
if (header()->structure_id() == intel_acbp_v1_t::STRUCTURE_IDS_PMDA) {
|
||||
n_pmda_body = false;
|
||||
m_pmda_body = new pmda_body_t(m__io, this, m__root);
|
||||
}
|
||||
n_pmsg_body = true;
|
||||
if (header()->structure_id() == intel_acbp_v1_t::STRUCTURE_IDS_PMSG) {
|
||||
n_pmsg_body = false;
|
||||
m_pmsg_body = new pmsg_body_t(m__io, this, m__root);
|
||||
}
|
||||
n_invalid_body = true;
|
||||
if ( ((header()->structure_id() != intel_acbp_v1_t::STRUCTURE_IDS_PMSG) && (header()->structure_id() != intel_acbp_v1_t::STRUCTURE_IDS_PMDA) && (header()->structure_id() != intel_acbp_v1_t::STRUCTURE_IDS_IBBS)) ) {
|
||||
n_invalid_body = false;
|
||||
m_invalid_body = m__io->read_bytes(0);
|
||||
{
|
||||
std::string _ = invalid_body();
|
||||
if (!(false)) {
|
||||
throw kaitai::validation_expr_error<std::string>(invalid_body(), _io(), std::string("/types/acbp_element/seq/4"));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::acbp_element_t::~acbp_element_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::acbp_element_t::_clean_up() {
|
||||
if (m_header) {
|
||||
delete m_header; m_header = 0;
|
||||
}
|
||||
if (!n_ibbs_body) {
|
||||
if (m_ibbs_body) {
|
||||
delete m_ibbs_body; m_ibbs_body = 0;
|
||||
}
|
||||
}
|
||||
if (!n_pmda_body) {
|
||||
if (m_pmda_body) {
|
||||
delete m_pmda_body; m_pmda_body = 0;
|
||||
}
|
||||
}
|
||||
if (!n_pmsg_body) {
|
||||
if (m_pmsg_body) {
|
||||
delete m_pmsg_body; m_pmsg_body = 0;
|
||||
}
|
||||
}
|
||||
if (!n_invalid_body) {
|
||||
}
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::common_header_t::common_header_t(kaitai::kstream* p__io, intel_acbp_v1_t::acbp_element_t* p__parent, intel_acbp_v1_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::common_header_t::_read() {
|
||||
m_structure_id = static_cast<intel_acbp_v1_t::structure_ids_t>(m__io->read_u8le());
|
||||
m_version = m__io->read_u1();
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::common_header_t::~common_header_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::common_header_t::_clean_up() {
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::signature_t::signature_t(kaitai::kstream* p__io, intel_acbp_v1_t::pmsg_body_t* p__parent, intel_acbp_v1_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::signature_t::_read() {
|
||||
m_version = m__io->read_u1();
|
||||
m_size_bits = m__io->read_u2le();
|
||||
m_hash_algorithm_id = m__io->read_u2le();
|
||||
m_signature = m__io->read_bytes((size_bits() / 8));
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::signature_t::~signature_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::signature_t::_clean_up() {
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::pmda_entry_v1_t::pmda_entry_v1_t(kaitai::kstream* p__io, intel_acbp_v1_t::pmda_body_t* p__parent, intel_acbp_v1_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::pmda_entry_v1_t::_read() {
|
||||
m_base = m__io->read_u4le();
|
||||
m_size = m__io->read_u4le();
|
||||
m_hash = m__io->read_bytes(32);
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::pmda_entry_v1_t::~pmda_entry_v1_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::pmda_entry_v1_t::_clean_up() {
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::ibb_segment_t::ibb_segment_t(kaitai::kstream* p__io, intel_acbp_v1_t::ibbs_body_t* p__parent, intel_acbp_v1_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::ibb_segment_t::_read() {
|
||||
m_reserved = m__io->read_u2le();
|
||||
m_flags = m__io->read_u2le();
|
||||
m_base = m__io->read_u4le();
|
||||
m_size = m__io->read_u4le();
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::ibb_segment_t::~ibb_segment_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::ibb_segment_t::_clean_up() {
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::public_key_t::public_key_t(kaitai::kstream* p__io, intel_acbp_v1_t::pmsg_body_t* p__parent, intel_acbp_v1_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::public_key_t::_read() {
|
||||
m_version = m__io->read_u1();
|
||||
m_size_bits = m__io->read_u2le();
|
||||
m_exponent = m__io->read_u4le();
|
||||
m_modulus = m__io->read_bytes((size_bits() / 8));
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::public_key_t::~public_key_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::public_key_t::_clean_up() {
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::hash_t::hash_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent, intel_acbp_v1_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::hash_t::_read() {
|
||||
m_hash_algorithm_id = m__io->read_u2le();
|
||||
m_len_hash = m__io->read_u2le();
|
||||
m_hash = m__io->read_bytes(32);
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::hash_t::~hash_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::hash_t::_clean_up() {
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::pmda_entry_v2_t::pmda_entry_v2_t(kaitai::kstream* p__io, intel_acbp_v1_t::pmda_body_t* p__parent, intel_acbp_v1_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
m_hash = 0;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::pmda_entry_v2_t::_read() {
|
||||
m_base = m__io->read_u4le();
|
||||
m_size = m__io->read_u4le();
|
||||
m_hash = new hash_t(m__io, this, m__root);
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::pmda_entry_v2_t::~pmda_entry_v2_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::pmda_entry_v2_t::_clean_up() {
|
||||
if (m_hash) {
|
||||
delete m_hash; m_hash = 0;
|
||||
}
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::ibbs_body_t::ibbs_body_t(kaitai::kstream* p__io, intel_acbp_v1_t::acbp_element_t* p__parent, intel_acbp_v1_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
m_reserved = 0;
|
||||
m_post_ibb_hash = 0;
|
||||
m_ibb_hash = 0;
|
||||
m_ibb_segments = 0;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::ibbs_body_t::_read() {
|
||||
m_reserved = new std::vector<uint8_t>();
|
||||
const int l_reserved = 3;
|
||||
for (int i = 0; i < l_reserved; i++) {
|
||||
m_reserved->push_back(m__io->read_u1());
|
||||
}
|
||||
m_flags = m__io->read_u4le();
|
||||
m_mch_bar = m__io->read_u8le();
|
||||
m_vtd_bar = m__io->read_u8le();
|
||||
m_dma_protection_base0 = m__io->read_u4le();
|
||||
m_dma_protection_limit0 = m__io->read_u4le();
|
||||
m_dma_protection_base1 = m__io->read_u8le();
|
||||
m_dma_protection_limit1 = m__io->read_u8le();
|
||||
m_post_ibb_hash = new hash_t(m__io, this, m__root);
|
||||
m_ibb_entry_point = m__io->read_u4le();
|
||||
m_ibb_hash = new hash_t(m__io, this, m__root);
|
||||
m_num_ibb_segments = m__io->read_u1();
|
||||
m_ibb_segments = new std::vector<ibb_segment_t*>();
|
||||
const int l_ibb_segments = num_ibb_segments();
|
||||
for (int i = 0; i < l_ibb_segments; i++) {
|
||||
m_ibb_segments->push_back(new ibb_segment_t(m__io, this, m__root));
|
||||
}
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::ibbs_body_t::~ibbs_body_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::ibbs_body_t::_clean_up() {
|
||||
if (m_reserved) {
|
||||
delete m_reserved; m_reserved = 0;
|
||||
}
|
||||
if (m_post_ibb_hash) {
|
||||
delete m_post_ibb_hash; m_post_ibb_hash = 0;
|
||||
}
|
||||
if (m_ibb_hash) {
|
||||
delete m_ibb_hash; m_ibb_hash = 0;
|
||||
}
|
||||
if (m_ibb_segments) {
|
||||
for (std::vector<ibb_segment_t*>::iterator it = m_ibb_segments->begin(); it != m_ibb_segments->end(); ++it) {
|
||||
delete *it;
|
||||
}
|
||||
delete m_ibb_segments; m_ibb_segments = 0;
|
||||
}
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::pmda_body_t::pmda_body_t(kaitai::kstream* p__io, intel_acbp_v1_t::acbp_element_t* p__parent, intel_acbp_v1_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
m_entries_v1 = 0;
|
||||
m_entries_v2 = 0;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::pmda_body_t::_read() {
|
||||
m_total_size = m__io->read_u2le();
|
||||
m_version = m__io->read_u4le();
|
||||
m_num_entries = m__io->read_u4le();
|
||||
n_entries_v1 = true;
|
||||
if (version() == 1) {
|
||||
n_entries_v1 = false;
|
||||
m_entries_v1 = new std::vector<pmda_entry_v1_t*>();
|
||||
const int l_entries_v1 = num_entries();
|
||||
for (int i = 0; i < l_entries_v1; i++) {
|
||||
m_entries_v1->push_back(new pmda_entry_v1_t(m__io, this, m__root));
|
||||
}
|
||||
}
|
||||
n_entries_v2 = true;
|
||||
if (version() == 2) {
|
||||
n_entries_v2 = false;
|
||||
m_entries_v2 = new std::vector<pmda_entry_v2_t*>();
|
||||
const int l_entries_v2 = num_entries();
|
||||
for (int i = 0; i < l_entries_v2; i++) {
|
||||
m_entries_v2->push_back(new pmda_entry_v2_t(m__io, this, m__root));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
intel_acbp_v1_t::pmda_body_t::~pmda_body_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v1_t::pmda_body_t::_clean_up() {
|
||||
if (!n_entries_v1) {
|
||||
if (m_entries_v1) {
|
||||
for (std::vector<pmda_entry_v1_t*>::iterator it = m_entries_v1->begin(); it != m_entries_v1->end(); ++it) {
|
||||
delete *it;
|
||||
}
|
||||
delete m_entries_v1; m_entries_v1 = 0;
|
||||
}
|
||||
}
|
||||
if (!n_entries_v2) {
|
||||
if (m_entries_v2) {
|
||||
for (std::vector<pmda_entry_v2_t*>::iterator it = m_entries_v2->begin(); it != m_entries_v2->end(); ++it) {
|
||||
delete *it;
|
||||
}
|
||||
delete m_entries_v2; m_entries_v2 = 0;
|
||||
}
|
||||
}
|
||||
}
|
457
common/generated/intel_acbp_v1.h
Normal file
457
common/generated/intel_acbp_v1.h
Normal file
@ -0,0 +1,457 @@
|
||||
#ifndef INTEL_ACBP_V1_H_
|
||||
#define INTEL_ACBP_V1_H_
|
||||
|
||||
// This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
|
||||
|
||||
#include "../kaitai/kaitaistruct.h"
|
||||
#include <stdint.h>
|
||||
#include <vector>
|
||||
|
||||
#if KAITAI_STRUCT_VERSION < 9000L
|
||||
#error "Incompatible Kaitai Struct C++/STL API: version 0.9 or later is required"
|
||||
#endif
|
||||
|
||||
class intel_acbp_v1_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
class pmsg_body_t;
|
||||
class acbp_element_t;
|
||||
class common_header_t;
|
||||
class signature_t;
|
||||
class pmda_entry_v1_t;
|
||||
class ibb_segment_t;
|
||||
class public_key_t;
|
||||
class hash_t;
|
||||
class pmda_entry_v2_t;
|
||||
class ibbs_body_t;
|
||||
class pmda_body_t;
|
||||
|
||||
enum ibb_segment_type_t {
|
||||
IBB_SEGMENT_TYPE_IBB = 0,
|
||||
IBB_SEGMENT_TYPE_NON_IBB = 1
|
||||
};
|
||||
|
||||
enum structure_ids_t {
|
||||
STRUCTURE_IDS_PMDA = 6872283318001360735LL,
|
||||
STRUCTURE_IDS_PMSG = 6872289979495636831LL,
|
||||
STRUCTURE_IDS_ACBP = 6872299801917087583LL,
|
||||
STRUCTURE_IDS_IBBS = 6872303100435717983LL
|
||||
};
|
||||
|
||||
intel_acbp_v1_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent = 0, intel_acbp_v1_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~intel_acbp_v1_t();
|
||||
|
||||
class pmsg_body_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
pmsg_body_t(kaitai::kstream* p__io, intel_acbp_v1_t::acbp_element_t* p__parent = 0, intel_acbp_v1_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~pmsg_body_t();
|
||||
|
||||
private:
|
||||
uint8_t m_version;
|
||||
uint16_t m_key_id;
|
||||
public_key_t* m_public_key;
|
||||
uint16_t m_sig_scheme;
|
||||
signature_t* m_signature;
|
||||
intel_acbp_v1_t* m__root;
|
||||
intel_acbp_v1_t::acbp_element_t* m__parent;
|
||||
|
||||
public:
|
||||
uint8_t version() const { return m_version; }
|
||||
uint16_t key_id() const { return m_key_id; }
|
||||
public_key_t* public_key() const { return m_public_key; }
|
||||
uint16_t sig_scheme() const { return m_sig_scheme; }
|
||||
signature_t* signature() const { return m_signature; }
|
||||
intel_acbp_v1_t* _root() const { return m__root; }
|
||||
intel_acbp_v1_t::acbp_element_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class acbp_element_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
acbp_element_t(kaitai::kstream* p__io, intel_acbp_v1_t* p__parent = 0, intel_acbp_v1_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~acbp_element_t();
|
||||
|
||||
private:
|
||||
common_header_t* m_header;
|
||||
ibbs_body_t* m_ibbs_body;
|
||||
bool n_ibbs_body;
|
||||
|
||||
public:
|
||||
bool _is_null_ibbs_body() { ibbs_body(); return n_ibbs_body; };
|
||||
|
||||
private:
|
||||
pmda_body_t* m_pmda_body;
|
||||
bool n_pmda_body;
|
||||
|
||||
public:
|
||||
bool _is_null_pmda_body() { pmda_body(); return n_pmda_body; };
|
||||
|
||||
private:
|
||||
pmsg_body_t* m_pmsg_body;
|
||||
bool n_pmsg_body;
|
||||
|
||||
public:
|
||||
bool _is_null_pmsg_body() { pmsg_body(); return n_pmsg_body; };
|
||||
|
||||
private:
|
||||
std::string m_invalid_body;
|
||||
bool n_invalid_body;
|
||||
|
||||
public:
|
||||
bool _is_null_invalid_body() { invalid_body(); return n_invalid_body; };
|
||||
|
||||
private:
|
||||
intel_acbp_v1_t* m__root;
|
||||
intel_acbp_v1_t* m__parent;
|
||||
|
||||
public:
|
||||
common_header_t* header() const { return m_header; }
|
||||
ibbs_body_t* ibbs_body() const { return m_ibbs_body; }
|
||||
pmda_body_t* pmda_body() const { return m_pmda_body; }
|
||||
pmsg_body_t* pmsg_body() const { return m_pmsg_body; }
|
||||
std::string invalid_body() const { return m_invalid_body; }
|
||||
intel_acbp_v1_t* _root() const { return m__root; }
|
||||
intel_acbp_v1_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class common_header_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
common_header_t(kaitai::kstream* p__io, intel_acbp_v1_t::acbp_element_t* p__parent = 0, intel_acbp_v1_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~common_header_t();
|
||||
|
||||
private:
|
||||
structure_ids_t m_structure_id;
|
||||
uint8_t m_version;
|
||||
intel_acbp_v1_t* m__root;
|
||||
intel_acbp_v1_t::acbp_element_t* m__parent;
|
||||
|
||||
public:
|
||||
structure_ids_t structure_id() const { return m_structure_id; }
|
||||
uint8_t version() const { return m_version; }
|
||||
intel_acbp_v1_t* _root() const { return m__root; }
|
||||
intel_acbp_v1_t::acbp_element_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class signature_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
signature_t(kaitai::kstream* p__io, intel_acbp_v1_t::pmsg_body_t* p__parent = 0, intel_acbp_v1_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~signature_t();
|
||||
|
||||
private:
|
||||
uint8_t m_version;
|
||||
uint16_t m_size_bits;
|
||||
uint16_t m_hash_algorithm_id;
|
||||
std::string m_signature;
|
||||
intel_acbp_v1_t* m__root;
|
||||
intel_acbp_v1_t::pmsg_body_t* m__parent;
|
||||
|
||||
public:
|
||||
uint8_t version() const { return m_version; }
|
||||
uint16_t size_bits() const { return m_size_bits; }
|
||||
uint16_t hash_algorithm_id() const { return m_hash_algorithm_id; }
|
||||
std::string signature() const { return m_signature; }
|
||||
intel_acbp_v1_t* _root() const { return m__root; }
|
||||
intel_acbp_v1_t::pmsg_body_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class pmda_entry_v1_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
pmda_entry_v1_t(kaitai::kstream* p__io, intel_acbp_v1_t::pmda_body_t* p__parent = 0, intel_acbp_v1_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~pmda_entry_v1_t();
|
||||
|
||||
private:
|
||||
uint32_t m_base;
|
||||
uint32_t m_size;
|
||||
std::string m_hash;
|
||||
intel_acbp_v1_t* m__root;
|
||||
intel_acbp_v1_t::pmda_body_t* m__parent;
|
||||
|
||||
public:
|
||||
uint32_t base() const { return m_base; }
|
||||
uint32_t size() const { return m_size; }
|
||||
std::string hash() const { return m_hash; }
|
||||
intel_acbp_v1_t* _root() const { return m__root; }
|
||||
intel_acbp_v1_t::pmda_body_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class ibb_segment_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
ibb_segment_t(kaitai::kstream* p__io, intel_acbp_v1_t::ibbs_body_t* p__parent = 0, intel_acbp_v1_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~ibb_segment_t();
|
||||
|
||||
private:
|
||||
uint16_t m_reserved;
|
||||
uint16_t m_flags;
|
||||
uint32_t m_base;
|
||||
uint32_t m_size;
|
||||
intel_acbp_v1_t* m__root;
|
||||
intel_acbp_v1_t::ibbs_body_t* m__parent;
|
||||
|
||||
public:
|
||||
uint16_t reserved() const { return m_reserved; }
|
||||
uint16_t flags() const { return m_flags; }
|
||||
uint32_t base() const { return m_base; }
|
||||
uint32_t size() const { return m_size; }
|
||||
intel_acbp_v1_t* _root() const { return m__root; }
|
||||
intel_acbp_v1_t::ibbs_body_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class public_key_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
public_key_t(kaitai::kstream* p__io, intel_acbp_v1_t::pmsg_body_t* p__parent = 0, intel_acbp_v1_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~public_key_t();
|
||||
|
||||
private:
|
||||
uint8_t m_version;
|
||||
uint16_t m_size_bits;
|
||||
uint32_t m_exponent;
|
||||
std::string m_modulus;
|
||||
intel_acbp_v1_t* m__root;
|
||||
intel_acbp_v1_t::pmsg_body_t* m__parent;
|
||||
|
||||
public:
|
||||
uint8_t version() const { return m_version; }
|
||||
uint16_t size_bits() const { return m_size_bits; }
|
||||
uint32_t exponent() const { return m_exponent; }
|
||||
std::string modulus() const { return m_modulus; }
|
||||
intel_acbp_v1_t* _root() const { return m__root; }
|
||||
intel_acbp_v1_t::pmsg_body_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class hash_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
hash_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent = 0, intel_acbp_v1_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~hash_t();
|
||||
|
||||
private:
|
||||
uint16_t m_hash_algorithm_id;
|
||||
uint16_t m_len_hash;
|
||||
std::string m_hash;
|
||||
intel_acbp_v1_t* m__root;
|
||||
kaitai::kstruct* m__parent;
|
||||
|
||||
public:
|
||||
uint16_t hash_algorithm_id() const { return m_hash_algorithm_id; }
|
||||
uint16_t len_hash() const { return m_len_hash; }
|
||||
std::string hash() const { return m_hash; }
|
||||
intel_acbp_v1_t* _root() const { return m__root; }
|
||||
kaitai::kstruct* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class pmda_entry_v2_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
pmda_entry_v2_t(kaitai::kstream* p__io, intel_acbp_v1_t::pmda_body_t* p__parent = 0, intel_acbp_v1_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~pmda_entry_v2_t();
|
||||
|
||||
private:
|
||||
uint32_t m_base;
|
||||
uint32_t m_size;
|
||||
hash_t* m_hash;
|
||||
intel_acbp_v1_t* m__root;
|
||||
intel_acbp_v1_t::pmda_body_t* m__parent;
|
||||
|
||||
public:
|
||||
uint32_t base() const { return m_base; }
|
||||
uint32_t size() const { return m_size; }
|
||||
hash_t* hash() const { return m_hash; }
|
||||
intel_acbp_v1_t* _root() const { return m__root; }
|
||||
intel_acbp_v1_t::pmda_body_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class ibbs_body_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
ibbs_body_t(kaitai::kstream* p__io, intel_acbp_v1_t::acbp_element_t* p__parent = 0, intel_acbp_v1_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~ibbs_body_t();
|
||||
|
||||
private:
|
||||
std::vector<uint8_t>* m_reserved;
|
||||
uint32_t m_flags;
|
||||
uint64_t m_mch_bar;
|
||||
uint64_t m_vtd_bar;
|
||||
uint32_t m_dma_protection_base0;
|
||||
uint32_t m_dma_protection_limit0;
|
||||
uint64_t m_dma_protection_base1;
|
||||
uint64_t m_dma_protection_limit1;
|
||||
hash_t* m_post_ibb_hash;
|
||||
uint32_t m_ibb_entry_point;
|
||||
hash_t* m_ibb_hash;
|
||||
uint8_t m_num_ibb_segments;
|
||||
std::vector<ibb_segment_t*>* m_ibb_segments;
|
||||
intel_acbp_v1_t* m__root;
|
||||
intel_acbp_v1_t::acbp_element_t* m__parent;
|
||||
|
||||
public:
|
||||
std::vector<uint8_t>* reserved() const { return m_reserved; }
|
||||
uint32_t flags() const { return m_flags; }
|
||||
uint64_t mch_bar() const { return m_mch_bar; }
|
||||
uint64_t vtd_bar() const { return m_vtd_bar; }
|
||||
uint32_t dma_protection_base0() const { return m_dma_protection_base0; }
|
||||
uint32_t dma_protection_limit0() const { return m_dma_protection_limit0; }
|
||||
uint64_t dma_protection_base1() const { return m_dma_protection_base1; }
|
||||
uint64_t dma_protection_limit1() const { return m_dma_protection_limit1; }
|
||||
hash_t* post_ibb_hash() const { return m_post_ibb_hash; }
|
||||
uint32_t ibb_entry_point() const { return m_ibb_entry_point; }
|
||||
hash_t* ibb_hash() const { return m_ibb_hash; }
|
||||
uint8_t num_ibb_segments() const { return m_num_ibb_segments; }
|
||||
std::vector<ibb_segment_t*>* ibb_segments() const { return m_ibb_segments; }
|
||||
intel_acbp_v1_t* _root() const { return m__root; }
|
||||
intel_acbp_v1_t::acbp_element_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class pmda_body_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
pmda_body_t(kaitai::kstream* p__io, intel_acbp_v1_t::acbp_element_t* p__parent = 0, intel_acbp_v1_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~pmda_body_t();
|
||||
|
||||
private:
|
||||
uint16_t m_total_size;
|
||||
uint32_t m_version;
|
||||
uint32_t m_num_entries;
|
||||
std::vector<pmda_entry_v1_t*>* m_entries_v1;
|
||||
bool n_entries_v1;
|
||||
|
||||
public:
|
||||
bool _is_null_entries_v1() { entries_v1(); return n_entries_v1; };
|
||||
|
||||
private:
|
||||
std::vector<pmda_entry_v2_t*>* m_entries_v2;
|
||||
bool n_entries_v2;
|
||||
|
||||
public:
|
||||
bool _is_null_entries_v2() { entries_v2(); return n_entries_v2; };
|
||||
|
||||
private:
|
||||
intel_acbp_v1_t* m__root;
|
||||
intel_acbp_v1_t::acbp_element_t* m__parent;
|
||||
|
||||
public:
|
||||
uint16_t total_size() const { return m_total_size; }
|
||||
uint32_t version() const { return m_version; }
|
||||
uint32_t num_entries() const { return m_num_entries; }
|
||||
std::vector<pmda_entry_v1_t*>* entries_v1() const { return m_entries_v1; }
|
||||
std::vector<pmda_entry_v2_t*>* entries_v2() const { return m_entries_v2; }
|
||||
intel_acbp_v1_t* _root() const { return m__root; }
|
||||
intel_acbp_v1_t::acbp_element_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
private:
|
||||
structure_ids_t m_structure_id;
|
||||
uint8_t m_version;
|
||||
uint8_t m_reserved0;
|
||||
uint8_t m_bpm_revision;
|
||||
uint8_t m_bp_svn;
|
||||
uint8_t m_acm_svn;
|
||||
uint8_t m_reserved1;
|
||||
uint16_t m_nem_data_size;
|
||||
std::vector<acbp_element_t*>* m_elements;
|
||||
intel_acbp_v1_t* m__root;
|
||||
kaitai::kstruct* m__parent;
|
||||
|
||||
public:
|
||||
structure_ids_t structure_id() const { return m_structure_id; }
|
||||
uint8_t version() const { return m_version; }
|
||||
uint8_t reserved0() const { return m_reserved0; }
|
||||
uint8_t bpm_revision() const { return m_bpm_revision; }
|
||||
uint8_t bp_svn() const { return m_bp_svn; }
|
||||
uint8_t acm_svn() const { return m_acm_svn; }
|
||||
uint8_t reserved1() const { return m_reserved1; }
|
||||
uint16_t nem_data_size() const { return m_nem_data_size; }
|
||||
std::vector<acbp_element_t*>* elements() const { return m_elements; }
|
||||
intel_acbp_v1_t* _root() const { return m__root; }
|
||||
kaitai::kstruct* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
#endif // INTEL_ACBP_V1_H_
|
443
common/generated/intel_acbp_v2.cpp
Normal file
443
common/generated/intel_acbp_v2.cpp
Normal file
@ -0,0 +1,443 @@
|
||||
// This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
|
||||
|
||||
#include "intel_acbp_v2.h"
|
||||
#include "../kaitai/exceptions.h"
|
||||
|
||||
intel_acbp_v2_t::intel_acbp_v2_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent, intel_acbp_v2_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = this; (void)p__root;
|
||||
m_elements = 0;
|
||||
m_key_signature = 0;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::_read() {
|
||||
m_structure_id = static_cast<intel_acbp_v2_t::structure_ids_t>(m__io->read_u8le());
|
||||
if (!(structure_id() == intel_acbp_v2_t::STRUCTURE_IDS_ACBP)) {
|
||||
throw kaitai::validation_not_equal_error<intel_acbp_v2_t::structure_ids_t>(intel_acbp_v2_t::STRUCTURE_IDS_ACBP, structure_id(), _io(), std::string("/seq/0"));
|
||||
}
|
||||
m_version = m__io->read_u1();
|
||||
{
|
||||
uint8_t _ = version();
|
||||
if (!(_ >= 32)) {
|
||||
throw kaitai::validation_expr_error<uint8_t>(version(), _io(), std::string("/seq/1"));
|
||||
}
|
||||
}
|
||||
m_header_specific = m__io->read_u1();
|
||||
m_total_size = m__io->read_u2le();
|
||||
if (!(total_size() == 20)) {
|
||||
throw kaitai::validation_not_equal_error<uint16_t>(20, total_size(), _io(), std::string("/seq/3"));
|
||||
}
|
||||
m_key_signature_offset = m__io->read_u2le();
|
||||
m_bpm_revision = m__io->read_u1();
|
||||
m_bp_svn = m__io->read_u1();
|
||||
m_acm_svn = m__io->read_u1();
|
||||
m_reserved = m__io->read_u1();
|
||||
m_nem_data_size = m__io->read_u2le();
|
||||
m_elements = new std::vector<acbp_element_t*>();
|
||||
{
|
||||
int i = 0;
|
||||
acbp_element_t* _;
|
||||
do {
|
||||
_ = new acbp_element_t(m__io, this, m__root);
|
||||
m_elements->push_back(_);
|
||||
i++;
|
||||
} while (!( ((_->header()->total_size() == 0) || (_->header()->structure_id() == intel_acbp_v2_t::STRUCTURE_IDS_PMSG)) ));
|
||||
}
|
||||
m_key_signature = new key_signature_t(m__io, this, m__root);
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::~intel_acbp_v2_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::_clean_up() {
|
||||
if (m_elements) {
|
||||
for (std::vector<acbp_element_t*>::iterator it = m_elements->begin(); it != m_elements->end(); ++it) {
|
||||
delete *it;
|
||||
}
|
||||
delete m_elements; m_elements = 0;
|
||||
}
|
||||
if (m_key_signature) {
|
||||
delete m_key_signature; m_key_signature = 0;
|
||||
}
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::acbp_element_t::acbp_element_t(kaitai::kstream* p__io, intel_acbp_v2_t* p__parent, intel_acbp_v2_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
m_header = 0;
|
||||
m_ibbs_body = 0;
|
||||
m_pmda_body = 0;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::acbp_element_t::_read() {
|
||||
m_header = new header_t(m__io, this, m__root);
|
||||
n_ibbs_body = true;
|
||||
if ( ((header()->structure_id() == intel_acbp_v2_t::STRUCTURE_IDS_IBBS) && (header()->total_size() >= 12)) ) {
|
||||
n_ibbs_body = false;
|
||||
m_ibbs_body = new ibbs_body_t(m__io, this, m__root);
|
||||
}
|
||||
n_pmda_body = true;
|
||||
if ( ((header()->structure_id() == intel_acbp_v2_t::STRUCTURE_IDS_PMDA) && (header()->total_size() >= 12)) ) {
|
||||
n_pmda_body = false;
|
||||
m_pmda_body = new pmda_body_t(m__io, this, m__root);
|
||||
}
|
||||
n_generic_body = true;
|
||||
if ( ((header()->structure_id() != intel_acbp_v2_t::STRUCTURE_IDS_IBBS) && (header()->structure_id() != intel_acbp_v2_t::STRUCTURE_IDS_PMDA) && (header()->total_size() >= 12)) ) {
|
||||
n_generic_body = false;
|
||||
m_generic_body = m__io->read_bytes((header()->total_size() - 12));
|
||||
}
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::acbp_element_t::~acbp_element_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::acbp_element_t::_clean_up() {
|
||||
if (m_header) {
|
||||
delete m_header; m_header = 0;
|
||||
}
|
||||
if (!n_ibbs_body) {
|
||||
if (m_ibbs_body) {
|
||||
delete m_ibbs_body; m_ibbs_body = 0;
|
||||
}
|
||||
}
|
||||
if (!n_pmda_body) {
|
||||
if (m_pmda_body) {
|
||||
delete m_pmda_body; m_pmda_body = 0;
|
||||
}
|
||||
}
|
||||
if (!n_generic_body) {
|
||||
}
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::key_signature_t::key_signature_t(kaitai::kstream* p__io, intel_acbp_v2_t* p__parent, intel_acbp_v2_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
m_public_key = 0;
|
||||
m_signature = 0;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::key_signature_t::_read() {
|
||||
m_version = m__io->read_u1();
|
||||
m_key_id = m__io->read_u2le();
|
||||
m_public_key = new public_key_t(m__io, this, m__root);
|
||||
m_sig_scheme = m__io->read_u2le();
|
||||
m_signature = new signature_t(m__io, this, m__root);
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::key_signature_t::~key_signature_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::key_signature_t::_clean_up() {
|
||||
if (m_public_key) {
|
||||
delete m_public_key; m_public_key = 0;
|
||||
}
|
||||
if (m_signature) {
|
||||
delete m_signature; m_signature = 0;
|
||||
}
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::signature_t::signature_t(kaitai::kstream* p__io, intel_acbp_v2_t::key_signature_t* p__parent, intel_acbp_v2_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::signature_t::_read() {
|
||||
m_version = m__io->read_u1();
|
||||
m_size_bits = m__io->read_u2le();
|
||||
m_hash_algorithm_id = m__io->read_u2le();
|
||||
m_signature = m__io->read_bytes((size_bits() / 8));
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::signature_t::~signature_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::signature_t::_clean_up() {
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::ibb_segment_t::ibb_segment_t(kaitai::kstream* p__io, intel_acbp_v2_t::ibbs_body_t* p__parent, intel_acbp_v2_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::ibb_segment_t::_read() {
|
||||
m_reserved = m__io->read_u2le();
|
||||
m_flags = m__io->read_u2le();
|
||||
m_base = m__io->read_u4le();
|
||||
m_size = m__io->read_u4le();
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::ibb_segment_t::~ibb_segment_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::ibb_segment_t::_clean_up() {
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::public_key_t::public_key_t(kaitai::kstream* p__io, intel_acbp_v2_t::key_signature_t* p__parent, intel_acbp_v2_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::public_key_t::_read() {
|
||||
m_version = m__io->read_u1();
|
||||
m_size_bits = m__io->read_u2le();
|
||||
m_exponent = m__io->read_u4le();
|
||||
m_modulus = m__io->read_bytes((size_bits() / 8));
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::public_key_t::~public_key_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::public_key_t::_clean_up() {
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::hash_t::hash_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent, intel_acbp_v2_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::hash_t::_read() {
|
||||
m_hash_algorithm_id = m__io->read_u2le();
|
||||
m_len_hash = m__io->read_u2le();
|
||||
m_hash = m__io->read_bytes(len_hash());
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::hash_t::~hash_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::hash_t::_clean_up() {
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::header_t::header_t(kaitai::kstream* p__io, intel_acbp_v2_t::acbp_element_t* p__parent, intel_acbp_v2_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::header_t::_read() {
|
||||
m_structure_id = static_cast<intel_acbp_v2_t::structure_ids_t>(m__io->read_u8le());
|
||||
m_version = m__io->read_u1();
|
||||
m_header_specific = m__io->read_u1();
|
||||
m_total_size = m__io->read_u2le();
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::header_t::~header_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::header_t::_clean_up() {
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::pmda_entry_v3_t::pmda_entry_v3_t(kaitai::kstream* p__io, intel_acbp_v2_t::pmda_body_t* p__parent, intel_acbp_v2_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
m_hash = 0;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::pmda_entry_v3_t::_read() {
|
||||
m_entry_id = m__io->read_u4le();
|
||||
m_base = m__io->read_u4le();
|
||||
m_size = m__io->read_u4le();
|
||||
m_total_entry_size = m__io->read_u2le();
|
||||
m_version = m__io->read_u2le();
|
||||
if (!(version() == 3)) {
|
||||
throw kaitai::validation_not_equal_error<uint16_t>(3, version(), _io(), std::string("/types/pmda_entry_v3/seq/4"));
|
||||
}
|
||||
m_hash = new hash_t(m__io, this, m__root);
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::pmda_entry_v3_t::~pmda_entry_v3_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::pmda_entry_v3_t::_clean_up() {
|
||||
if (m_hash) {
|
||||
delete m_hash; m_hash = 0;
|
||||
}
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::ibbs_body_t::ibbs_body_t(kaitai::kstream* p__io, intel_acbp_v2_t::acbp_element_t* p__parent, intel_acbp_v2_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
m_post_ibb_digest = 0;
|
||||
m_ibb_digests = 0;
|
||||
m_obb_digest = 0;
|
||||
m_reserved2 = 0;
|
||||
m_ibb_segments = 0;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::ibbs_body_t::_read() {
|
||||
m_reserved0 = m__io->read_u1();
|
||||
m_set_number = m__io->read_u1();
|
||||
m_reserved1 = m__io->read_u1();
|
||||
m_pbet_value = m__io->read_u1();
|
||||
m_flags = m__io->read_u4le();
|
||||
m_mch_bar = m__io->read_u8le();
|
||||
m_vtd_bar = m__io->read_u8le();
|
||||
m_dma_protection_base0 = m__io->read_u4le();
|
||||
m_dma_protection_limit0 = m__io->read_u4le();
|
||||
m_dma_protection_base1 = m__io->read_u8le();
|
||||
m_dma_protection_limit1 = m__io->read_u8le();
|
||||
m_post_ibb_digest = new hash_t(m__io, this, m__root);
|
||||
m_ibb_entry_point = m__io->read_u4le();
|
||||
m_ibb_digests_size = m__io->read_u2le();
|
||||
m_num_ibb_digests = m__io->read_u2le();
|
||||
m_ibb_digests = new std::vector<hash_t*>();
|
||||
const int l_ibb_digests = num_ibb_digests();
|
||||
for (int i = 0; i < l_ibb_digests; i++) {
|
||||
m_ibb_digests->push_back(new hash_t(m__io, this, m__root));
|
||||
}
|
||||
m_obb_digest = new hash_t(m__io, this, m__root);
|
||||
m_reserved2 = new std::vector<uint8_t>();
|
||||
const int l_reserved2 = 3;
|
||||
for (int i = 0; i < l_reserved2; i++) {
|
||||
m_reserved2->push_back(m__io->read_u1());
|
||||
}
|
||||
m_num_ibb_segments = m__io->read_u1();
|
||||
m_ibb_segments = new std::vector<ibb_segment_t*>();
|
||||
const int l_ibb_segments = num_ibb_segments();
|
||||
for (int i = 0; i < l_ibb_segments; i++) {
|
||||
m_ibb_segments->push_back(new ibb_segment_t(m__io, this, m__root));
|
||||
}
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::ibbs_body_t::~ibbs_body_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::ibbs_body_t::_clean_up() {
|
||||
if (m_post_ibb_digest) {
|
||||
delete m_post_ibb_digest; m_post_ibb_digest = 0;
|
||||
}
|
||||
if (m_ibb_digests) {
|
||||
for (std::vector<hash_t*>::iterator it = m_ibb_digests->begin(); it != m_ibb_digests->end(); ++it) {
|
||||
delete *it;
|
||||
}
|
||||
delete m_ibb_digests; m_ibb_digests = 0;
|
||||
}
|
||||
if (m_obb_digest) {
|
||||
delete m_obb_digest; m_obb_digest = 0;
|
||||
}
|
||||
if (m_reserved2) {
|
||||
delete m_reserved2; m_reserved2 = 0;
|
||||
}
|
||||
if (m_ibb_segments) {
|
||||
for (std::vector<ibb_segment_t*>::iterator it = m_ibb_segments->begin(); it != m_ibb_segments->end(); ++it) {
|
||||
delete *it;
|
||||
}
|
||||
delete m_ibb_segments; m_ibb_segments = 0;
|
||||
}
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::pmda_body_t::pmda_body_t(kaitai::kstream* p__io, intel_acbp_v2_t::acbp_element_t* p__parent, intel_acbp_v2_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
m_entries = 0;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::pmda_body_t::_read() {
|
||||
m_reserved = m__io->read_u2le();
|
||||
m_total_size = m__io->read_u2le();
|
||||
m_version = m__io->read_u4le();
|
||||
m_num_entries = m__io->read_u4le();
|
||||
m_entries = new std::vector<pmda_entry_v3_t*>();
|
||||
const int l_entries = num_entries();
|
||||
for (int i = 0; i < l_entries; i++) {
|
||||
m_entries->push_back(new pmda_entry_v3_t(m__io, this, m__root));
|
||||
}
|
||||
}
|
||||
|
||||
intel_acbp_v2_t::pmda_body_t::~pmda_body_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acbp_v2_t::pmda_body_t::_clean_up() {
|
||||
if (m_entries) {
|
||||
for (std::vector<pmda_entry_v3_t*>::iterator it = m_entries->begin(); it != m_entries->end(); ++it) {
|
||||
delete *it;
|
||||
}
|
||||
delete m_entries; m_entries = 0;
|
||||
}
|
||||
}
|
441
common/generated/intel_acbp_v2.h
Normal file
441
common/generated/intel_acbp_v2.h
Normal file
@ -0,0 +1,441 @@
|
||||
#ifndef INTEL_ACBP_V2_H_
|
||||
#define INTEL_ACBP_V2_H_
|
||||
|
||||
// This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
|
||||
|
||||
#include "../kaitai/kaitaistruct.h"
|
||||
#include <stdint.h>
|
||||
#include <vector>
|
||||
|
||||
#if KAITAI_STRUCT_VERSION < 9000L
|
||||
#error "Incompatible Kaitai Struct C++/STL API: version 0.9 or later is required"
|
||||
#endif
|
||||
|
||||
class intel_acbp_v2_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
class acbp_element_t;
|
||||
class key_signature_t;
|
||||
class signature_t;
|
||||
class ibb_segment_t;
|
||||
class public_key_t;
|
||||
class hash_t;
|
||||
class header_t;
|
||||
class pmda_entry_v3_t;
|
||||
class ibbs_body_t;
|
||||
class pmda_body_t;
|
||||
|
||||
enum ibb_segment_type_t {
|
||||
IBB_SEGMENT_TYPE_IBB = 0,
|
||||
IBB_SEGMENT_TYPE_NON_IBB = 1
|
||||
};
|
||||
|
||||
enum structure_ids_t {
|
||||
STRUCTURE_IDS_PMDA = 6872283318001360735LL,
|
||||
STRUCTURE_IDS_PMSG = 6872289979495636831LL,
|
||||
STRUCTURE_IDS_ACBP = 6872299801917087583LL,
|
||||
STRUCTURE_IDS_IBBS = 6872303100435717983LL,
|
||||
STRUCTURE_IDS_PCDS = 6872303109042888543LL,
|
||||
STRUCTURE_IDS_PFRS = 6872303169222762335LL,
|
||||
STRUCTURE_IDS_TXTS = 6872303178114948959LL
|
||||
};
|
||||
|
||||
intel_acbp_v2_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent = 0, intel_acbp_v2_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~intel_acbp_v2_t();
|
||||
|
||||
class acbp_element_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
acbp_element_t(kaitai::kstream* p__io, intel_acbp_v2_t* p__parent = 0, intel_acbp_v2_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~acbp_element_t();
|
||||
|
||||
private:
|
||||
header_t* m_header;
|
||||
ibbs_body_t* m_ibbs_body;
|
||||
bool n_ibbs_body;
|
||||
|
||||
public:
|
||||
bool _is_null_ibbs_body() { ibbs_body(); return n_ibbs_body; };
|
||||
|
||||
private:
|
||||
pmda_body_t* m_pmda_body;
|
||||
bool n_pmda_body;
|
||||
|
||||
public:
|
||||
bool _is_null_pmda_body() { pmda_body(); return n_pmda_body; };
|
||||
|
||||
private:
|
||||
std::string m_generic_body;
|
||||
bool n_generic_body;
|
||||
|
||||
public:
|
||||
bool _is_null_generic_body() { generic_body(); return n_generic_body; };
|
||||
|
||||
private:
|
||||
intel_acbp_v2_t* m__root;
|
||||
intel_acbp_v2_t* m__parent;
|
||||
|
||||
public:
|
||||
header_t* header() const { return m_header; }
|
||||
ibbs_body_t* ibbs_body() const { return m_ibbs_body; }
|
||||
pmda_body_t* pmda_body() const { return m_pmda_body; }
|
||||
std::string generic_body() const { return m_generic_body; }
|
||||
intel_acbp_v2_t* _root() const { return m__root; }
|
||||
intel_acbp_v2_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class key_signature_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
key_signature_t(kaitai::kstream* p__io, intel_acbp_v2_t* p__parent = 0, intel_acbp_v2_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~key_signature_t();
|
||||
|
||||
private:
|
||||
uint8_t m_version;
|
||||
uint16_t m_key_id;
|
||||
public_key_t* m_public_key;
|
||||
uint16_t m_sig_scheme;
|
||||
signature_t* m_signature;
|
||||
intel_acbp_v2_t* m__root;
|
||||
intel_acbp_v2_t* m__parent;
|
||||
|
||||
public:
|
||||
uint8_t version() const { return m_version; }
|
||||
uint16_t key_id() const { return m_key_id; }
|
||||
public_key_t* public_key() const { return m_public_key; }
|
||||
uint16_t sig_scheme() const { return m_sig_scheme; }
|
||||
signature_t* signature() const { return m_signature; }
|
||||
intel_acbp_v2_t* _root() const { return m__root; }
|
||||
intel_acbp_v2_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class signature_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
signature_t(kaitai::kstream* p__io, intel_acbp_v2_t::key_signature_t* p__parent = 0, intel_acbp_v2_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~signature_t();
|
||||
|
||||
private:
|
||||
uint8_t m_version;
|
||||
uint16_t m_size_bits;
|
||||
uint16_t m_hash_algorithm_id;
|
||||
std::string m_signature;
|
||||
intel_acbp_v2_t* m__root;
|
||||
intel_acbp_v2_t::key_signature_t* m__parent;
|
||||
|
||||
public:
|
||||
uint8_t version() const { return m_version; }
|
||||
uint16_t size_bits() const { return m_size_bits; }
|
||||
uint16_t hash_algorithm_id() const { return m_hash_algorithm_id; }
|
||||
std::string signature() const { return m_signature; }
|
||||
intel_acbp_v2_t* _root() const { return m__root; }
|
||||
intel_acbp_v2_t::key_signature_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class ibb_segment_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
ibb_segment_t(kaitai::kstream* p__io, intel_acbp_v2_t::ibbs_body_t* p__parent = 0, intel_acbp_v2_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~ibb_segment_t();
|
||||
|
||||
private:
|
||||
uint16_t m_reserved;
|
||||
uint16_t m_flags;
|
||||
uint32_t m_base;
|
||||
uint32_t m_size;
|
||||
intel_acbp_v2_t* m__root;
|
||||
intel_acbp_v2_t::ibbs_body_t* m__parent;
|
||||
|
||||
public:
|
||||
uint16_t reserved() const { return m_reserved; }
|
||||
uint16_t flags() const { return m_flags; }
|
||||
uint32_t base() const { return m_base; }
|
||||
uint32_t size() const { return m_size; }
|
||||
intel_acbp_v2_t* _root() const { return m__root; }
|
||||
intel_acbp_v2_t::ibbs_body_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class public_key_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
public_key_t(kaitai::kstream* p__io, intel_acbp_v2_t::key_signature_t* p__parent = 0, intel_acbp_v2_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~public_key_t();
|
||||
|
||||
private:
|
||||
uint8_t m_version;
|
||||
uint16_t m_size_bits;
|
||||
uint32_t m_exponent;
|
||||
std::string m_modulus;
|
||||
intel_acbp_v2_t* m__root;
|
||||
intel_acbp_v2_t::key_signature_t* m__parent;
|
||||
|
||||
public:
|
||||
uint8_t version() const { return m_version; }
|
||||
uint16_t size_bits() const { return m_size_bits; }
|
||||
uint32_t exponent() const { return m_exponent; }
|
||||
std::string modulus() const { return m_modulus; }
|
||||
intel_acbp_v2_t* _root() const { return m__root; }
|
||||
intel_acbp_v2_t::key_signature_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class hash_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
hash_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent = 0, intel_acbp_v2_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~hash_t();
|
||||
|
||||
private:
|
||||
uint16_t m_hash_algorithm_id;
|
||||
uint16_t m_len_hash;
|
||||
std::string m_hash;
|
||||
intel_acbp_v2_t* m__root;
|
||||
kaitai::kstruct* m__parent;
|
||||
|
||||
public:
|
||||
uint16_t hash_algorithm_id() const { return m_hash_algorithm_id; }
|
||||
uint16_t len_hash() const { return m_len_hash; }
|
||||
std::string hash() const { return m_hash; }
|
||||
intel_acbp_v2_t* _root() const { return m__root; }
|
||||
kaitai::kstruct* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class header_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
header_t(kaitai::kstream* p__io, intel_acbp_v2_t::acbp_element_t* p__parent = 0, intel_acbp_v2_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~header_t();
|
||||
|
||||
private:
|
||||
structure_ids_t m_structure_id;
|
||||
uint8_t m_version;
|
||||
uint8_t m_header_specific;
|
||||
uint16_t m_total_size;
|
||||
intel_acbp_v2_t* m__root;
|
||||
intel_acbp_v2_t::acbp_element_t* m__parent;
|
||||
|
||||
public:
|
||||
structure_ids_t structure_id() const { return m_structure_id; }
|
||||
uint8_t version() const { return m_version; }
|
||||
uint8_t header_specific() const { return m_header_specific; }
|
||||
uint16_t total_size() const { return m_total_size; }
|
||||
intel_acbp_v2_t* _root() const { return m__root; }
|
||||
intel_acbp_v2_t::acbp_element_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class pmda_entry_v3_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
pmda_entry_v3_t(kaitai::kstream* p__io, intel_acbp_v2_t::pmda_body_t* p__parent = 0, intel_acbp_v2_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~pmda_entry_v3_t();
|
||||
|
||||
private:
|
||||
uint32_t m_entry_id;
|
||||
uint32_t m_base;
|
||||
uint32_t m_size;
|
||||
uint16_t m_total_entry_size;
|
||||
uint16_t m_version;
|
||||
hash_t* m_hash;
|
||||
intel_acbp_v2_t* m__root;
|
||||
intel_acbp_v2_t::pmda_body_t* m__parent;
|
||||
|
||||
public:
|
||||
uint32_t entry_id() const { return m_entry_id; }
|
||||
uint32_t base() const { return m_base; }
|
||||
uint32_t size() const { return m_size; }
|
||||
uint16_t total_entry_size() const { return m_total_entry_size; }
|
||||
uint16_t version() const { return m_version; }
|
||||
hash_t* hash() const { return m_hash; }
|
||||
intel_acbp_v2_t* _root() const { return m__root; }
|
||||
intel_acbp_v2_t::pmda_body_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class ibbs_body_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
ibbs_body_t(kaitai::kstream* p__io, intel_acbp_v2_t::acbp_element_t* p__parent = 0, intel_acbp_v2_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~ibbs_body_t();
|
||||
|
||||
private:
|
||||
uint8_t m_reserved0;
|
||||
uint8_t m_set_number;
|
||||
uint8_t m_reserved1;
|
||||
uint8_t m_pbet_value;
|
||||
uint32_t m_flags;
|
||||
uint64_t m_mch_bar;
|
||||
uint64_t m_vtd_bar;
|
||||
uint32_t m_dma_protection_base0;
|
||||
uint32_t m_dma_protection_limit0;
|
||||
uint64_t m_dma_protection_base1;
|
||||
uint64_t m_dma_protection_limit1;
|
||||
hash_t* m_post_ibb_digest;
|
||||
uint32_t m_ibb_entry_point;
|
||||
uint16_t m_ibb_digests_size;
|
||||
uint16_t m_num_ibb_digests;
|
||||
std::vector<hash_t*>* m_ibb_digests;
|
||||
hash_t* m_obb_digest;
|
||||
std::vector<uint8_t>* m_reserved2;
|
||||
uint8_t m_num_ibb_segments;
|
||||
std::vector<ibb_segment_t*>* m_ibb_segments;
|
||||
intel_acbp_v2_t* m__root;
|
||||
intel_acbp_v2_t::acbp_element_t* m__parent;
|
||||
|
||||
public:
|
||||
uint8_t reserved0() const { return m_reserved0; }
|
||||
uint8_t set_number() const { return m_set_number; }
|
||||
uint8_t reserved1() const { return m_reserved1; }
|
||||
uint8_t pbet_value() const { return m_pbet_value; }
|
||||
uint32_t flags() const { return m_flags; }
|
||||
uint64_t mch_bar() const { return m_mch_bar; }
|
||||
uint64_t vtd_bar() const { return m_vtd_bar; }
|
||||
uint32_t dma_protection_base0() const { return m_dma_protection_base0; }
|
||||
uint32_t dma_protection_limit0() const { return m_dma_protection_limit0; }
|
||||
uint64_t dma_protection_base1() const { return m_dma_protection_base1; }
|
||||
uint64_t dma_protection_limit1() const { return m_dma_protection_limit1; }
|
||||
hash_t* post_ibb_digest() const { return m_post_ibb_digest; }
|
||||
uint32_t ibb_entry_point() const { return m_ibb_entry_point; }
|
||||
uint16_t ibb_digests_size() const { return m_ibb_digests_size; }
|
||||
uint16_t num_ibb_digests() const { return m_num_ibb_digests; }
|
||||
std::vector<hash_t*>* ibb_digests() const { return m_ibb_digests; }
|
||||
hash_t* obb_digest() const { return m_obb_digest; }
|
||||
std::vector<uint8_t>* reserved2() const { return m_reserved2; }
|
||||
uint8_t num_ibb_segments() const { return m_num_ibb_segments; }
|
||||
std::vector<ibb_segment_t*>* ibb_segments() const { return m_ibb_segments; }
|
||||
intel_acbp_v2_t* _root() const { return m__root; }
|
||||
intel_acbp_v2_t::acbp_element_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class pmda_body_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
pmda_body_t(kaitai::kstream* p__io, intel_acbp_v2_t::acbp_element_t* p__parent = 0, intel_acbp_v2_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~pmda_body_t();
|
||||
|
||||
private:
|
||||
uint16_t m_reserved;
|
||||
uint16_t m_total_size;
|
||||
uint32_t m_version;
|
||||
uint32_t m_num_entries;
|
||||
std::vector<pmda_entry_v3_t*>* m_entries;
|
||||
intel_acbp_v2_t* m__root;
|
||||
intel_acbp_v2_t::acbp_element_t* m__parent;
|
||||
|
||||
public:
|
||||
uint16_t reserved() const { return m_reserved; }
|
||||
uint16_t total_size() const { return m_total_size; }
|
||||
uint32_t version() const { return m_version; }
|
||||
uint32_t num_entries() const { return m_num_entries; }
|
||||
std::vector<pmda_entry_v3_t*>* entries() const { return m_entries; }
|
||||
intel_acbp_v2_t* _root() const { return m__root; }
|
||||
intel_acbp_v2_t::acbp_element_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
private:
|
||||
structure_ids_t m_structure_id;
|
||||
uint8_t m_version;
|
||||
uint8_t m_header_specific;
|
||||
uint16_t m_total_size;
|
||||
uint16_t m_key_signature_offset;
|
||||
uint8_t m_bpm_revision;
|
||||
uint8_t m_bp_svn;
|
||||
uint8_t m_acm_svn;
|
||||
uint8_t m_reserved;
|
||||
uint16_t m_nem_data_size;
|
||||
std::vector<acbp_element_t*>* m_elements;
|
||||
key_signature_t* m_key_signature;
|
||||
intel_acbp_v2_t* m__root;
|
||||
kaitai::kstruct* m__parent;
|
||||
|
||||
public:
|
||||
structure_ids_t structure_id() const { return m_structure_id; }
|
||||
uint8_t version() const { return m_version; }
|
||||
uint8_t header_specific() const { return m_header_specific; }
|
||||
uint16_t total_size() const { return m_total_size; }
|
||||
uint16_t key_signature_offset() const { return m_key_signature_offset; }
|
||||
uint8_t bpm_revision() const { return m_bpm_revision; }
|
||||
uint8_t bp_svn() const { return m_bp_svn; }
|
||||
uint8_t acm_svn() const { return m_acm_svn; }
|
||||
uint8_t reserved() const { return m_reserved; }
|
||||
uint16_t nem_data_size() const { return m_nem_data_size; }
|
||||
std::vector<acbp_element_t*>* elements() const { return m_elements; }
|
||||
key_signature_t* key_signature() const { return m_key_signature; }
|
||||
intel_acbp_v2_t* _root() const { return m__root; }
|
||||
kaitai::kstruct* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
#endif // INTEL_ACBP_V2_H_
|
92
common/generated/intel_acm.cpp
Normal file
92
common/generated/intel_acm.cpp
Normal file
@ -0,0 +1,92 @@
|
||||
// This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
|
||||
|
||||
#include "intel_acm.h"
|
||||
#include "../kaitai/exceptions.h"
|
||||
|
||||
intel_acm_t::intel_acm_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent, intel_acm_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = this; (void)p__root;
|
||||
m_header = 0;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acm_t::_read() {
|
||||
m_header = new header_t(m__io, this, m__root);
|
||||
m_body = m__io->read_bytes((4 * ((header()->module_size() - header()->header_size()) - header()->scratch_space_size())));
|
||||
}
|
||||
|
||||
intel_acm_t::~intel_acm_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acm_t::_clean_up() {
|
||||
if (m_header) {
|
||||
delete m_header; m_header = 0;
|
||||
}
|
||||
}
|
||||
|
||||
intel_acm_t::header_t::header_t(kaitai::kstream* p__io, intel_acm_t* p__parent, intel_acm_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_acm_t::header_t::_read() {
|
||||
m_module_type = m__io->read_u2le();
|
||||
if (!(module_type() == 2)) {
|
||||
throw kaitai::validation_not_equal_error<uint16_t>(2, module_type(), _io(), std::string("/types/header/seq/0"));
|
||||
}
|
||||
m_module_subtype = static_cast<intel_acm_t::module_subtype_t>(m__io->read_u2le());
|
||||
m_header_size = m__io->read_u4le();
|
||||
m_header_version = m__io->read_u4le();
|
||||
m_chipset_id = m__io->read_u2le();
|
||||
m_flags = m__io->read_u2le();
|
||||
m_module_vendor = m__io->read_u4le();
|
||||
if (!(module_vendor() == 32902)) {
|
||||
throw kaitai::validation_not_equal_error<uint32_t>(32902, module_vendor(), _io(), std::string("/types/header/seq/6"));
|
||||
}
|
||||
m_date_day = m__io->read_u1();
|
||||
m_date_month = m__io->read_u1();
|
||||
m_date_year = m__io->read_u2le();
|
||||
m_module_size = m__io->read_u4le();
|
||||
m_acm_svn = m__io->read_u2le();
|
||||
m_se_svn = m__io->read_u2le();
|
||||
m_code_control_flags = m__io->read_u4le();
|
||||
m_error_entry_point = m__io->read_u4le();
|
||||
m_gdt_max = m__io->read_u4le();
|
||||
m_gdt_base = m__io->read_u4le();
|
||||
m_segment_sel = m__io->read_u4le();
|
||||
m_entry_point = m__io->read_u4le();
|
||||
m_reserved = m__io->read_bytes(64);
|
||||
m_key_size = m__io->read_u4le();
|
||||
m_scratch_space_size = m__io->read_u4le();
|
||||
m_rsa_public_key = m__io->read_bytes((4 * key_size()));
|
||||
n_rsa_exponent = true;
|
||||
if (header_version() == 0) {
|
||||
n_rsa_exponent = false;
|
||||
m_rsa_exponent = m__io->read_u4le();
|
||||
}
|
||||
m_rsa_signature = m__io->read_bytes((4 * key_size()));
|
||||
m_scratch_space = m__io->read_bytes((4 * scratch_space_size()));
|
||||
}
|
||||
|
||||
intel_acm_t::header_t::~header_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_acm_t::header_t::_clean_up() {
|
||||
if (!n_rsa_exponent) {
|
||||
}
|
||||
}
|
159
common/generated/intel_acm.h
Normal file
159
common/generated/intel_acm.h
Normal file
@ -0,0 +1,159 @@
|
||||
#ifndef INTEL_ACM_H_
|
||||
#define INTEL_ACM_H_
|
||||
|
||||
// This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
|
||||
|
||||
#include "../kaitai/kaitaistruct.h"
|
||||
#include <stdint.h>
|
||||
|
||||
#if KAITAI_STRUCT_VERSION < 9000L
|
||||
#error "Incompatible Kaitai Struct C++/STL API: version 0.9 or later is required"
|
||||
#endif
|
||||
|
||||
class intel_acm_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
class header_t;
|
||||
|
||||
enum module_subtype_t {
|
||||
MODULE_SUBTYPE_TXT = 0,
|
||||
MODULE_SUBTYPE_STARTUP = 1,
|
||||
MODULE_SUBTYPE_BOOT_GUARD = 3
|
||||
};
|
||||
|
||||
enum known_header_version_t {
|
||||
KNOWN_HEADER_VERSION_V0_0 = 0,
|
||||
KNOWN_HEADER_VERSION_V3_0 = 196608
|
||||
};
|
||||
|
||||
intel_acm_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent = 0, intel_acm_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~intel_acm_t();
|
||||
|
||||
class header_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
header_t(kaitai::kstream* p__io, intel_acm_t* p__parent = 0, intel_acm_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~header_t();
|
||||
|
||||
private:
|
||||
uint16_t m_module_type;
|
||||
module_subtype_t m_module_subtype;
|
||||
uint32_t m_header_size;
|
||||
uint32_t m_header_version;
|
||||
uint16_t m_chipset_id;
|
||||
uint16_t m_flags;
|
||||
uint32_t m_module_vendor;
|
||||
uint8_t m_date_day;
|
||||
uint8_t m_date_month;
|
||||
uint16_t m_date_year;
|
||||
uint32_t m_module_size;
|
||||
uint16_t m_acm_svn;
|
||||
uint16_t m_se_svn;
|
||||
uint32_t m_code_control_flags;
|
||||
uint32_t m_error_entry_point;
|
||||
uint32_t m_gdt_max;
|
||||
uint32_t m_gdt_base;
|
||||
uint32_t m_segment_sel;
|
||||
uint32_t m_entry_point;
|
||||
std::string m_reserved;
|
||||
uint32_t m_key_size;
|
||||
uint32_t m_scratch_space_size;
|
||||
std::string m_rsa_public_key;
|
||||
uint32_t m_rsa_exponent;
|
||||
bool n_rsa_exponent;
|
||||
|
||||
public:
|
||||
bool _is_null_rsa_exponent() { rsa_exponent(); return n_rsa_exponent; };
|
||||
|
||||
private:
|
||||
std::string m_rsa_signature;
|
||||
std::string m_scratch_space;
|
||||
intel_acm_t* m__root;
|
||||
intel_acm_t* m__parent;
|
||||
|
||||
public:
|
||||
uint16_t module_type() const { return m_module_type; }
|
||||
module_subtype_t module_subtype() const { return m_module_subtype; }
|
||||
|
||||
/**
|
||||
* counted in 4 byte increments
|
||||
*/
|
||||
uint32_t header_size() const { return m_header_size; }
|
||||
uint32_t header_version() const { return m_header_version; }
|
||||
uint16_t chipset_id() const { return m_chipset_id; }
|
||||
uint16_t flags() const { return m_flags; }
|
||||
uint32_t module_vendor() const { return m_module_vendor; }
|
||||
|
||||
/**
|
||||
* BCD
|
||||
*/
|
||||
uint8_t date_day() const { return m_date_day; }
|
||||
|
||||
/**
|
||||
* BCD
|
||||
*/
|
||||
uint8_t date_month() const { return m_date_month; }
|
||||
|
||||
/**
|
||||
* BCD
|
||||
*/
|
||||
uint16_t date_year() const { return m_date_year; }
|
||||
|
||||
/**
|
||||
* counted in 4 byte increments
|
||||
*/
|
||||
uint32_t module_size() const { return m_module_size; }
|
||||
uint16_t acm_svn() const { return m_acm_svn; }
|
||||
uint16_t se_svn() const { return m_se_svn; }
|
||||
uint32_t code_control_flags() const { return m_code_control_flags; }
|
||||
uint32_t error_entry_point() const { return m_error_entry_point; }
|
||||
uint32_t gdt_max() const { return m_gdt_max; }
|
||||
uint32_t gdt_base() const { return m_gdt_base; }
|
||||
uint32_t segment_sel() const { return m_segment_sel; }
|
||||
uint32_t entry_point() const { return m_entry_point; }
|
||||
std::string reserved() const { return m_reserved; }
|
||||
|
||||
/**
|
||||
* counted in 4 byte increments
|
||||
*/
|
||||
uint32_t key_size() const { return m_key_size; }
|
||||
|
||||
/**
|
||||
* counted in 4 byte increments
|
||||
*/
|
||||
uint32_t scratch_space_size() const { return m_scratch_space_size; }
|
||||
std::string rsa_public_key() const { return m_rsa_public_key; }
|
||||
uint32_t rsa_exponent() const { return m_rsa_exponent; }
|
||||
std::string rsa_signature() const { return m_rsa_signature; }
|
||||
std::string scratch_space() const { return m_scratch_space; }
|
||||
intel_acm_t* _root() const { return m__root; }
|
||||
intel_acm_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
private:
|
||||
header_t* m_header;
|
||||
std::string m_body;
|
||||
intel_acm_t* m__root;
|
||||
kaitai::kstruct* m__parent;
|
||||
|
||||
public:
|
||||
header_t* header() const { return m_header; }
|
||||
std::string body() const { return m_body; }
|
||||
intel_acm_t* _root() const { return m__root; }
|
||||
kaitai::kstruct* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
#endif // INTEL_ACM_H_
|
162
common/generated/intel_keym_v1.cpp
Normal file
162
common/generated/intel_keym_v1.cpp
Normal file
@ -0,0 +1,162 @@
|
||||
// This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
|
||||
|
||||
#include "intel_keym_v1.h"
|
||||
#include "../kaitai/exceptions.h"
|
||||
|
||||
intel_keym_v1_t::intel_keym_v1_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent, intel_keym_v1_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = this; (void)p__root;
|
||||
m_km_hash = 0;
|
||||
m_key_signature = 0;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_keym_v1_t::_read() {
|
||||
m_structure_id = static_cast<intel_keym_v1_t::structure_ids_t>(m__io->read_u8le());
|
||||
if (!(structure_id() == intel_keym_v1_t::STRUCTURE_IDS_KEYM)) {
|
||||
throw kaitai::validation_not_equal_error<intel_keym_v1_t::structure_ids_t>(intel_keym_v1_t::STRUCTURE_IDS_KEYM, structure_id(), _io(), std::string("/seq/0"));
|
||||
}
|
||||
m_version = m__io->read_u1();
|
||||
{
|
||||
uint8_t _ = version();
|
||||
if (!(_ < 32)) {
|
||||
throw kaitai::validation_expr_error<uint8_t>(version(), _io(), std::string("/seq/1"));
|
||||
}
|
||||
}
|
||||
m_km_version = m__io->read_u1();
|
||||
m_km_svn = m__io->read_u1();
|
||||
m_km_id = m__io->read_u1();
|
||||
m_km_hash = new km_hash_t(m__io, this, m__root);
|
||||
m_key_signature = new key_signature_t(m__io, this, m__root);
|
||||
}
|
||||
|
||||
intel_keym_v1_t::~intel_keym_v1_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_keym_v1_t::_clean_up() {
|
||||
if (m_km_hash) {
|
||||
delete m_km_hash; m_km_hash = 0;
|
||||
}
|
||||
if (m_key_signature) {
|
||||
delete m_key_signature; m_key_signature = 0;
|
||||
}
|
||||
}
|
||||
|
||||
intel_keym_v1_t::km_hash_t::km_hash_t(kaitai::kstream* p__io, intel_keym_v1_t* p__parent, intel_keym_v1_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_keym_v1_t::km_hash_t::_read() {
|
||||
m_hash_algorithm_id = m__io->read_u2le();
|
||||
m_len_hash = m__io->read_u2le();
|
||||
m_hash = m__io->read_bytes(len_hash());
|
||||
}
|
||||
|
||||
intel_keym_v1_t::km_hash_t::~km_hash_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_keym_v1_t::km_hash_t::_clean_up() {
|
||||
}
|
||||
|
||||
intel_keym_v1_t::public_key_t::public_key_t(kaitai::kstream* p__io, intel_keym_v1_t::key_signature_t* p__parent, intel_keym_v1_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_keym_v1_t::public_key_t::_read() {
|
||||
m_version = m__io->read_u1();
|
||||
m_size_bits = m__io->read_u2le();
|
||||
m_exponent = m__io->read_u4le();
|
||||
m_modulus = m__io->read_bytes((size_bits() / 8));
|
||||
}
|
||||
|
||||
intel_keym_v1_t::public_key_t::~public_key_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_keym_v1_t::public_key_t::_clean_up() {
|
||||
}
|
||||
|
||||
intel_keym_v1_t::signature_t::signature_t(kaitai::kstream* p__io, intel_keym_v1_t::key_signature_t* p__parent, intel_keym_v1_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_keym_v1_t::signature_t::_read() {
|
||||
m_version = m__io->read_u1();
|
||||
m_size_bits = m__io->read_u2le();
|
||||
m_hash_algorithm_id = m__io->read_u2le();
|
||||
m_signature = m__io->read_bytes((size_bits() / 8));
|
||||
}
|
||||
|
||||
intel_keym_v1_t::signature_t::~signature_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_keym_v1_t::signature_t::_clean_up() {
|
||||
}
|
||||
|
||||
intel_keym_v1_t::key_signature_t::key_signature_t(kaitai::kstream* p__io, intel_keym_v1_t* p__parent, intel_keym_v1_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
m_public_key = 0;
|
||||
m_signature = 0;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_keym_v1_t::key_signature_t::_read() {
|
||||
m_version = m__io->read_u1();
|
||||
m_key_id = m__io->read_u2le();
|
||||
m_public_key = new public_key_t(m__io, this, m__root);
|
||||
m_sig_scheme = m__io->read_u2le();
|
||||
m_signature = new signature_t(m__io, this, m__root);
|
||||
}
|
||||
|
||||
intel_keym_v1_t::key_signature_t::~key_signature_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_keym_v1_t::key_signature_t::_clean_up() {
|
||||
if (m_public_key) {
|
||||
delete m_public_key; m_public_key = 0;
|
||||
}
|
||||
if (m_signature) {
|
||||
delete m_signature; m_signature = 0;
|
||||
}
|
||||
}
|
177
common/generated/intel_keym_v1.h
Normal file
177
common/generated/intel_keym_v1.h
Normal file
@ -0,0 +1,177 @@
|
||||
#ifndef INTEL_KEYM_V1_H_
|
||||
#define INTEL_KEYM_V1_H_
|
||||
|
||||
// This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
|
||||
|
||||
#include "../kaitai/kaitaistruct.h"
|
||||
#include <stdint.h>
|
||||
|
||||
#if KAITAI_STRUCT_VERSION < 9000L
|
||||
#error "Incompatible Kaitai Struct C++/STL API: version 0.9 or later is required"
|
||||
#endif
|
||||
|
||||
class intel_keym_v1_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
class km_hash_t;
|
||||
class public_key_t;
|
||||
class signature_t;
|
||||
class key_signature_t;
|
||||
|
||||
enum structure_ids_t {
|
||||
STRUCTURE_IDS_KEYM = 6872296602200661855LL
|
||||
};
|
||||
|
||||
intel_keym_v1_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent = 0, intel_keym_v1_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~intel_keym_v1_t();
|
||||
|
||||
class km_hash_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
km_hash_t(kaitai::kstream* p__io, intel_keym_v1_t* p__parent = 0, intel_keym_v1_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~km_hash_t();
|
||||
|
||||
private:
|
||||
uint16_t m_hash_algorithm_id;
|
||||
uint16_t m_len_hash;
|
||||
std::string m_hash;
|
||||
intel_keym_v1_t* m__root;
|
||||
intel_keym_v1_t* m__parent;
|
||||
|
||||
public:
|
||||
uint16_t hash_algorithm_id() const { return m_hash_algorithm_id; }
|
||||
uint16_t len_hash() const { return m_len_hash; }
|
||||
std::string hash() const { return m_hash; }
|
||||
intel_keym_v1_t* _root() const { return m__root; }
|
||||
intel_keym_v1_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class public_key_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
public_key_t(kaitai::kstream* p__io, intel_keym_v1_t::key_signature_t* p__parent = 0, intel_keym_v1_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~public_key_t();
|
||||
|
||||
private:
|
||||
uint8_t m_version;
|
||||
uint16_t m_size_bits;
|
||||
uint32_t m_exponent;
|
||||
std::string m_modulus;
|
||||
intel_keym_v1_t* m__root;
|
||||
intel_keym_v1_t::key_signature_t* m__parent;
|
||||
|
||||
public:
|
||||
uint8_t version() const { return m_version; }
|
||||
uint16_t size_bits() const { return m_size_bits; }
|
||||
uint32_t exponent() const { return m_exponent; }
|
||||
std::string modulus() const { return m_modulus; }
|
||||
intel_keym_v1_t* _root() const { return m__root; }
|
||||
intel_keym_v1_t::key_signature_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class signature_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
signature_t(kaitai::kstream* p__io, intel_keym_v1_t::key_signature_t* p__parent = 0, intel_keym_v1_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~signature_t();
|
||||
|
||||
private:
|
||||
uint8_t m_version;
|
||||
uint16_t m_size_bits;
|
||||
uint16_t m_hash_algorithm_id;
|
||||
std::string m_signature;
|
||||
intel_keym_v1_t* m__root;
|
||||
intel_keym_v1_t::key_signature_t* m__parent;
|
||||
|
||||
public:
|
||||
uint8_t version() const { return m_version; }
|
||||
uint16_t size_bits() const { return m_size_bits; }
|
||||
uint16_t hash_algorithm_id() const { return m_hash_algorithm_id; }
|
||||
std::string signature() const { return m_signature; }
|
||||
intel_keym_v1_t* _root() const { return m__root; }
|
||||
intel_keym_v1_t::key_signature_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class key_signature_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
key_signature_t(kaitai::kstream* p__io, intel_keym_v1_t* p__parent = 0, intel_keym_v1_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~key_signature_t();
|
||||
|
||||
private:
|
||||
uint8_t m_version;
|
||||
uint16_t m_key_id;
|
||||
public_key_t* m_public_key;
|
||||
uint16_t m_sig_scheme;
|
||||
signature_t* m_signature;
|
||||
intel_keym_v1_t* m__root;
|
||||
intel_keym_v1_t* m__parent;
|
||||
|
||||
public:
|
||||
uint8_t version() const { return m_version; }
|
||||
uint16_t key_id() const { return m_key_id; }
|
||||
public_key_t* public_key() const { return m_public_key; }
|
||||
uint16_t sig_scheme() const { return m_sig_scheme; }
|
||||
signature_t* signature() const { return m_signature; }
|
||||
intel_keym_v1_t* _root() const { return m__root; }
|
||||
intel_keym_v1_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
private:
|
||||
structure_ids_t m_structure_id;
|
||||
uint8_t m_version;
|
||||
uint8_t m_km_version;
|
||||
uint8_t m_km_svn;
|
||||
uint8_t m_km_id;
|
||||
km_hash_t* m_km_hash;
|
||||
key_signature_t* m_key_signature;
|
||||
intel_keym_v1_t* m__root;
|
||||
kaitai::kstruct* m__parent;
|
||||
|
||||
public:
|
||||
structure_ids_t structure_id() const { return m_structure_id; }
|
||||
uint8_t version() const { return m_version; }
|
||||
uint8_t km_version() const { return m_km_version; }
|
||||
uint8_t km_svn() const { return m_km_svn; }
|
||||
uint8_t km_id() const { return m_km_id; }
|
||||
km_hash_t* km_hash() const { return m_km_hash; }
|
||||
key_signature_t* key_signature() const { return m_key_signature; }
|
||||
intel_keym_v1_t* _root() const { return m__root; }
|
||||
kaitai::kstruct* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
#endif // INTEL_KEYM_V1_H_
|
214
common/generated/intel_keym_v2.cpp
Normal file
214
common/generated/intel_keym_v2.cpp
Normal file
@ -0,0 +1,214 @@
|
||||
// This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
|
||||
|
||||
#include "intel_keym_v2.h"
|
||||
#include "../kaitai/exceptions.h"
|
||||
|
||||
intel_keym_v2_t::intel_keym_v2_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent, intel_keym_v2_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = this; (void)p__root;
|
||||
m_header = 0;
|
||||
m_reserved = 0;
|
||||
m_km_hashes = 0;
|
||||
m_key_signature = 0;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_keym_v2_t::_read() {
|
||||
m_header = new header_t(m__io, this, m__root);
|
||||
m_key_signature_offset = m__io->read_u2le();
|
||||
m_reserved = new std::vector<uint8_t>();
|
||||
const int l_reserved = 3;
|
||||
for (int i = 0; i < l_reserved; i++) {
|
||||
m_reserved->push_back(m__io->read_u1());
|
||||
}
|
||||
m_km_version = m__io->read_u1();
|
||||
m_km_svn = m__io->read_u1();
|
||||
m_km_id = m__io->read_u1();
|
||||
m_fpf_hash_algorithm_id = m__io->read_u2le();
|
||||
m_num_km_hashes = m__io->read_u2le();
|
||||
m_km_hashes = new std::vector<km_hash_t*>();
|
||||
const int l_km_hashes = num_km_hashes();
|
||||
for (int i = 0; i < l_km_hashes; i++) {
|
||||
m_km_hashes->push_back(new km_hash_t(m__io, this, m__root));
|
||||
}
|
||||
m_key_signature = new key_signature_t(m__io, this, m__root);
|
||||
}
|
||||
|
||||
intel_keym_v2_t::~intel_keym_v2_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_keym_v2_t::_clean_up() {
|
||||
if (m_header) {
|
||||
delete m_header; m_header = 0;
|
||||
}
|
||||
if (m_reserved) {
|
||||
delete m_reserved; m_reserved = 0;
|
||||
}
|
||||
if (m_km_hashes) {
|
||||
for (std::vector<km_hash_t*>::iterator it = m_km_hashes->begin(); it != m_km_hashes->end(); ++it) {
|
||||
delete *it;
|
||||
}
|
||||
delete m_km_hashes; m_km_hashes = 0;
|
||||
}
|
||||
if (m_key_signature) {
|
||||
delete m_key_signature; m_key_signature = 0;
|
||||
}
|
||||
}
|
||||
|
||||
intel_keym_v2_t::key_signature_t::key_signature_t(kaitai::kstream* p__io, intel_keym_v2_t* p__parent, intel_keym_v2_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
m_public_key = 0;
|
||||
m_signature = 0;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_keym_v2_t::key_signature_t::_read() {
|
||||
m_version = m__io->read_u1();
|
||||
m_key_id = m__io->read_u2le();
|
||||
m_public_key = new public_key_t(m__io, this, m__root);
|
||||
m_sig_scheme = m__io->read_u2le();
|
||||
m_signature = new signature_t(m__io, this, m__root);
|
||||
}
|
||||
|
||||
intel_keym_v2_t::key_signature_t::~key_signature_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_keym_v2_t::key_signature_t::_clean_up() {
|
||||
if (m_public_key) {
|
||||
delete m_public_key; m_public_key = 0;
|
||||
}
|
||||
if (m_signature) {
|
||||
delete m_signature; m_signature = 0;
|
||||
}
|
||||
}
|
||||
|
||||
intel_keym_v2_t::km_hash_t::km_hash_t(kaitai::kstream* p__io, intel_keym_v2_t* p__parent, intel_keym_v2_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_keym_v2_t::km_hash_t::_read() {
|
||||
m_usage_flags = m__io->read_u8le();
|
||||
m_hash_algorithm_id = m__io->read_u2le();
|
||||
m_len_hash = m__io->read_u2le();
|
||||
m_hash = m__io->read_bytes(len_hash());
|
||||
}
|
||||
|
||||
intel_keym_v2_t::km_hash_t::~km_hash_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_keym_v2_t::km_hash_t::_clean_up() {
|
||||
}
|
||||
|
||||
intel_keym_v2_t::signature_t::signature_t(kaitai::kstream* p__io, intel_keym_v2_t::key_signature_t* p__parent, intel_keym_v2_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_keym_v2_t::signature_t::_read() {
|
||||
m_version = m__io->read_u1();
|
||||
m_size_bits = m__io->read_u2le();
|
||||
m_hash_algorithm_id = m__io->read_u2le();
|
||||
m_signature = m__io->read_bytes((size_bits() / 8));
|
||||
}
|
||||
|
||||
intel_keym_v2_t::signature_t::~signature_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_keym_v2_t::signature_t::_clean_up() {
|
||||
}
|
||||
|
||||
intel_keym_v2_t::public_key_t::public_key_t(kaitai::kstream* p__io, intel_keym_v2_t::key_signature_t* p__parent, intel_keym_v2_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_keym_v2_t::public_key_t::_read() {
|
||||
m_version = m__io->read_u1();
|
||||
m_size_bits = m__io->read_u2le();
|
||||
m_exponent = m__io->read_u4le();
|
||||
m_modulus = m__io->read_bytes((size_bits() / 8));
|
||||
}
|
||||
|
||||
intel_keym_v2_t::public_key_t::~public_key_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_keym_v2_t::public_key_t::_clean_up() {
|
||||
}
|
||||
|
||||
intel_keym_v2_t::header_t::header_t(kaitai::kstream* p__io, intel_keym_v2_t* p__parent, intel_keym_v2_t* p__root) : kaitai::kstruct(p__io) {
|
||||
m__parent = p__parent;
|
||||
m__root = p__root;
|
||||
|
||||
try {
|
||||
_read();
|
||||
} catch(...) {
|
||||
_clean_up();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
void intel_keym_v2_t::header_t::_read() {
|
||||
m_structure_id = static_cast<intel_keym_v2_t::structure_ids_t>(m__io->read_u8le());
|
||||
if (!(structure_id() == intel_keym_v2_t::STRUCTURE_IDS_KEYM)) {
|
||||
throw kaitai::validation_not_equal_error<intel_keym_v2_t::structure_ids_t>(intel_keym_v2_t::STRUCTURE_IDS_KEYM, structure_id(), _io(), std::string("/types/header/seq/0"));
|
||||
}
|
||||
m_version = m__io->read_u1();
|
||||
{
|
||||
uint8_t _ = version();
|
||||
if (!(_ >= 32)) {
|
||||
throw kaitai::validation_expr_error<uint8_t>(version(), _io(), std::string("/types/header/seq/1"));
|
||||
}
|
||||
}
|
||||
m_header_specific = m__io->read_u1();
|
||||
m_total_size = m__io->read_u2le();
|
||||
if (!(total_size() == 0)) {
|
||||
throw kaitai::validation_not_equal_error<uint16_t>(0, total_size(), _io(), std::string("/types/header/seq/3"));
|
||||
}
|
||||
}
|
||||
|
||||
intel_keym_v2_t::header_t::~header_t() {
|
||||
_clean_up();
|
||||
}
|
||||
|
||||
void intel_keym_v2_t::header_t::_clean_up() {
|
||||
}
|
224
common/generated/intel_keym_v2.h
Normal file
224
common/generated/intel_keym_v2.h
Normal file
@ -0,0 +1,224 @@
|
||||
#ifndef INTEL_KEYM_V2_H_
|
||||
#define INTEL_KEYM_V2_H_
|
||||
|
||||
// This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
|
||||
|
||||
#include "../kaitai/kaitaistruct.h"
|
||||
#include <stdint.h>
|
||||
#include <vector>
|
||||
|
||||
#if KAITAI_STRUCT_VERSION < 9000L
|
||||
#error "Incompatible Kaitai Struct C++/STL API: version 0.9 or later is required"
|
||||
#endif
|
||||
|
||||
class intel_keym_v2_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
class key_signature_t;
|
||||
class km_hash_t;
|
||||
class signature_t;
|
||||
class public_key_t;
|
||||
class header_t;
|
||||
|
||||
enum structure_ids_t {
|
||||
STRUCTURE_IDS_KEYM = 6872296602200661855LL
|
||||
};
|
||||
|
||||
enum km_usage_flags_t {
|
||||
KM_USAGE_FLAGS_BOOT_POLICY_MANIFEST = 1,
|
||||
KM_USAGE_FLAGS_FIT_PATCH_MANIFEST = 2,
|
||||
KM_USAGE_FLAGS_ACM_MANIFEST = 4,
|
||||
KM_USAGE_FLAGS_SDEV = 8
|
||||
};
|
||||
|
||||
intel_keym_v2_t(kaitai::kstream* p__io, kaitai::kstruct* p__parent = 0, intel_keym_v2_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~intel_keym_v2_t();
|
||||
|
||||
class key_signature_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
key_signature_t(kaitai::kstream* p__io, intel_keym_v2_t* p__parent = 0, intel_keym_v2_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~key_signature_t();
|
||||
|
||||
private:
|
||||
uint8_t m_version;
|
||||
uint16_t m_key_id;
|
||||
public_key_t* m_public_key;
|
||||
uint16_t m_sig_scheme;
|
||||
signature_t* m_signature;
|
||||
intel_keym_v2_t* m__root;
|
||||
intel_keym_v2_t* m__parent;
|
||||
|
||||
public:
|
||||
uint8_t version() const { return m_version; }
|
||||
uint16_t key_id() const { return m_key_id; }
|
||||
public_key_t* public_key() const { return m_public_key; }
|
||||
uint16_t sig_scheme() const { return m_sig_scheme; }
|
||||
signature_t* signature() const { return m_signature; }
|
||||
intel_keym_v2_t* _root() const { return m__root; }
|
||||
intel_keym_v2_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class km_hash_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
km_hash_t(kaitai::kstream* p__io, intel_keym_v2_t* p__parent = 0, intel_keym_v2_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~km_hash_t();
|
||||
|
||||
private:
|
||||
uint64_t m_usage_flags;
|
||||
uint16_t m_hash_algorithm_id;
|
||||
uint16_t m_len_hash;
|
||||
std::string m_hash;
|
||||
intel_keym_v2_t* m__root;
|
||||
intel_keym_v2_t* m__parent;
|
||||
|
||||
public:
|
||||
uint64_t usage_flags() const { return m_usage_flags; }
|
||||
uint16_t hash_algorithm_id() const { return m_hash_algorithm_id; }
|
||||
uint16_t len_hash() const { return m_len_hash; }
|
||||
std::string hash() const { return m_hash; }
|
||||
intel_keym_v2_t* _root() const { return m__root; }
|
||||
intel_keym_v2_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class signature_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
signature_t(kaitai::kstream* p__io, intel_keym_v2_t::key_signature_t* p__parent = 0, intel_keym_v2_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~signature_t();
|
||||
|
||||
private:
|
||||
uint8_t m_version;
|
||||
uint16_t m_size_bits;
|
||||
uint16_t m_hash_algorithm_id;
|
||||
std::string m_signature;
|
||||
intel_keym_v2_t* m__root;
|
||||
intel_keym_v2_t::key_signature_t* m__parent;
|
||||
|
||||
public:
|
||||
uint8_t version() const { return m_version; }
|
||||
uint16_t size_bits() const { return m_size_bits; }
|
||||
uint16_t hash_algorithm_id() const { return m_hash_algorithm_id; }
|
||||
std::string signature() const { return m_signature; }
|
||||
intel_keym_v2_t* _root() const { return m__root; }
|
||||
intel_keym_v2_t::key_signature_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class public_key_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
public_key_t(kaitai::kstream* p__io, intel_keym_v2_t::key_signature_t* p__parent = 0, intel_keym_v2_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~public_key_t();
|
||||
|
||||
private:
|
||||
uint8_t m_version;
|
||||
uint16_t m_size_bits;
|
||||
uint32_t m_exponent;
|
||||
std::string m_modulus;
|
||||
intel_keym_v2_t* m__root;
|
||||
intel_keym_v2_t::key_signature_t* m__parent;
|
||||
|
||||
public:
|
||||
uint8_t version() const { return m_version; }
|
||||
uint16_t size_bits() const { return m_size_bits; }
|
||||
uint32_t exponent() const { return m_exponent; }
|
||||
std::string modulus() const { return m_modulus; }
|
||||
intel_keym_v2_t* _root() const { return m__root; }
|
||||
intel_keym_v2_t::key_signature_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
class header_t : public kaitai::kstruct {
|
||||
|
||||
public:
|
||||
|
||||
header_t(kaitai::kstream* p__io, intel_keym_v2_t* p__parent = 0, intel_keym_v2_t* p__root = 0);
|
||||
|
||||
private:
|
||||
void _read();
|
||||
void _clean_up();
|
||||
|
||||
public:
|
||||
~header_t();
|
||||
|
||||
private:
|
||||
structure_ids_t m_structure_id;
|
||||
uint8_t m_version;
|
||||
uint8_t m_header_specific;
|
||||
uint16_t m_total_size;
|
||||
intel_keym_v2_t* m__root;
|
||||
intel_keym_v2_t* m__parent;
|
||||
|
||||
public:
|
||||
structure_ids_t structure_id() const { return m_structure_id; }
|
||||
uint8_t version() const { return m_version; }
|
||||
uint8_t header_specific() const { return m_header_specific; }
|
||||
uint16_t total_size() const { return m_total_size; }
|
||||
intel_keym_v2_t* _root() const { return m__root; }
|
||||
intel_keym_v2_t* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
private:
|
||||
header_t* m_header;
|
||||
uint16_t m_key_signature_offset;
|
||||
std::vector<uint8_t>* m_reserved;
|
||||
uint8_t m_km_version;
|
||||
uint8_t m_km_svn;
|
||||
uint8_t m_km_id;
|
||||
uint16_t m_fpf_hash_algorithm_id;
|
||||
uint16_t m_num_km_hashes;
|
||||
std::vector<km_hash_t*>* m_km_hashes;
|
||||
key_signature_t* m_key_signature;
|
||||
intel_keym_v2_t* m__root;
|
||||
kaitai::kstruct* m__parent;
|
||||
|
||||
public:
|
||||
header_t* header() const { return m_header; }
|
||||
uint16_t key_signature_offset() const { return m_key_signature_offset; }
|
||||
std::vector<uint8_t>* reserved() const { return m_reserved; }
|
||||
uint8_t km_version() const { return m_km_version; }
|
||||
uint8_t km_svn() const { return m_km_svn; }
|
||||
uint8_t km_id() const { return m_km_id; }
|
||||
uint16_t fpf_hash_algorithm_id() const { return m_fpf_hash_algorithm_id; }
|
||||
uint16_t num_km_hashes() const { return m_num_km_hashes; }
|
||||
std::vector<km_hash_t*>* km_hashes() const { return m_km_hashes; }
|
||||
key_signature_t* key_signature() const { return m_key_signature; }
|
||||
intel_keym_v2_t* _root() const { return m__root; }
|
||||
kaitai::kstruct* _parent() const { return m__parent; }
|
||||
};
|
||||
|
||||
#endif // INTEL_KEYM_V2_H_
|
226
common/intel_fit.h
Executable file
226
common/intel_fit.h
Executable file
@ -0,0 +1,226 @@
|
||||
/* intel_fit.h
|
||||
|
||||
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
|
||||
http://opensource.org/licenses/bsd-license.php
|
||||
|
||||
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||
WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
*/
|
||||
|
||||
#ifndef INTEL_FIT_H
|
||||
#define INTEL_FIT_H
|
||||
|
||||
#include "basetypes.h"
|
||||
#include "ubytearray.h"
|
||||
|
||||
// Make sure we use right packing rules
|
||||
#pragma pack(push, 1)
|
||||
|
||||
// Memory address of a pointer to FIT, 40h back from the end of flash chip
|
||||
#define INTEL_FIT_POINTER_OFFSET 0x40
|
||||
|
||||
// Entry types
|
||||
// https://www.intel.com/content/dam/develop/external/us/en/documents/firmware-interface-table-bios-specification-r1p2p1.pdf
|
||||
#define INTEL_FIT_TYPE_HEADER 0x00
|
||||
#define INTEL_FIT_TYPE_MICROCODE 0x01
|
||||
#define INTEL_FIT_TYPE_STARTUP_AC_MODULE 0x02
|
||||
#define INTEL_FIT_TYPE_DIAG_AC_MODULE 0x03
|
||||
//#define INTEL_FIT_TYPE_INTEL_RESERVED_04 0x04
|
||||
//#define INTEL_FIT_TYPE_INTEL_RESERVED_05 0x05
|
||||
//#define INTEL_FIT_TYPE_INTEL_RESERVED_06 0x06
|
||||
#define INTEL_FIT_TYPE_BIOS_STARTUP_MODULE 0x07
|
||||
#define INTEL_FIT_TYPE_TPM_POLICY 0x08
|
||||
#define INTEL_FIT_TYPE_BIOS_POLICY 0x09
|
||||
#define INTEL_FIT_TYPE_TXT_POLICY 0x0A
|
||||
#define INTEL_FIT_TYPE_BOOT_GUARD_KEY_MANIFEST 0x0B
|
||||
#define INTEL_FIT_TYPE_BOOT_GUARD_BOOT_POLICY 0x0C
|
||||
//#define INTEL_FIT_TYPE_INTEL_RESERVED_0D 0x0D
|
||||
//#define INTEL_FIT_TYPE_INTEL_RESERVED_0E 0x0E
|
||||
//#define INTEL_FIT_TYPE_INTEL_RESERVED_0F 0x0F
|
||||
#define INTEL_FIT_TYPE_CSE_SECURE_BOOT 0x10
|
||||
//#define INTEL_FIT_TYPE_INTEL_RESERVED_11 0x11
|
||||
//...
|
||||
//#define INTEL_FIT_TYPE_INTEL_RESERVED_2C 0x2C
|
||||
#define INTEL_FIT_TYPE_ACM_FEATURE_POLICY 0x2D
|
||||
//#define INTEL_FIT_TYPE_INTEL_RESERVED_2E 0x2E
|
||||
#define INTEL_FIT_TYPE_JMP_DEBUG_POLICY 0x2F
|
||||
#define INTEL_FIT_TYPE_OEM_RESERVED_30 0x30
|
||||
//...
|
||||
#define INTEL_FIT_TYPE_OEM_RESERVED_70 0x70
|
||||
//#define INTEL_FIT_TYPE_INTEL_RESERVED_71 0x71
|
||||
//...
|
||||
//#define INTEL_FIT_TYPE_INTEL_RESERVED_7E 0x7E
|
||||
#define INTEL_FIT_TYPE_EMPTY 0x7F
|
||||
|
||||
typedef struct INTEL_FIT_ENTRY_ {
|
||||
UINT64 Address; // Base address of the component, must be 16-byte aligned
|
||||
UINT32 Size : 24; // Size of the component, in multiple of 16 bytes
|
||||
UINT32 Reserved : 8; // Reserved, must be set to zero
|
||||
UINT16 Version; // BCD, minor in lower byte, major in upper byte
|
||||
UINT8 Type : 7; // FIT entries must be aranged in ascending order of Type
|
||||
UINT8 ChecksumValid : 1;// Checksum must be ignored if this bit is not set
|
||||
UINT8 Checksum; // checksum8 of all the bytes in the component and this field must add to zero
|
||||
} INTEL_FIT_ENTRY;
|
||||
|
||||
//
|
||||
// FIT Header
|
||||
//
|
||||
// Can be exactly one entry of this type, the first one.
|
||||
// If ChecksumValid bit is set, the whole FIT table must checksum8 to zero.
|
||||
#define INTEL_FIT_SIGNATURE 0x2020205F5449465FULL // '_FIT_ '
|
||||
#define INTEL_FIT_HEADER_VERSION 0x0100
|
||||
|
||||
//
|
||||
// Microcode
|
||||
//
|
||||
// At least one entry is required, more is optional
|
||||
// Each entry must point to a valid base address
|
||||
// Microcode slots can be empty (first 4 bytes at the base address are FF FF FF FF)
|
||||
// Base address must be aligned to 16 bytes
|
||||
// The item at the base address must not be compressed/encoded/encrypted
|
||||
// ChecksumValid bit must be 0
|
||||
// Size is not used, should be set to 0
|
||||
|
||||
//
|
||||
// Startup Authenticated Code Module
|
||||
//
|
||||
// Optional, required for AC boot and BootGuard
|
||||
// Address must point to a valid base address
|
||||
// Points to the first byte of ACM header
|
||||
// One MTRR base/limit pair is used to map Startup ACM, so
|
||||
// MTRR_Base must be a multiple of MTRR_Size, the can be found by the following formula
|
||||
// MTTR_Size = 2^(ceil(log2(Startup_ACM_Size))), i.e. the next integer that's a full power of 2 to Startup_ACM_Size
|
||||
// The whole area of [MTRR_Base; MTRR_Base + MTRR_Size) is named
|
||||
// Authenticated Code Execution Area (ACEA) and should not contain any code or data that is not the Startup ACM itself
|
||||
// ChecksumValid bit must be 0
|
||||
// Size is not used, should be set to 0
|
||||
#define INTEL_FIT_STARTUP_ACM_VERSION 0x0100
|
||||
#define INTEL_ACM_HARDCODED_RSA_EXPONENT 0x10001
|
||||
|
||||
//
|
||||
// Diagnostic Authenticated Code Module
|
||||
//
|
||||
// Optional
|
||||
// Address must point to a valid base address
|
||||
// Points to the first byte of ACM header, that must be 4Kb-aligned
|
||||
// ChecksumValid bit must be 0
|
||||
// Size is not used, should be set to 0
|
||||
#define INTEL_FIT_DIAG_ACM_VERSION 0x0100
|
||||
|
||||
//
|
||||
// BIOS Startup Module
|
||||
//
|
||||
// Optional, used for legacy TXT FIT boot
|
||||
// Address must point to a valid base address
|
||||
// At least one entry of this type must point to an item containing the reset vector
|
||||
// At least one entry of this type must point to an item containing the FIT pointer
|
||||
// No entries of this type can point to an item containing an item pointed by INTEL_FIT_TYPE_BIOS_POLICY entry
|
||||
// Items pointed by entries of this type can not overlap with one another or the Startup ACM
|
||||
// ChecksumValid bit must be 0
|
||||
// Size is used and in 16-byte multiples
|
||||
#define INTEL_FIT_BIOS_STARTUP_MODULE_VERSION 0x0100
|
||||
|
||||
//
|
||||
// TPM Boot Policy
|
||||
//
|
||||
// Optional, used for legacy TXT FIT boot, if used, can be only one
|
||||
// Address entry is INTEL_FIT_POLICY_PTR.IndexIo if Version is 0,
|
||||
// or INTEL_FIT_INDEX_IO_ADDRESS.FlatMemoryAddress if Version is 1
|
||||
// Bit 0 at the pointed address holds the TPM policy, 0 - TPM disabled, 1 - TPM enabled
|
||||
// ChecksumValid bit must be 0
|
||||
// Size is not used, should be set to 0
|
||||
typedef struct INTEL_FIT_INDEX_IO_ADDRESS_ {
|
||||
UINT16 IndexRegisterAddress;
|
||||
UINT16 DataRegisterAddress;
|
||||
UINT8 AccessWidthInBytes; // 1 => 1-byte accesses, 2 => 2-byte
|
||||
UINT8 BitPosition; // Bit number, 15 => Bit15
|
||||
UINT16 Index;
|
||||
} INTEL_FIT_INDEX_IO_ADDRESS;
|
||||
|
||||
typedef union INTEL_FIT_POLICY_PTR_ {
|
||||
UINT64 FlatMemoryAddress;
|
||||
INTEL_FIT_INDEX_IO_ADDRESS IndexIo;
|
||||
} INTEL_FIT_POLICY_PTR;
|
||||
|
||||
#define INTEL_FIT_POLICY_VERSION_INDEX_IO 0
|
||||
#define INTEL_FIT_POLICY_VERSION_FLAT_MEMORY_ADDRESS 1
|
||||
|
||||
#define INTEL_FIT_POLICY_DISABLED 1
|
||||
#define INTEL_FIT_POLICY_ENABLED 1
|
||||
|
||||
//
|
||||
// BIOS Policy
|
||||
//
|
||||
// Optional, used for legacy TXT FIT boot, if used, can be only one
|
||||
// Address must point to a valid base address
|
||||
// Points to the first byte of LCP_POLICY_DATA structure
|
||||
// ChecksumValid bit must be 0
|
||||
// Size must not be less than the size of LCP_POLICY_DATA structure
|
||||
#define INTEL_FIT_BIOS_POLICY_VERSION 0x0100
|
||||
|
||||
|
||||
//
|
||||
// TXT Boot Policy
|
||||
//
|
||||
// Optional, if used, can be only one
|
||||
// Address entry is INTEL_FIT_POLICY_PTR.IndexIo if Version is 0,
|
||||
// or INTEL_FIT_INDEX_IO_ADDRESS.FlatMemoryAddress if Version is 1
|
||||
// Bit 0 at the pointed address holds the TXT policy, 0 - TXT disabled, 1 - TXT enabled
|
||||
// ChecksumValid bit must be 0
|
||||
// Size is not used, should be set to 0
|
||||
|
||||
//
|
||||
// BootGuard Key Manifest
|
||||
//
|
||||
// Optional, can be multiple, entries must be grouped together
|
||||
// Address must point to a valid base address
|
||||
// ChecksumValid bit must be 0
|
||||
// Size must not be less than the size of INTEL_BOOT_GUARD_KEY_MANIFEST structure
|
||||
#define INTEL_FIT_BOOT_GUARD_KEY_MANIFEST_VERSION 0x0100
|
||||
|
||||
//
|
||||
// BootGuard Boot Policy Manifest
|
||||
//
|
||||
// Optional, can be multiple, only the first one will be used
|
||||
// Address must point to a valid base address
|
||||
// ChecksumValid bit must be 0
|
||||
// Size must not be less than the size of INTEL_BOOT_GUARD_BOOT_POLICY structure
|
||||
#define INTEL_FIT_BOOT_GUARD_KEY_MANIFEST_VERSION 0x0100
|
||||
|
||||
//
|
||||
// CSE SecureBoot
|
||||
//
|
||||
// Optional, can be multiple, order is not important
|
||||
// If present, BootGuardKeyManifest and BootGuardBootPolicy should also be present
|
||||
// Reserved field further dermines the subtype of this entry
|
||||
// ChecksumValid bit must be 0
|
||||
#define INTEL_FIT_CSE_SECURE_BOOT_VERSION 0x0100
|
||||
|
||||
#define INTEL_FIT_CSE_SECURE_BOOT_RESERVED 0
|
||||
#define INTEL_FIT_CSE_SECURE_BOOT_KEY_HASH 1
|
||||
#define INTEL_FIT_CSE_SECURE_BOOT_CSE_MEASUREMENT_HASH 2
|
||||
#define INTEL_FIT_CSE_SECURE_BOOT_BOOT_POLICY 3
|
||||
#define INTEL_FIT_CSE_SECURE_BOOT_OTHER_BOOT_POLICY 4
|
||||
#define INTEL_FIT_CSE_SECURE_BOOT_OEM_SMIP 5
|
||||
#define INTEL_FIT_CSE_SECURE_BOOT_MRC_TRAINING_DATA 6
|
||||
#define INTEL_FIT_CSE_SECURE_BOOT_IBBL_HASH 7
|
||||
#define INTEL_FIT_CSE_SECURE_BOOT_IBB_HASH 8
|
||||
#define INTEL_FIT_CSE_SECURE_BOOT_OEM_ID 9
|
||||
#define INTEL_FIT_CSE_SECURE_BOOT_OEM_SKU_ID 10
|
||||
#define INTEL_FIT_CSE_SECURE_BOOT_BOOT_DEVICE_INDICATOR 11 // 1 => SPI, 2 => eMMC, 3 => UFS, rest => reserved
|
||||
#define INTEL_FIT_CSE_SECURE_BOOT_FIT_PATCH_MANIFEST 12
|
||||
#define INTEL_FIT_CSE_SECURE_BOOT_AC_MODULE_MANIFEST 13
|
||||
|
||||
//
|
||||
// ACM Feature Policy Record
|
||||
//
|
||||
// Optional, can be multiple
|
||||
// ChecksumValid bit must be 0
|
||||
#define INTEL_FIT_ACM_FEATURE_POLICY_VERSION 0x0100
|
||||
|
||||
#pragma pack(pop)
|
||||
|
||||
#endif // INTEL_FIT_H
|
51
common/fit.h → common/intel_microcode.h
Executable file → Normal file
51
common/fit.h → common/intel_microcode.h
Executable file → Normal file
@ -1,6 +1,6 @@
|
||||
/* fit.h
|
||||
/* intel_microcode.h
|
||||
|
||||
Copyright (c) 2015, Nikolaj Schlej. All rights reserved.
|
||||
Copyright (c) 2022, 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
|
||||
@ -10,8 +10,8 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||
WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
*/
|
||||
|
||||
#ifndef FIT_H
|
||||
#define FIT_H
|
||||
#ifndef INTEL_MICROCODE_H
|
||||
#define INTEL_MICROCODE_H
|
||||
|
||||
#include "basetypes.h"
|
||||
#include "ubytearray.h"
|
||||
@ -19,46 +19,7 @@ WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
// Make sure we use right packing rules
|
||||
#pragma pack(push, 1)
|
||||
|
||||
// Memory address of a pointer to FIT, 40h back from the end of flash chip
|
||||
#define FIT_POINTER_OFFSET 0x40
|
||||
|
||||
// Entry types
|
||||
#define FIT_TYPE_HEADER 0x00
|
||||
#define FIT_TYPE_MICROCODE 0x01
|
||||
#define FIT_TYPE_BIOS_AC_MODULE 0x02
|
||||
#define FIT_TYPE_BIOS_INIT_MODULE 0x07
|
||||
#define FIT_TYPE_TPM_POLICY 0x08
|
||||
#define FIT_TYPE_BIOS_POLICY_DATA 0x09
|
||||
#define FIT_TYPE_TXT_CONF_POLICY 0x0A
|
||||
#define FIT_TYPE_AC_KEY_MANIFEST 0x0B
|
||||
#define FIT_TYPE_AC_BOOT_POLICY 0x0C
|
||||
#define FIT_TYPE_EMPTY 0x7F
|
||||
|
||||
#define FIT_HEADER_VERSION 0x0100
|
||||
#define FIT_MICROCODE_VERSION 0x0100
|
||||
|
||||
const UByteArray FIT_SIGNATURE
|
||||
("\x5F\x46\x49\x54\x5F\x20\x20\x20", 8);
|
||||
|
||||
typedef struct FIT_ENTRY_ {
|
||||
UINT64 Address;
|
||||
UINT32 Size : 24;
|
||||
UINT32 : 8;
|
||||
UINT16 Version;
|
||||
UINT8 Type : 7;
|
||||
UINT8 CsFlag : 1;
|
||||
UINT8 Checksum;
|
||||
} FIT_ENTRY;
|
||||
|
||||
typedef struct {
|
||||
UINT16 IndexRegisterAddress;
|
||||
UINT16 DataRegisterAddress;
|
||||
UINT8 AccessWidth;
|
||||
UINT8 BitPosition;
|
||||
UINT16 Index;
|
||||
} FIT_ENTRY_VERSION_0_CONFIG_POLICY;
|
||||
|
||||
// This scructure is described in Section 9.11.1 of the Intel Software Developer manual Volume 3A Part 1
|
||||
// This structure is described in Section 9.11.1 of the Intel Software Developer manual Volume 3A Part 1
|
||||
typedef struct INTEL_MICROCODE_HEADER_ {
|
||||
UINT32 HeaderVersion; // 0x00000001
|
||||
UINT32 UpdateRevision;
|
||||
@ -106,4 +67,4 @@ typedef struct INTEL_MICROCODE_EXTENDED_HEADER_ENTRY_ {
|
||||
|
||||
#pragma pack(pop)
|
||||
|
||||
#endif // FIT_H
|
||||
#endif // INTEL_MICROCODE_H
|
16
common/kaitai/custom_decoder.h
Normal file
16
common/kaitai/custom_decoder.h
Normal file
@ -0,0 +1,16 @@
|
||||
#ifndef KAITAI_CUSTOM_DECODER_H
|
||||
#define KAITAI_CUSTOM_DECODER_H
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace kaitai {
|
||||
|
||||
class custom_decoder {
|
||||
public:
|
||||
virtual ~custom_decoder() {};
|
||||
virtual std::string decode(std::string src) = 0;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
189
common/kaitai/exceptions.h
Normal file
189
common/kaitai/exceptions.h
Normal file
@ -0,0 +1,189 @@
|
||||
#ifndef KAITAI_EXCEPTIONS_H
|
||||
#define KAITAI_EXCEPTIONS_H
|
||||
|
||||
#include "kaitaistream.h"
|
||||
|
||||
#include <string>
|
||||
#include <stdexcept>
|
||||
|
||||
// We need to use "noexcept" in virtual destructor of our exceptions
|
||||
// subclasses. Different compilers have different ideas on how to
|
||||
// achieve that: C++98 compilers prefer `throw()`, C++11 and later
|
||||
// use `noexcept`. We define KS_NOEXCEPT macro for that.
|
||||
|
||||
#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900)
|
||||
#define KS_NOEXCEPT noexcept
|
||||
#else
|
||||
#define KS_NOEXCEPT throw()
|
||||
#endif
|
||||
|
||||
namespace kaitai {
|
||||
|
||||
/**
|
||||
* Common ancestor for all error originating from Kaitai Struct usage.
|
||||
* Stores KSY source path, pointing to an element supposedly guilty of
|
||||
* an error.
|
||||
*/
|
||||
class kstruct_error: public std::runtime_error {
|
||||
public:
|
||||
kstruct_error(const std::string what, const std::string src_path):
|
||||
std::runtime_error(src_path + ": " + what),
|
||||
m_src_path(src_path)
|
||||
{
|
||||
}
|
||||
|
||||
virtual ~kstruct_error() KS_NOEXCEPT {};
|
||||
|
||||
protected:
|
||||
const std::string m_src_path;
|
||||
};
|
||||
|
||||
/**
|
||||
* Error that occurs when default endianness should be decided with
|
||||
* a switch, but nothing matches (although using endianness expression
|
||||
* implies that there should be some positive result).
|
||||
*/
|
||||
class undecided_endianness_error: public kstruct_error {
|
||||
public:
|
||||
undecided_endianness_error(const std::string src_path):
|
||||
kstruct_error("unable to decide on endianness for a type", src_path)
|
||||
{
|
||||
}
|
||||
|
||||
virtual ~undecided_endianness_error() KS_NOEXCEPT {};
|
||||
};
|
||||
|
||||
/**
|
||||
* Common ancestor for all validation failures. Stores pointer to
|
||||
* KaitaiStream IO object which was involved in an error.
|
||||
*/
|
||||
class validation_failed_error: public kstruct_error {
|
||||
public:
|
||||
validation_failed_error(const std::string what, kstream* io, const std::string src_path):
|
||||
kstruct_error("at pos " + kstream::to_string(io->pos()) + ": validation failed: " + what, src_path),
|
||||
m_io(io)
|
||||
{
|
||||
}
|
||||
|
||||
// "at pos #{io.pos}: validation failed: #{msg}"
|
||||
|
||||
virtual ~validation_failed_error() KS_NOEXCEPT {};
|
||||
|
||||
protected:
|
||||
kstream* m_io;
|
||||
};
|
||||
|
||||
/**
|
||||
* Signals validation failure: we required "actual" value to be equal to
|
||||
* "expected", but it turned out that it's not.
|
||||
*/
|
||||
template<typename T>
|
||||
class validation_not_equal_error: public validation_failed_error {
|
||||
public:
|
||||
validation_not_equal_error<T>(const T& expected, const T& actual, kstream* io, const std::string src_path):
|
||||
validation_failed_error("not equal", io, src_path),
|
||||
m_expected(expected),
|
||||
m_actual(actual)
|
||||
{
|
||||
}
|
||||
|
||||
// "not equal, expected #{expected.inspect}, but got #{actual.inspect}"
|
||||
|
||||
virtual ~validation_not_equal_error<T>() KS_NOEXCEPT {};
|
||||
|
||||
protected:
|
||||
const T& m_expected;
|
||||
const T& m_actual;
|
||||
};
|
||||
|
||||
/**
|
||||
* Signals validation failure: we required "actual" value to be greater
|
||||
* than or equal to "min", but it turned out that it's not.
|
||||
*/
|
||||
template<typename T>
|
||||
class validation_less_than_error: public validation_failed_error {
|
||||
public:
|
||||
validation_less_than_error<T>(const T& min, const T& actual, kstream* io, const std::string src_path):
|
||||
validation_failed_error("not in range", io, src_path),
|
||||
m_min(min),
|
||||
m_actual(actual)
|
||||
{
|
||||
}
|
||||
|
||||
// "not in range, min #{min.inspect}, but got #{actual.inspect}"
|
||||
|
||||
virtual ~validation_less_than_error<T>() KS_NOEXCEPT {};
|
||||
|
||||
protected:
|
||||
const T& m_min;
|
||||
const T& m_actual;
|
||||
};
|
||||
|
||||
/**
|
||||
* Signals validation failure: we required "actual" value to be less
|
||||
* than or equal to "max", but it turned out that it's not.
|
||||
*/
|
||||
template<typename T>
|
||||
class validation_greater_than_error: public validation_failed_error {
|
||||
public:
|
||||
validation_greater_than_error<T>(const T& max, const T& actual, kstream* io, const std::string src_path):
|
||||
validation_failed_error("not in range", io, src_path),
|
||||
m_max(max),
|
||||
m_actual(actual)
|
||||
{
|
||||
}
|
||||
|
||||
// "not in range, max #{max.inspect}, but got #{actual.inspect}"
|
||||
|
||||
virtual ~validation_greater_than_error<T>() KS_NOEXCEPT {};
|
||||
|
||||
protected:
|
||||
const T& m_max;
|
||||
const T& m_actual;
|
||||
};
|
||||
|
||||
/**
|
||||
* Signals validation failure: we required "actual" value to be from
|
||||
* the list, but it turned out that it's not.
|
||||
*/
|
||||
template<typename T>
|
||||
class validation_not_any_of_error: public validation_failed_error {
|
||||
public:
|
||||
validation_not_any_of_error<T>(const T& actual, kstream* io, const std::string src_path):
|
||||
validation_failed_error("not any of the list", io, src_path),
|
||||
m_actual(actual)
|
||||
{
|
||||
}
|
||||
|
||||
// "not any of the list, got #{actual.inspect}"
|
||||
|
||||
virtual ~validation_not_any_of_error<T>() KS_NOEXCEPT {};
|
||||
|
||||
protected:
|
||||
const T& m_actual;
|
||||
};
|
||||
|
||||
/**
|
||||
* Signals validation failure: we required "actual" value to match
|
||||
* the expression, but it turned out that it doesn't.
|
||||
*/
|
||||
template<typename T>
|
||||
class validation_expr_error: public validation_failed_error {
|
||||
public:
|
||||
validation_expr_error<T>(const T& actual, kstream* io, const std::string src_path):
|
||||
validation_failed_error("not matching the expression", io, src_path),
|
||||
m_actual(actual)
|
||||
{
|
||||
}
|
||||
|
||||
// "not matching the expression, got #{actual.inspect}"
|
||||
|
||||
virtual ~validation_expr_error<T>() KS_NOEXCEPT {};
|
||||
|
||||
protected:
|
||||
const T& m_actual;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
693
common/kaitai/kaitaistream.cpp
Normal file
693
common/kaitai/kaitaistream.cpp
Normal file
@ -0,0 +1,693 @@
|
||||
#include "kaitaistream.h"
|
||||
|
||||
#define KS_STR_ENCODING_NONE
|
||||
|
||||
#if defined(__APPLE__)
|
||||
#include <machine/endian.h>
|
||||
#include <libkern/OSByteOrder.h>
|
||||
#define bswap_16(x) OSSwapInt16(x)
|
||||
#define bswap_32(x) OSSwapInt32(x)
|
||||
#define bswap_64(x) OSSwapInt64(x)
|
||||
#define __BYTE_ORDER BYTE_ORDER
|
||||
#define __BIG_ENDIAN BIG_ENDIAN
|
||||
#define __LITTLE_ENDIAN LITTLE_ENDIAN
|
||||
#elif defined(_MSC_VER) // !__APPLE__
|
||||
#include <stdlib.h>
|
||||
#define __LITTLE_ENDIAN 1234
|
||||
#define __BIG_ENDIAN 4321
|
||||
#define __BYTE_ORDER __LITTLE_ENDIAN
|
||||
#define bswap_16(x) _byteswap_ushort(x)
|
||||
#define bswap_32(x) _byteswap_ulong(x)
|
||||
#define bswap_64(x) _byteswap_uint64(x)
|
||||
#else // !__APPLE__ or !_MSC_VER
|
||||
#include <endian.h>
|
||||
#include <byteswap.h>
|
||||
#endif
|
||||
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
#include <stdexcept>
|
||||
|
||||
kaitai::kstream::kstream(std::istream *io) {
|
||||
m_io = io;
|
||||
init();
|
||||
}
|
||||
|
||||
kaitai::kstream::kstream(const std::string &data) : m_io_str(data) {
|
||||
m_io = &m_io_str;
|
||||
init();
|
||||
}
|
||||
|
||||
void kaitai::kstream::init() {
|
||||
exceptions_enable();
|
||||
align_to_byte();
|
||||
}
|
||||
|
||||
void kaitai::kstream::close() {
|
||||
// m_io->close();
|
||||
}
|
||||
|
||||
void kaitai::kstream::exceptions_enable() const {
|
||||
m_io->exceptions(
|
||||
std::istream::eofbit |
|
||||
std::istream::failbit |
|
||||
std::istream::badbit
|
||||
);
|
||||
}
|
||||
|
||||
// ========================================================================
|
||||
// Stream positioning
|
||||
// ========================================================================
|
||||
|
||||
bool kaitai::kstream::is_eof() const {
|
||||
if (m_bits_left > 0) {
|
||||
return false;
|
||||
}
|
||||
char t;
|
||||
m_io->exceptions(std::istream::badbit);
|
||||
m_io->get(t);
|
||||
if (m_io->eof()) {
|
||||
m_io->clear();
|
||||
exceptions_enable();
|
||||
return true;
|
||||
} else {
|
||||
m_io->unget();
|
||||
exceptions_enable();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
void kaitai::kstream::seek(uint64_t pos) {
|
||||
m_io->seekg(pos);
|
||||
}
|
||||
|
||||
uint64_t kaitai::kstream::pos() {
|
||||
return m_io->tellg();
|
||||
}
|
||||
|
||||
uint64_t kaitai::kstream::size() {
|
||||
std::iostream::pos_type cur_pos = m_io->tellg();
|
||||
m_io->seekg(0, std::ios::end);
|
||||
std::iostream::pos_type len = m_io->tellg();
|
||||
m_io->seekg(cur_pos);
|
||||
return len;
|
||||
}
|
||||
|
||||
// ========================================================================
|
||||
// Integer numbers
|
||||
// ========================================================================
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
// Signed
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
int8_t kaitai::kstream::read_s1() {
|
||||
char t;
|
||||
m_io->get(t);
|
||||
return t;
|
||||
}
|
||||
|
||||
// ........................................................................
|
||||
// Big-endian
|
||||
// ........................................................................
|
||||
|
||||
int16_t kaitai::kstream::read_s2be() {
|
||||
int16_t t;
|
||||
m_io->read(reinterpret_cast<char *>(&t), 2);
|
||||
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
||||
t = bswap_16(t);
|
||||
#endif
|
||||
return t;
|
||||
}
|
||||
|
||||
int32_t kaitai::kstream::read_s4be() {
|
||||
int32_t t;
|
||||
m_io->read(reinterpret_cast<char *>(&t), 4);
|
||||
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
||||
t = bswap_32(t);
|
||||
#endif
|
||||
return t;
|
||||
}
|
||||
|
||||
int64_t kaitai::kstream::read_s8be() {
|
||||
int64_t t;
|
||||
m_io->read(reinterpret_cast<char *>(&t), 8);
|
||||
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
||||
t = bswap_64(t);
|
||||
#endif
|
||||
return t;
|
||||
}
|
||||
|
||||
// ........................................................................
|
||||
// Little-endian
|
||||
// ........................................................................
|
||||
|
||||
int16_t kaitai::kstream::read_s2le() {
|
||||
int16_t t;
|
||||
m_io->read(reinterpret_cast<char *>(&t), 2);
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
t = bswap_16(t);
|
||||
#endif
|
||||
return t;
|
||||
}
|
||||
|
||||
int32_t kaitai::kstream::read_s4le() {
|
||||
int32_t t;
|
||||
m_io->read(reinterpret_cast<char *>(&t), 4);
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
t = bswap_32(t);
|
||||
#endif
|
||||
return t;
|
||||
}
|
||||
|
||||
int64_t kaitai::kstream::read_s8le() {
|
||||
int64_t t;
|
||||
m_io->read(reinterpret_cast<char *>(&t), 8);
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
t = bswap_64(t);
|
||||
#endif
|
||||
return t;
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
// Unsigned
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
uint8_t kaitai::kstream::read_u1() {
|
||||
char t;
|
||||
m_io->get(t);
|
||||
return t;
|
||||
}
|
||||
|
||||
// ........................................................................
|
||||
// Big-endian
|
||||
// ........................................................................
|
||||
|
||||
uint16_t kaitai::kstream::read_u2be() {
|
||||
uint16_t t;
|
||||
m_io->read(reinterpret_cast<char *>(&t), 2);
|
||||
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
||||
t = bswap_16(t);
|
||||
#endif
|
||||
return t;
|
||||
}
|
||||
|
||||
uint32_t kaitai::kstream::read_u4be() {
|
||||
uint32_t t;
|
||||
m_io->read(reinterpret_cast<char *>(&t), 4);
|
||||
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
||||
t = bswap_32(t);
|
||||
#endif
|
||||
return t;
|
||||
}
|
||||
|
||||
uint64_t kaitai::kstream::read_u8be() {
|
||||
uint64_t t;
|
||||
m_io->read(reinterpret_cast<char *>(&t), 8);
|
||||
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
||||
t = bswap_64(t);
|
||||
#endif
|
||||
return t;
|
||||
}
|
||||
|
||||
// ........................................................................
|
||||
// Little-endian
|
||||
// ........................................................................
|
||||
|
||||
uint16_t kaitai::kstream::read_u2le() {
|
||||
uint16_t t;
|
||||
m_io->read(reinterpret_cast<char *>(&t), 2);
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
t = bswap_16(t);
|
||||
#endif
|
||||
return t;
|
||||
}
|
||||
|
||||
uint32_t kaitai::kstream::read_u4le() {
|
||||
uint32_t t;
|
||||
m_io->read(reinterpret_cast<char *>(&t), 4);
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
t = bswap_32(t);
|
||||
#endif
|
||||
return t;
|
||||
}
|
||||
|
||||
uint64_t kaitai::kstream::read_u8le() {
|
||||
uint64_t t;
|
||||
m_io->read(reinterpret_cast<char *>(&t), 8);
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
t = bswap_64(t);
|
||||
#endif
|
||||
return t;
|
||||
}
|
||||
|
||||
// ========================================================================
|
||||
// Floating point numbers
|
||||
// ========================================================================
|
||||
|
||||
// ........................................................................
|
||||
// Big-endian
|
||||
// ........................................................................
|
||||
|
||||
float kaitai::kstream::read_f4be() {
|
||||
uint32_t t;
|
||||
m_io->read(reinterpret_cast<char *>(&t), 4);
|
||||
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
||||
t = bswap_32(t);
|
||||
#endif
|
||||
return reinterpret_cast<float &>(t);
|
||||
}
|
||||
|
||||
double kaitai::kstream::read_f8be() {
|
||||
uint64_t t;
|
||||
m_io->read(reinterpret_cast<char *>(&t), 8);
|
||||
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
||||
t = bswap_64(t);
|
||||
#endif
|
||||
return reinterpret_cast<double &>(t);
|
||||
}
|
||||
|
||||
// ........................................................................
|
||||
// Little-endian
|
||||
// ........................................................................
|
||||
|
||||
float kaitai::kstream::read_f4le() {
|
||||
uint32_t t;
|
||||
m_io->read(reinterpret_cast<char *>(&t), 4);
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
t = bswap_32(t);
|
||||
#endif
|
||||
return reinterpret_cast<float &>(t);
|
||||
}
|
||||
|
||||
double kaitai::kstream::read_f8le() {
|
||||
uint64_t t;
|
||||
m_io->read(reinterpret_cast<char *>(&t), 8);
|
||||
#if __BYTE_ORDER == __BIG_ENDIAN
|
||||
t = bswap_64(t);
|
||||
#endif
|
||||
return reinterpret_cast<double &>(t);
|
||||
}
|
||||
|
||||
// ========================================================================
|
||||
// Unaligned bit values
|
||||
// ========================================================================
|
||||
|
||||
void kaitai::kstream::align_to_byte() {
|
||||
m_bits_left = 0;
|
||||
m_bits = 0;
|
||||
}
|
||||
|
||||
uint64_t kaitai::kstream::read_bits_int_be(int n) {
|
||||
uint64_t res = 0;
|
||||
|
||||
int bits_needed = n - m_bits_left;
|
||||
m_bits_left = -bits_needed & 7; // `-bits_needed mod 8`
|
||||
|
||||
if (bits_needed > 0) {
|
||||
// 1 bit => 1 byte
|
||||
// 8 bits => 1 byte
|
||||
// 9 bits => 2 bytes
|
||||
int bytes_needed = ((bits_needed - 1) / 8) + 1; // `ceil(bits_needed / 8)`
|
||||
if (bytes_needed > 8)
|
||||
throw std::runtime_error("read_bits_int_be: more than 8 bytes requested");
|
||||
uint8_t buf[8];
|
||||
m_io->read(reinterpret_cast<char *>(buf), bytes_needed);
|
||||
for (int i = 0; i < bytes_needed; i++) {
|
||||
res = res << 8 | buf[i];
|
||||
}
|
||||
|
||||
uint64_t new_bits = res;
|
||||
res = res >> m_bits_left | (bits_needed < 64 ? m_bits << bits_needed : 0); // avoid undefined behavior of `x << 64`
|
||||
m_bits = new_bits; // will be masked at the end of the function
|
||||
} else {
|
||||
res = m_bits >> -bits_needed; // shift unneeded bits out
|
||||
}
|
||||
|
||||
uint64_t mask = (UINT64_C(1) << m_bits_left) - 1; // `m_bits_left` is in range 0..7, so `(1 << 64)` does not have to be considered
|
||||
m_bits &= mask;
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
// Deprecated, use read_bits_int_be() instead.
|
||||
uint64_t kaitai::kstream::read_bits_int(int n) {
|
||||
return read_bits_int_be(n);
|
||||
}
|
||||
|
||||
uint64_t kaitai::kstream::read_bits_int_le(int n) {
|
||||
uint64_t res = 0;
|
||||
int bits_needed = n - m_bits_left;
|
||||
|
||||
if (bits_needed > 0) {
|
||||
// 1 bit => 1 byte
|
||||
// 8 bits => 1 byte
|
||||
// 9 bits => 2 bytes
|
||||
int bytes_needed = ((bits_needed - 1) / 8) + 1; // `ceil(bits_needed / 8)`
|
||||
if (bytes_needed > 8)
|
||||
throw std::runtime_error("read_bits_int_le: more than 8 bytes requested");
|
||||
uint8_t buf[8];
|
||||
m_io->read(reinterpret_cast<char *>(buf), bytes_needed);
|
||||
for (int i = 0; i < bytes_needed; i++) {
|
||||
res |= static_cast<uint64_t>(buf[i]) << (i * 8);
|
||||
}
|
||||
|
||||
// NB: for bit shift operators in C++, "if the value of the right operand is
|
||||
// negative or is greater or equal to the number of bits in the promoted left
|
||||
// operand, the behavior is undefined." (see
|
||||
// https://en.cppreference.com/w/cpp/language/operator_arithmetic#Bitwise_shift_operators)
|
||||
// So we define our desired behavior here.
|
||||
uint64_t new_bits = bits_needed < 64 ? res >> bits_needed : 0;
|
||||
res = res << m_bits_left | m_bits;
|
||||
m_bits = new_bits;
|
||||
} else {
|
||||
res = m_bits;
|
||||
m_bits >>= n;
|
||||
}
|
||||
|
||||
m_bits_left = -bits_needed & 7; // `-bits_needed mod 8`
|
||||
|
||||
if (n < 64) {
|
||||
uint64_t mask = (UINT64_C(1) << n) - 1;
|
||||
res &= mask;
|
||||
}
|
||||
// if `n == 64`, do nothing
|
||||
return res;
|
||||
}
|
||||
|
||||
// ========================================================================
|
||||
// Byte arrays
|
||||
// ========================================================================
|
||||
|
||||
std::string kaitai::kstream::read_bytes(std::streamsize len) {
|
||||
std::vector<char> result(len);
|
||||
|
||||
// NOTE: streamsize type is signed, negative values are only *supposed* to not be used.
|
||||
// http://en.cppreference.com/w/cpp/io/streamsize
|
||||
if (len < 0) {
|
||||
throw std::runtime_error("read_bytes: requested a negative amount");
|
||||
}
|
||||
|
||||
if (len > 0) {
|
||||
m_io->read(&result[0], len);
|
||||
}
|
||||
|
||||
return std::string(result.begin(), result.end());
|
||||
}
|
||||
|
||||
std::string kaitai::kstream::read_bytes_full() {
|
||||
std::iostream::pos_type p1 = m_io->tellg();
|
||||
m_io->seekg(0, std::ios::end);
|
||||
std::iostream::pos_type p2 = m_io->tellg();
|
||||
size_t len = p2 - p1;
|
||||
|
||||
// Note: this requires a std::string to be backed with a
|
||||
// contiguous buffer. Officially, it's a only requirement since
|
||||
// C++11 (C++98 and C++03 didn't have this requirement), but all
|
||||
// major implementations had contiguous buffers anyway.
|
||||
std::string result(len, ' ');
|
||||
m_io->seekg(p1);
|
||||
m_io->read(&result[0], len);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
std::string kaitai::kstream::read_bytes_term(char term, bool include, bool consume, bool eos_error) {
|
||||
std::string result;
|
||||
std::getline(*m_io, result, term);
|
||||
if (m_io->eof()) {
|
||||
// encountered EOF
|
||||
if (eos_error) {
|
||||
throw std::runtime_error("read_bytes_term: encountered EOF");
|
||||
}
|
||||
} else {
|
||||
// encountered terminator
|
||||
if (include)
|
||||
result.push_back(term);
|
||||
if (!consume)
|
||||
m_io->unget();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
std::string kaitai::kstream::ensure_fixed_contents(std::string expected) {
|
||||
std::string actual = read_bytes(expected.length());
|
||||
|
||||
if (actual != expected) {
|
||||
// NOTE: I think printing it outright is not best idea, it could contain non-ASCII characters
|
||||
// like backspace and beeps and whatnot. It would be better to print hexlified version, and
|
||||
// also to redirect it to stderr.
|
||||
throw std::runtime_error("ensure_fixed_contents: actual data does not match expected data");
|
||||
}
|
||||
|
||||
return actual;
|
||||
}
|
||||
|
||||
std::string kaitai::kstream::bytes_strip_right(std::string src, char pad_byte) {
|
||||
std::size_t new_len = src.length();
|
||||
|
||||
while (new_len > 0 && src[new_len - 1] == pad_byte)
|
||||
new_len--;
|
||||
|
||||
return src.substr(0, new_len);
|
||||
}
|
||||
|
||||
std::string kaitai::kstream::bytes_terminate(std::string src, char term, bool include) {
|
||||
std::size_t new_len = 0;
|
||||
std::size_t max_len = src.length();
|
||||
|
||||
while (new_len < max_len && src[new_len] != term)
|
||||
new_len++;
|
||||
|
||||
if (include && new_len < max_len)
|
||||
new_len++;
|
||||
|
||||
return src.substr(0, new_len);
|
||||
}
|
||||
|
||||
// ========================================================================
|
||||
// Byte array processing
|
||||
// ========================================================================
|
||||
|
||||
std::string kaitai::kstream::process_xor_one(std::string data, uint8_t key) {
|
||||
size_t len = data.length();
|
||||
std::string result(len, ' ');
|
||||
|
||||
for (size_t i = 0; i < len; i++)
|
||||
result[i] = data[i] ^ key;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
std::string kaitai::kstream::process_xor_many(std::string data, std::string key) {
|
||||
size_t len = data.length();
|
||||
size_t kl = key.length();
|
||||
std::string result(len, ' ');
|
||||
|
||||
size_t ki = 0;
|
||||
for (size_t i = 0; i < len; i++) {
|
||||
result[i] = data[i] ^ key[ki];
|
||||
ki++;
|
||||
if (ki >= kl)
|
||||
ki = 0;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
std::string kaitai::kstream::process_rotate_left(std::string data, int amount) {
|
||||
size_t len = data.length();
|
||||
std::string result(len, ' ');
|
||||
|
||||
for (size_t i = 0; i < len; i++) {
|
||||
uint8_t bits = data[i];
|
||||
result[i] = (bits << amount) | (bits >> (8 - amount));
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
#ifdef KS_ZLIB
|
||||
#include <zlib.h>
|
||||
|
||||
std::string kaitai::kstream::process_zlib(std::string data) {
|
||||
int ret;
|
||||
|
||||
unsigned char *src_ptr = reinterpret_cast<unsigned char *>(&data[0]);
|
||||
std::stringstream dst_strm;
|
||||
|
||||
z_stream strm;
|
||||
strm.zalloc = Z_NULL;
|
||||
strm.zfree = Z_NULL;
|
||||
strm.opaque = Z_NULL;
|
||||
|
||||
ret = inflateInit(&strm);
|
||||
if (ret != Z_OK)
|
||||
throw std::runtime_error("process_zlib: inflateInit error");
|
||||
|
||||
strm.next_in = src_ptr;
|
||||
strm.avail_in = data.length();
|
||||
|
||||
unsigned char outbuffer[ZLIB_BUF_SIZE];
|
||||
std::string outstring;
|
||||
|
||||
// get the decompressed bytes blockwise using repeated calls to inflate
|
||||
do {
|
||||
strm.next_out = reinterpret_cast<Bytef *>(outbuffer);
|
||||
strm.avail_out = sizeof(outbuffer);
|
||||
|
||||
ret = inflate(&strm, 0);
|
||||
|
||||
if (outstring.size() < strm.total_out)
|
||||
outstring.append(reinterpret_cast<char *>(outbuffer), strm.total_out - outstring.size());
|
||||
} while (ret == Z_OK);
|
||||
|
||||
if (ret != Z_STREAM_END) { // an error occurred that was not EOF
|
||||
std::ostringstream exc_msg;
|
||||
exc_msg << "process_zlib: error #" << ret << "): " << strm.msg;
|
||||
throw std::runtime_error(exc_msg.str());
|
||||
}
|
||||
|
||||
if (inflateEnd(&strm) != Z_OK)
|
||||
throw std::runtime_error("process_zlib: inflateEnd error");
|
||||
|
||||
return outstring;
|
||||
}
|
||||
#endif
|
||||
|
||||
// ========================================================================
|
||||
// Misc utility methods
|
||||
// ========================================================================
|
||||
|
||||
int kaitai::kstream::mod(int a, int b) {
|
||||
if (b <= 0)
|
||||
throw std::invalid_argument("mod: divisor b <= 0");
|
||||
int r = a % b;
|
||||
if (r < 0)
|
||||
r += b;
|
||||
return r;
|
||||
}
|
||||
|
||||
#include <algorithm>
|
||||
void kaitai::kstream::unsigned_to_decimal(uint64_t number, char *buffer) {
|
||||
// Implementation from https://ideone.com/nrQfA8 by Alf P. Steinbach
|
||||
// (see https://www.zverovich.net/2013/09/07/integer-to-string-conversion-in-cplusplus.html#comment-1033931478)
|
||||
if (number == 0) {
|
||||
*buffer++ = '0';
|
||||
} else {
|
||||
char *p_first = buffer;
|
||||
while (number != 0) {
|
||||
*buffer++ = static_cast<char>('0' + number % 10);
|
||||
number /= 10;
|
||||
}
|
||||
std::reverse(p_first, buffer);
|
||||
}
|
||||
*buffer = '\0';
|
||||
}
|
||||
|
||||
std::string kaitai::kstream::reverse(std::string val) {
|
||||
std::reverse(val.begin(), val.end());
|
||||
|
||||
return val;
|
||||
}
|
||||
|
||||
uint8_t kaitai::kstream::byte_array_min(const std::string val) {
|
||||
uint8_t min = 0xff; // UINT8_MAX
|
||||
std::string::const_iterator end = val.end();
|
||||
for (std::string::const_iterator it = val.begin(); it != end; ++it) {
|
||||
uint8_t cur = static_cast<uint8_t>(*it);
|
||||
if (cur < min) {
|
||||
min = cur;
|
||||
}
|
||||
}
|
||||
return min;
|
||||
}
|
||||
|
||||
uint8_t kaitai::kstream::byte_array_max(const std::string val) {
|
||||
uint8_t max = 0; // UINT8_MIN
|
||||
std::string::const_iterator end = val.end();
|
||||
for (std::string::const_iterator it = val.begin(); it != end; ++it) {
|
||||
uint8_t cur = static_cast<uint8_t>(*it);
|
||||
if (cur > max) {
|
||||
max = cur;
|
||||
}
|
||||
}
|
||||
return max;
|
||||
}
|
||||
|
||||
// ========================================================================
|
||||
// Other internal methods
|
||||
// ========================================================================
|
||||
|
||||
#ifndef KS_STR_DEFAULT_ENCODING
|
||||
#define KS_STR_DEFAULT_ENCODING "UTF-8"
|
||||
#endif
|
||||
|
||||
#ifdef KS_STR_ENCODING_ICONV
|
||||
|
||||
#include <iconv.h>
|
||||
#include <cerrno>
|
||||
#include <stdexcept>
|
||||
|
||||
std::string kaitai::kstream::bytes_to_str(std::string src, std::string src_enc) {
|
||||
iconv_t cd = iconv_open(KS_STR_DEFAULT_ENCODING, src_enc.c_str());
|
||||
|
||||
if (cd == (iconv_t)-1) {
|
||||
if (errno == EINVAL) {
|
||||
throw std::runtime_error("bytes_to_str: invalid encoding pair conversion requested");
|
||||
} else {
|
||||
throw std::runtime_error("bytes_to_str: error opening iconv");
|
||||
}
|
||||
}
|
||||
|
||||
size_t src_len = src.length();
|
||||
size_t src_left = src_len;
|
||||
|
||||
// Start with a buffer length of double the source length.
|
||||
size_t dst_len = src_len * 2;
|
||||
std::string dst(dst_len, ' ');
|
||||
size_t dst_left = dst_len;
|
||||
|
||||
char *src_ptr = &src[0];
|
||||
char *dst_ptr = &dst[0];
|
||||
|
||||
while (true) {
|
||||
size_t res = iconv(cd, &src_ptr, &src_left, &dst_ptr, &dst_left);
|
||||
|
||||
if (res == (size_t)-1) {
|
||||
if (errno == E2BIG) {
|
||||
// dst buffer is not enough to accomodate whole string
|
||||
// enlarge the buffer and try again
|
||||
size_t dst_used = dst_len - dst_left;
|
||||
dst_left += dst_len;
|
||||
dst_len += dst_len;
|
||||
dst.resize(dst_len);
|
||||
|
||||
// dst.resize might have allocated destination buffer in another area
|
||||
// of memory, thus our previous pointer "dst" will be invalid; re-point
|
||||
// it using "dst_used".
|
||||
dst_ptr = &dst[dst_used];
|
||||
} else {
|
||||
throw std::runtime_error("bytes_to_str: iconv error");
|
||||
}
|
||||
} else {
|
||||
// conversion successful
|
||||
dst.resize(dst_len - dst_left);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (iconv_close(cd) != 0) {
|
||||
throw std::runtime_error("bytes_to_str: iconv close error");
|
||||
}
|
||||
|
||||
return dst;
|
||||
}
|
||||
#elif defined(KS_STR_ENCODING_NONE)
|
||||
std::string kaitai::kstream::bytes_to_str(std::string src, std::string src_enc) {
|
||||
(void)src_enc;
|
||||
return src;
|
||||
}
|
||||
#else
|
||||
#error Need to decide how to handle strings: please define one of: KS_STR_ENCODING_ICONV, KS_STR_ENCODING_NONE
|
||||
#endif
|
295
common/kaitai/kaitaistream.h
Normal file
295
common/kaitai/kaitaistream.h
Normal file
@ -0,0 +1,295 @@
|
||||
#ifndef KAITAI_STREAM_H
|
||||
#define KAITAI_STREAM_H
|
||||
|
||||
// Kaitai Struct runtime API version: x.y.z = 'xxxyyyzzz' decimal
|
||||
#define KAITAI_STRUCT_VERSION 10000L
|
||||
|
||||
#include <istream>
|
||||
#include <sstream>
|
||||
#include <stdint.h>
|
||||
#include <sys/types.h>
|
||||
#include <limits>
|
||||
|
||||
namespace kaitai {
|
||||
|
||||
/**
|
||||
* Kaitai Stream class (kaitai::kstream) is an implementation of
|
||||
* <a href="https://doc.kaitai.io/stream_api.html">Kaitai Struct stream API</a>
|
||||
* for C++/STL. It's implemented as a wrapper over generic STL std::istream.
|
||||
*
|
||||
* It provides a wide variety of simple methods to read (parse) binary
|
||||
* representations of primitive types, such as integer and floating
|
||||
* point numbers, byte arrays and strings, and also provides stream
|
||||
* positioning / navigation methods with unified cross-language and
|
||||
* cross-toolkit semantics.
|
||||
*
|
||||
* Typically, end users won't access Kaitai Stream class manually, but would
|
||||
* describe a binary structure format using .ksy language and then would use
|
||||
* Kaitai Struct compiler to generate source code in desired target language.
|
||||
* That code, in turn, would use this class and API to do the actual parsing
|
||||
* job.
|
||||
*/
|
||||
class kstream {
|
||||
public:
|
||||
/**
|
||||
* Constructs new Kaitai Stream object, wrapping a given std::istream.
|
||||
* \param io istream object to use for this Kaitai Stream
|
||||
*/
|
||||
kstream(std::istream* io);
|
||||
|
||||
/**
|
||||
* Constructs new Kaitai Stream object, wrapping a given in-memory data
|
||||
* buffer.
|
||||
* \param data data buffer to use for this Kaitai Stream
|
||||
*/
|
||||
kstream(const std::string& data);
|
||||
|
||||
void close();
|
||||
|
||||
/** @name Stream positioning */
|
||||
//@{
|
||||
/**
|
||||
* Check if stream pointer is at the end of stream. Note that the semantics
|
||||
* are different from traditional STL semantics: one does *not* need to do a
|
||||
* read (which will fail) after the actual end of the stream to trigger EOF
|
||||
* flag, which can be accessed after that read. It is sufficient to just be
|
||||
* at the end of the stream for this method to return true.
|
||||
* \return "true" if we are located at the end of the stream.
|
||||
*/
|
||||
bool is_eof() const;
|
||||
|
||||
/**
|
||||
* Set stream pointer to designated position.
|
||||
* \param pos new position (offset in bytes from the beginning of the stream)
|
||||
*/
|
||||
void seek(uint64_t pos);
|
||||
|
||||
/**
|
||||
* Get current position of a stream pointer.
|
||||
* \return pointer position, number of bytes from the beginning of the stream
|
||||
*/
|
||||
uint64_t pos();
|
||||
|
||||
/**
|
||||
* Get total size of the stream in bytes.
|
||||
* \return size of the stream in bytes
|
||||
*/
|
||||
uint64_t size();
|
||||
//@}
|
||||
|
||||
/** @name Integer numbers */
|
||||
//@{
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
// Signed
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
int8_t read_s1();
|
||||
|
||||
// ........................................................................
|
||||
// Big-endian
|
||||
// ........................................................................
|
||||
|
||||
int16_t read_s2be();
|
||||
int32_t read_s4be();
|
||||
int64_t read_s8be();
|
||||
|
||||
// ........................................................................
|
||||
// Little-endian
|
||||
// ........................................................................
|
||||
|
||||
int16_t read_s2le();
|
||||
int32_t read_s4le();
|
||||
int64_t read_s8le();
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
// Unsigned
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
uint8_t read_u1();
|
||||
|
||||
// ........................................................................
|
||||
// Big-endian
|
||||
// ........................................................................
|
||||
|
||||
uint16_t read_u2be();
|
||||
uint32_t read_u4be();
|
||||
uint64_t read_u8be();
|
||||
|
||||
// ........................................................................
|
||||
// Little-endian
|
||||
// ........................................................................
|
||||
|
||||
uint16_t read_u2le();
|
||||
uint32_t read_u4le();
|
||||
uint64_t read_u8le();
|
||||
|
||||
//@}
|
||||
|
||||
/** @name Floating point numbers */
|
||||
//@{
|
||||
|
||||
// ........................................................................
|
||||
// Big-endian
|
||||
// ........................................................................
|
||||
|
||||
float read_f4be();
|
||||
double read_f8be();
|
||||
|
||||
// ........................................................................
|
||||
// Little-endian
|
||||
// ........................................................................
|
||||
|
||||
float read_f4le();
|
||||
double read_f8le();
|
||||
|
||||
//@}
|
||||
|
||||
/** @name Unaligned bit values */
|
||||
//@{
|
||||
|
||||
void align_to_byte();
|
||||
uint64_t read_bits_int_be(int n);
|
||||
uint64_t read_bits_int(int n);
|
||||
uint64_t read_bits_int_le(int n);
|
||||
|
||||
//@}
|
||||
|
||||
/** @name Byte arrays */
|
||||
//@{
|
||||
|
||||
std::string read_bytes(std::streamsize len);
|
||||
std::string read_bytes_full();
|
||||
std::string read_bytes_term(char term, bool include, bool consume, bool eos_error);
|
||||
std::string ensure_fixed_contents(std::string expected);
|
||||
|
||||
static std::string bytes_strip_right(std::string src, char pad_byte);
|
||||
static std::string bytes_terminate(std::string src, char term, bool include);
|
||||
static std::string bytes_to_str(std::string src, std::string src_enc);
|
||||
|
||||
//@}
|
||||
|
||||
/** @name Byte array processing */
|
||||
//@{
|
||||
|
||||
/**
|
||||
* Performs a XOR processing with given data, XORing every byte of input with a single
|
||||
* given value.
|
||||
* @param data data to process
|
||||
* @param key value to XOR with
|
||||
* @return processed data
|
||||
*/
|
||||
static std::string process_xor_one(std::string data, uint8_t key);
|
||||
|
||||
/**
|
||||
* Performs a XOR processing with given data, XORing every byte of input with a key
|
||||
* array, repeating key array many times, if necessary (i.e. if data array is longer
|
||||
* than key array).
|
||||
* @param data data to process
|
||||
* @param key array of bytes to XOR with
|
||||
* @return processed data
|
||||
*/
|
||||
static std::string process_xor_many(std::string data, std::string key);
|
||||
|
||||
/**
|
||||
* Performs a circular left rotation shift for a given buffer by a given amount of bits,
|
||||
* using groups of 1 bytes each time. Right circular rotation should be performed
|
||||
* using this procedure with corrected amount.
|
||||
* @param data source data to process
|
||||
* @param amount number of bits to shift by
|
||||
* @return copy of source array with requested shift applied
|
||||
*/
|
||||
static std::string process_rotate_left(std::string data, int amount);
|
||||
|
||||
#ifdef KS_ZLIB
|
||||
/**
|
||||
* Performs an unpacking ("inflation") of zlib-compressed data with usual zlib headers.
|
||||
* @param data data to unpack
|
||||
* @return unpacked data
|
||||
* @throws IOException
|
||||
*/
|
||||
static std::string process_zlib(std::string data);
|
||||
#endif
|
||||
|
||||
//@}
|
||||
|
||||
/**
|
||||
* Performs modulo operation between two integers: dividend `a`
|
||||
* and divisor `b`. Divisor `b` is expected to be positive. The
|
||||
* result is always 0 <= x <= b - 1.
|
||||
*/
|
||||
static int mod(int a, int b);
|
||||
|
||||
/**
|
||||
* Converts given integer `val` to a decimal string representation.
|
||||
* Should be used in place of std::to_string() (which is available only
|
||||
* since C++11) in older C++ implementations.
|
||||
*/
|
||||
template<typename I>
|
||||
// check for C++11 support - https://stackoverflow.com/a/40512515
|
||||
#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900)
|
||||
// https://stackoverflow.com/a/27913885
|
||||
typename std::enable_if<
|
||||
std::is_integral<I>::value &&
|
||||
// check if we don't have something too large like GCC's `__int128_t`
|
||||
std::numeric_limits<I>::max() >= 0 &&
|
||||
std::numeric_limits<I>::max() <= std::numeric_limits<uint64_t>::max(),
|
||||
std::string
|
||||
>::type
|
||||
#else
|
||||
std::string
|
||||
#endif
|
||||
static to_string(I val) {
|
||||
// in theory, `digits10 + 3` would be enough (minus sign + leading digit
|
||||
// + null terminator), but let's add a little more to be safe
|
||||
char buf[std::numeric_limits<I>::digits10 + 5];
|
||||
if (val < 0) {
|
||||
buf[0] = '-';
|
||||
// get absolute value without undefined behavior (https://stackoverflow.com/a/12231604)
|
||||
unsigned_to_decimal(-static_cast<uint64_t>(val), &buf[1]);
|
||||
} else {
|
||||
unsigned_to_decimal(val, buf);
|
||||
}
|
||||
return std::string(buf);
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverses given string `val`, so that the first character becomes the
|
||||
* last and the last one becomes the first. This should be used to avoid
|
||||
* the need of local variables at the caller.
|
||||
*/
|
||||
static std::string reverse(std::string val);
|
||||
|
||||
/**
|
||||
* Finds the minimal byte in a byte array, treating bytes as
|
||||
* unsigned values.
|
||||
* @param val byte array to scan
|
||||
* @return minimal byte in byte array as integer
|
||||
*/
|
||||
static uint8_t byte_array_min(const std::string val);
|
||||
|
||||
/**
|
||||
* Finds the maximal byte in a byte array, treating bytes as
|
||||
* unsigned values.
|
||||
* @param val byte array to scan
|
||||
* @return maximal byte in byte array as integer
|
||||
*/
|
||||
static uint8_t byte_array_max(const std::string val);
|
||||
|
||||
private:
|
||||
std::istream* m_io;
|
||||
std::istringstream m_io_str;
|
||||
int m_bits_left;
|
||||
uint64_t m_bits;
|
||||
|
||||
void init();
|
||||
void exceptions_enable() const;
|
||||
|
||||
static void unsigned_to_decimal(uint64_t number, char *buffer);
|
||||
|
||||
static const int ZLIB_BUF_SIZE = 128 * 1024;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
20
common/kaitai/kaitaistruct.h
Normal file
20
common/kaitai/kaitaistruct.h
Normal file
@ -0,0 +1,20 @@
|
||||
#ifndef KAITAI_STRUCT_H
|
||||
#define KAITAI_STRUCT_H
|
||||
|
||||
#include "kaitaistream.h"
|
||||
|
||||
namespace kaitai {
|
||||
|
||||
class kstruct {
|
||||
public:
|
||||
kstruct(kstream *_io) { m__io = _io; }
|
||||
virtual ~kstruct() {}
|
||||
protected:
|
||||
kstream *m__io;
|
||||
public:
|
||||
kstream *_io() { return m__io; }
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
202
common/ksy/intel_acbp_v1.ksy
Normal file
202
common/ksy/intel_acbp_v1.ksy
Normal file
@ -0,0 +1,202 @@
|
||||
meta:
|
||||
id: intel_acbp_v1
|
||||
title: Intel BootGuard Boot Policy v1
|
||||
application: Intel x86 firmware
|
||||
file-extension: acbp_v1
|
||||
tags:
|
||||
- firmware
|
||||
license: CC0-1.0
|
||||
ks-version: 0.9
|
||||
endian: le
|
||||
|
||||
enums:
|
||||
ibb_segment_type:
|
||||
0: ibb
|
||||
1: non_ibb
|
||||
|
||||
structure_ids:
|
||||
0x5f5f504243415f5f: acbp
|
||||
0x5f5f534242495f5f: ibbs
|
||||
0x5f5f41444d505f5f: pmda
|
||||
0x5f5f47534d505f5f: pmsg
|
||||
|
||||
seq:
|
||||
- id: structure_id
|
||||
type: u8
|
||||
enum: structure_ids
|
||||
valid: structure_ids::acbp
|
||||
- id: version
|
||||
type: u1
|
||||
valid:
|
||||
expr: _ < 0x20
|
||||
- id: reserved0
|
||||
type: u1
|
||||
- id: bpm_revision
|
||||
type: u1
|
||||
- id: bp_svn
|
||||
type: u1
|
||||
- id: acm_svn
|
||||
type: u1
|
||||
- id: reserved1
|
||||
type: u1
|
||||
- id: nem_data_size
|
||||
type: u2
|
||||
- id: elements
|
||||
type: acbp_element
|
||||
repeat: until
|
||||
repeat-until: _.header.structure_id == structure_ids::pmsg or _io.eof
|
||||
|
||||
types:
|
||||
acbp_element:
|
||||
seq:
|
||||
- id: header
|
||||
type: common_header
|
||||
- id: ibbs_body
|
||||
type: ibbs_body
|
||||
if: header.structure_id == structure_ids::ibbs
|
||||
- id: pmda_body
|
||||
type: pmda_body
|
||||
if: header.structure_id == structure_ids::pmda
|
||||
- id: pmsg_body
|
||||
type: pmsg_body
|
||||
if: header.structure_id == structure_ids::pmsg
|
||||
- id: invalid_body
|
||||
size: 0
|
||||
if: header.structure_id != structure_ids::pmsg
|
||||
and header.structure_id != structure_ids::pmda
|
||||
and header.structure_id != structure_ids::ibbs
|
||||
valid:
|
||||
expr: false
|
||||
|
||||
common_header:
|
||||
seq:
|
||||
- id: structure_id
|
||||
type: u8
|
||||
enum: structure_ids
|
||||
- id: version
|
||||
type: u1
|
||||
|
||||
hash:
|
||||
seq:
|
||||
- id: hash_algorithm_id
|
||||
type: u2
|
||||
- id: len_hash
|
||||
type: u2
|
||||
- id: hash
|
||||
size: 32
|
||||
|
||||
ibbs_body:
|
||||
seq:
|
||||
- id: reserved
|
||||
type: u1
|
||||
repeat: expr
|
||||
repeat-expr: 3
|
||||
- id: flags
|
||||
type: u4
|
||||
- id: mch_bar
|
||||
type: u8
|
||||
- id: vtd_bar
|
||||
type: u8
|
||||
- id: dma_protection_base0
|
||||
type: u4
|
||||
- id: dma_protection_limit0
|
||||
type: u4
|
||||
- id: dma_protection_base1
|
||||
type: u8
|
||||
- id: dma_protection_limit1
|
||||
type: u8
|
||||
- id: post_ibb_hash
|
||||
type: hash
|
||||
- id: ibb_entry_point
|
||||
type: u4
|
||||
- id: ibb_hash
|
||||
type: hash
|
||||
- id: num_ibb_segments
|
||||
type: u1
|
||||
- id: ibb_segments
|
||||
type: ibb_segment
|
||||
repeat: expr
|
||||
repeat-expr: num_ibb_segments
|
||||
|
||||
ibb_segment:
|
||||
seq:
|
||||
- id: reserved
|
||||
type: u2
|
||||
- id: flags
|
||||
type: u2
|
||||
- id: base
|
||||
type: u4
|
||||
- id: size
|
||||
type: u4
|
||||
|
||||
pmda_body:
|
||||
seq:
|
||||
- id: total_size
|
||||
type: u2
|
||||
- id: version
|
||||
type: u4
|
||||
- id: num_entries
|
||||
type: u4
|
||||
- id: entries_v1
|
||||
if: version == 1
|
||||
type: pmda_entry_v1
|
||||
repeat: expr
|
||||
repeat-expr: num_entries
|
||||
- id: entries_v2
|
||||
if: version == 2
|
||||
type: pmda_entry_v2
|
||||
repeat: expr
|
||||
repeat-expr: num_entries
|
||||
|
||||
pmda_entry_v1:
|
||||
seq:
|
||||
- id: base
|
||||
type: u4
|
||||
- id: size
|
||||
type: u4
|
||||
- id: hash
|
||||
size: 32
|
||||
|
||||
pmda_entry_v2:
|
||||
seq:
|
||||
- id: base
|
||||
type: u4
|
||||
- id: size
|
||||
type: u4
|
||||
- id: hash
|
||||
type: hash
|
||||
|
||||
pmsg_body:
|
||||
seq:
|
||||
- id: version
|
||||
type: u1
|
||||
- id: key_id
|
||||
type: u2
|
||||
- id: public_key
|
||||
type: public_key
|
||||
- id: sig_scheme
|
||||
type: u2
|
||||
- id: signature
|
||||
type: signature
|
||||
|
||||
public_key:
|
||||
seq:
|
||||
- id: version
|
||||
type: u1
|
||||
- id: size_bits
|
||||
type: u2
|
||||
- id: exponent
|
||||
type: u4
|
||||
- id: modulus
|
||||
size: size_bits / 8
|
||||
|
||||
signature:
|
||||
seq:
|
||||
- id: version
|
||||
type: u1
|
||||
- id: size_bits
|
||||
type: u2
|
||||
- id: hash_algorithm_id
|
||||
type: u2
|
||||
- id: signature
|
||||
size: size_bits / 8
|
223
common/ksy/intel_acbp_v2.ksy
Normal file
223
common/ksy/intel_acbp_v2.ksy
Normal file
@ -0,0 +1,223 @@
|
||||
meta:
|
||||
id: intel_acbp_v2
|
||||
title: Intel BootGuard Boot Policy v2
|
||||
application: Intel x86 firmware
|
||||
file-extension: acbp_v2
|
||||
tags:
|
||||
- firmware
|
||||
license: CC0-1.0
|
||||
ks-version: 0.9
|
||||
endian: le
|
||||
|
||||
enums:
|
||||
ibb_segment_type:
|
||||
0: ibb
|
||||
1: non_ibb
|
||||
|
||||
structure_ids:
|
||||
0x5f5f504243415f5f: acbp
|
||||
0x5f5f534242495f5f: ibbs
|
||||
0x5f5f535458545f5f: txts
|
||||
0x5f5f535246505f5f: pfrs
|
||||
0x5f5f534443505f5f: pcds
|
||||
0x5f5f41444d505f5f: pmda
|
||||
0x5f5f47534d505f5f: pmsg
|
||||
|
||||
seq:
|
||||
- id: structure_id
|
||||
type: u8
|
||||
enum: structure_ids
|
||||
valid: structure_ids::acbp
|
||||
- id: version
|
||||
type: u1
|
||||
valid:
|
||||
expr: _ >= 0x20
|
||||
- id: header_specific
|
||||
type: u1
|
||||
- id: total_size
|
||||
type: u2
|
||||
valid: 0x14
|
||||
- id: key_signature_offset
|
||||
type: u2
|
||||
- id: bpm_revision
|
||||
type: u1
|
||||
- id: bp_svn
|
||||
type: u1
|
||||
- id: acm_svn
|
||||
type: u1
|
||||
- id: reserved
|
||||
type: u1
|
||||
- id: nem_data_size
|
||||
type: u2
|
||||
- id: elements
|
||||
type: acbp_element
|
||||
repeat: until
|
||||
repeat-until: _.header.total_size == 0 or _.header.structure_id == structure_ids::pmsg
|
||||
- id: key_signature
|
||||
type: key_signature
|
||||
|
||||
types:
|
||||
header:
|
||||
seq:
|
||||
- id: structure_id
|
||||
type: u8
|
||||
enum: structure_ids
|
||||
- id: version
|
||||
type: u1
|
||||
- id: header_specific
|
||||
type: u1
|
||||
- id: total_size
|
||||
type: u2
|
||||
|
||||
hash:
|
||||
seq:
|
||||
- id: hash_algorithm_id
|
||||
type: u2
|
||||
- id: len_hash
|
||||
type: u2
|
||||
- id: hash
|
||||
size: len_hash
|
||||
|
||||
pmda_entry_v3:
|
||||
seq:
|
||||
- id: entry_id
|
||||
type: u4
|
||||
- id: base
|
||||
type: u4
|
||||
- id: size
|
||||
type: u4
|
||||
- id: total_entry_size
|
||||
type: u2
|
||||
- id: version
|
||||
type: u2
|
||||
valid: 3
|
||||
- id: hash
|
||||
type: hash
|
||||
|
||||
pmda_body:
|
||||
seq:
|
||||
- id: reserved
|
||||
type: u2
|
||||
- id: total_size
|
||||
type: u2
|
||||
- id: version
|
||||
type: u4
|
||||
- id: num_entries
|
||||
type: u4
|
||||
- id: entries
|
||||
type: pmda_entry_v3
|
||||
repeat: expr
|
||||
repeat-expr: num_entries
|
||||
|
||||
ibb_segment:
|
||||
seq:
|
||||
- id: reserved
|
||||
type: u2
|
||||
- id: flags
|
||||
type: u2
|
||||
- id: base
|
||||
type: u4
|
||||
- id: size
|
||||
type: u4
|
||||
|
||||
ibbs_body:
|
||||
seq:
|
||||
- id: reserved0
|
||||
type: u1
|
||||
- id: set_number
|
||||
type: u1
|
||||
- id: reserved1
|
||||
type: u1
|
||||
- id: pbet_value
|
||||
type: u1
|
||||
- id: flags
|
||||
type: u4
|
||||
- id: mch_bar
|
||||
type: u8
|
||||
- id: vtd_bar
|
||||
type: u8
|
||||
- id: dma_protection_base0
|
||||
type: u4
|
||||
- id: dma_protection_limit0
|
||||
type: u4
|
||||
- id: dma_protection_base1
|
||||
type: u8
|
||||
- id: dma_protection_limit1
|
||||
type: u8
|
||||
- id: post_ibb_digest
|
||||
type: hash
|
||||
- id: ibb_entry_point
|
||||
type: u4
|
||||
- id: ibb_digests_size
|
||||
type: u2
|
||||
- id: num_ibb_digests
|
||||
type: u2
|
||||
- id: ibb_digests
|
||||
type: hash
|
||||
repeat: expr
|
||||
repeat-expr: num_ibb_digests
|
||||
- id: obb_digest
|
||||
type: hash
|
||||
- id: reserved2
|
||||
type: u1
|
||||
repeat: expr
|
||||
repeat-expr: 3
|
||||
- id: num_ibb_segments
|
||||
type: u1
|
||||
- id: ibb_segments
|
||||
type: ibb_segment
|
||||
repeat: expr
|
||||
repeat-expr: num_ibb_segments
|
||||
|
||||
acbp_element:
|
||||
seq:
|
||||
- id: header
|
||||
type: header
|
||||
- id: ibbs_body
|
||||
type: ibbs_body
|
||||
if: header.structure_id == structure_ids::ibbs
|
||||
and header.total_size >= sizeof<header>
|
||||
- id: pmda_body
|
||||
type: pmda_body
|
||||
if: header.structure_id == structure_ids::pmda
|
||||
and header.total_size >= sizeof<header>
|
||||
- id: generic_body
|
||||
size: header.total_size - sizeof<header>
|
||||
if: header.structure_id != structure_ids::ibbs
|
||||
and header.structure_id != structure_ids::pmda
|
||||
and header.total_size >= sizeof<header>
|
||||
|
||||
public_key:
|
||||
seq:
|
||||
- id: version
|
||||
type: u1
|
||||
- id: size_bits
|
||||
type: u2
|
||||
- id: exponent
|
||||
type: u4
|
||||
- id: modulus
|
||||
size: size_bits / 8
|
||||
|
||||
signature:
|
||||
seq:
|
||||
- id: version
|
||||
type: u1
|
||||
- id: size_bits
|
||||
type: u2
|
||||
- id: hash_algorithm_id
|
||||
type: u2
|
||||
- id: signature
|
||||
size: size_bits / 8
|
||||
|
||||
key_signature:
|
||||
seq:
|
||||
- id: version
|
||||
type: u1
|
||||
- id: key_id
|
||||
type: u2
|
||||
- id: public_key
|
||||
type: public_key
|
||||
- id: sig_scheme
|
||||
type: u2
|
||||
- id: signature
|
||||
type: signature
|
94
common/ksy/intel_acm.ksy
Normal file
94
common/ksy/intel_acm.ksy
Normal file
@ -0,0 +1,94 @@
|
||||
meta:
|
||||
id: intel_acm
|
||||
title: Intel Authenticated Code Module
|
||||
application: Intel x86 firmware
|
||||
file-extension: acm
|
||||
tags:
|
||||
- executable
|
||||
- firmware
|
||||
license: CC0-1.0
|
||||
ks-version: 0.9
|
||||
endian: le
|
||||
|
||||
enums:
|
||||
module_subtype:
|
||||
0: txt
|
||||
1: startup
|
||||
3: boot_guard
|
||||
|
||||
known_header_version:
|
||||
0x00000000: v0_0
|
||||
0x00030000: v3_0
|
||||
|
||||
seq:
|
||||
- id: header
|
||||
type: header
|
||||
- id: body
|
||||
size: 4 * (header.module_size - header.header_size - header.scratch_space_size)
|
||||
|
||||
types:
|
||||
header:
|
||||
seq:
|
||||
- id: module_type
|
||||
type: u2
|
||||
valid: 0x0002
|
||||
- id: module_subtype
|
||||
type: u2
|
||||
enum: module_subtype
|
||||
- id: header_size
|
||||
type: u4
|
||||
doc: counted in 4 byte increments
|
||||
- id: header_version
|
||||
type: u4
|
||||
- id: chipset_id
|
||||
type: u2
|
||||
- id: flags
|
||||
type: u2
|
||||
- id: module_vendor
|
||||
type: u4
|
||||
valid: 0x8086
|
||||
- id: date_day
|
||||
type: u1
|
||||
doc: BCD
|
||||
- id: date_month
|
||||
type: u1
|
||||
doc: BCD
|
||||
- id: date_year
|
||||
type: u2
|
||||
doc: BCD
|
||||
- id: module_size
|
||||
type: u4
|
||||
doc: counted in 4 byte increments
|
||||
- id: acm_svn
|
||||
type: u2
|
||||
- id: se_svn
|
||||
type: u2
|
||||
- id: code_control_flags
|
||||
type: u4
|
||||
- id: error_entry_point
|
||||
type: u4
|
||||
- id: gdt_max
|
||||
type: u4
|
||||
- id: gdt_base
|
||||
type: u4
|
||||
- id: segment_sel
|
||||
type: u4
|
||||
- id: entry_point
|
||||
type: u4
|
||||
- id: reserved
|
||||
size: 64
|
||||
- id: key_size
|
||||
type: u4
|
||||
doc: counted in 4 byte increments
|
||||
- id: scratch_space_size
|
||||
type: u4
|
||||
doc: counted in 4 byte increments
|
||||
- id: rsa_public_key
|
||||
size: (4 * key_size)
|
||||
- id: rsa_exponent
|
||||
type: u4
|
||||
if: header_version == 0
|
||||
- id: rsa_signature
|
||||
size: (4 * key_size)
|
||||
- id: scratch_space
|
||||
size: (4 * scratch_space_size)
|
79
common/ksy/intel_keym_v1.ksy
Normal file
79
common/ksy/intel_keym_v1.ksy
Normal file
@ -0,0 +1,79 @@
|
||||
meta:
|
||||
id: intel_keym_v1
|
||||
title: Intel BootGuard Key Manifest v1
|
||||
application: Intel x86 firmware
|
||||
file-extension: keym_v1
|
||||
tags:
|
||||
- firmware
|
||||
license: CC0-1.0
|
||||
ks-version: 0.9
|
||||
endian: le
|
||||
|
||||
enums:
|
||||
structure_ids:
|
||||
0x5f5f4d59454b5f5f: keym
|
||||
|
||||
seq:
|
||||
- id: structure_id
|
||||
type: u8
|
||||
enum: structure_ids
|
||||
valid: structure_ids::keym
|
||||
- id: version
|
||||
type: u1
|
||||
valid:
|
||||
expr: _ < 0x20
|
||||
- id: km_version
|
||||
type: u1
|
||||
- id: km_svn
|
||||
type: u1
|
||||
- id: km_id
|
||||
type: u1
|
||||
- id: km_hash
|
||||
type: km_hash
|
||||
- id: key_signature
|
||||
type: key_signature
|
||||
|
||||
types:
|
||||
km_hash:
|
||||
seq:
|
||||
- id: hash_algorithm_id
|
||||
type: u2
|
||||
- id: len_hash
|
||||
type: u2
|
||||
- id: hash
|
||||
size: len_hash
|
||||
|
||||
public_key:
|
||||
seq:
|
||||
- id: version
|
||||
type: u1
|
||||
- id: size_bits
|
||||
type: u2
|
||||
- id: exponent
|
||||
type: u4
|
||||
- id: modulus
|
||||
size: size_bits / 8
|
||||
|
||||
signature:
|
||||
seq:
|
||||
- id: version
|
||||
type: u1
|
||||
- id: size_bits
|
||||
type: u2
|
||||
- id: hash_algorithm_id
|
||||
type: u2
|
||||
- id: signature
|
||||
size: size_bits / 8
|
||||
|
||||
key_signature:
|
||||
seq:
|
||||
- id: version
|
||||
type: u1
|
||||
- id: key_id
|
||||
type: u2
|
||||
- id: public_key
|
||||
type: public_key
|
||||
- id: sig_scheme
|
||||
type: u2
|
||||
- id: signature
|
||||
type: signature
|
109
common/ksy/intel_keym_v2.ksy
Normal file
109
common/ksy/intel_keym_v2.ksy
Normal file
@ -0,0 +1,109 @@
|
||||
meta:
|
||||
id: intel_keym_v2
|
||||
title: Intel BootGuard Key Manifest v2
|
||||
application: Intel x86 firmware
|
||||
file-extension: keym_v2
|
||||
tags:
|
||||
- firmware
|
||||
license: CC0-1.0
|
||||
ks-version: 0.9
|
||||
endian: le
|
||||
|
||||
enums:
|
||||
structure_ids:
|
||||
0x5f5f4d59454b5f5f: keym
|
||||
|
||||
km_usage_flags:
|
||||
1: boot_policy_manifest
|
||||
2: fit_patch_manifest
|
||||
4: acm_manifest
|
||||
8: sdev
|
||||
|
||||
seq:
|
||||
- id: header
|
||||
type: header
|
||||
- id: key_signature_offset
|
||||
type: u2
|
||||
- id: reserved
|
||||
type: u1
|
||||
repeat: expr
|
||||
repeat-expr: 3
|
||||
- id: km_version
|
||||
type: u1
|
||||
- id: km_svn
|
||||
type: u1
|
||||
- id: km_id
|
||||
type: u1
|
||||
- id: fpf_hash_algorithm_id
|
||||
type: u2
|
||||
- id: num_km_hashes
|
||||
type: u2
|
||||
- id: km_hashes
|
||||
type: km_hash
|
||||
repeat: expr
|
||||
repeat-expr: num_km_hashes
|
||||
- id: key_signature
|
||||
type: key_signature
|
||||
|
||||
types:
|
||||
header:
|
||||
seq:
|
||||
- id: structure_id
|
||||
type: u8
|
||||
enum: structure_ids
|
||||
valid: structure_ids::keym
|
||||
- id: version
|
||||
type: u1
|
||||
valid:
|
||||
expr: _ >= 0x20
|
||||
- id: header_specific
|
||||
type: u1
|
||||
- id: total_size
|
||||
type: u2
|
||||
valid: 0x0
|
||||
|
||||
km_hash:
|
||||
seq:
|
||||
- id: usage_flags
|
||||
type: u8
|
||||
- id: hash_algorithm_id
|
||||
type: u2
|
||||
- id: len_hash
|
||||
type: u2
|
||||
- id: hash
|
||||
size: len_hash
|
||||
|
||||
public_key:
|
||||
seq:
|
||||
- id: version
|
||||
type: u1
|
||||
- id: size_bits
|
||||
type: u2
|
||||
- id: exponent
|
||||
type: u4
|
||||
- id: modulus
|
||||
size: size_bits / 8
|
||||
|
||||
signature:
|
||||
seq:
|
||||
- id: version
|
||||
type: u1
|
||||
- id: size_bits
|
||||
type: u2
|
||||
- id: hash_algorithm_id
|
||||
type: u2
|
||||
- id: signature
|
||||
size: size_bits / 8
|
||||
|
||||
key_signature:
|
||||
seq:
|
||||
- id: version
|
||||
type: u1
|
||||
- id: key_id
|
||||
type: u2
|
||||
- id: public_key
|
||||
type: public_key
|
||||
- id: sig_scheme
|
||||
type: u2
|
||||
- id: signature
|
||||
type: signature
|
@ -27,12 +27,12 @@ typedef struct ME_VERSION_ {
|
||||
UINT16 Build;
|
||||
} ME_VERSION;
|
||||
|
||||
const UByteArray ME_VERSION_SIGNATURE("\x24\x4D\x41\x4E", 4); //$MAN
|
||||
const UByteArray ME_VERSION_SIGNATURE2("\x24\x4D\x4E\x32", 4); //$MN2
|
||||
#define ME_VERSION_SIGNATURE 0x4E414D24 //$MAN
|
||||
#define ME_VERSION_SIGNATURE2 0x324E4D24 //$MN2
|
||||
|
||||
// FPT
|
||||
#define ME_ROM_BYPASS_VECTOR_SIZE 0x10
|
||||
const UByteArray FPT_HEADER_SIGNATURE("\x24\x46\x50\x54", 4); //$FPT
|
||||
#define FPT_HEADER_SIGNATURE 0x54504624 //$FPT
|
||||
|
||||
// Header version 1.0 or 2.0, default
|
||||
typedef struct FPT_HEADER_ {
|
||||
|
@ -19,7 +19,6 @@
|
||||
#include "meparser.h"
|
||||
#include "parsingdata.h"
|
||||
#include "utility.h"
|
||||
#include "uinttypes.h"
|
||||
|
||||
#ifdef U_ENABLE_ME_PARSING_SUPPORT
|
||||
|
||||
@ -54,7 +53,7 @@ USTATUS MeParser::parseMeRegionBody(const UModelIndex & index)
|
||||
|
||||
// Check ME signature to determine it's version
|
||||
// ME v11 and older layout
|
||||
if (meRegion.left(sizeof(UINT32)) == FPT_HEADER_SIGNATURE || meRegion.mid(ME_ROM_BYPASS_VECTOR_SIZE, sizeof(UINT32)) == FPT_HEADER_SIGNATURE) {
|
||||
if (*(UINT32*)meRegion.constData() == FPT_HEADER_SIGNATURE || *(UINT32*)(meRegion.constData() + ME_ROM_BYPASS_VECTOR_SIZE) == FPT_HEADER_SIGNATURE) {
|
||||
UModelIndex ptIndex;
|
||||
return parseFptRegion(meRegion, index, ptIndex);
|
||||
}
|
||||
@ -73,7 +72,7 @@ USTATUS MeParser::parseMeRegionBody(const UModelIndex & index)
|
||||
return U_INVALID_ME_PARTITION_TABLE;
|
||||
}
|
||||
// Data partition always points to FPT header
|
||||
if (meRegion.mid(ifwi16Header->DataPartition.Offset, sizeof(UINT32)) == FPT_HEADER_SIGNATURE) {
|
||||
if (*(UINT32*)(meRegion.constData() + ifwi16Header->DataPartition.Offset) == FPT_HEADER_SIGNATURE) {
|
||||
UModelIndex ptIndex;
|
||||
return parseIfwi16Region(meRegion, index, ptIndex);
|
||||
}
|
||||
@ -91,7 +90,7 @@ USTATUS MeParser::parseMeRegionBody(const UModelIndex & index)
|
||||
return U_INVALID_ME_PARTITION_TABLE;
|
||||
}
|
||||
// Data partition always points to FPT header
|
||||
if (meRegion.mid(ifwi17Header->DataPartition.Offset, sizeof(UINT32)) == FPT_HEADER_SIGNATURE) {
|
||||
if (*(UINT32*)(meRegion.constData() + ifwi17Header->DataPartition.Offset)== FPT_HEADER_SIGNATURE) {
|
||||
UModelIndex ptIndex;
|
||||
return parseIfwi17Region(meRegion, index, ptIndex);
|
||||
}
|
||||
@ -112,7 +111,7 @@ USTATUS MeParser::parseFptRegion(const UByteArray & region, const UModelIndex &
|
||||
// Populate partition table header
|
||||
const FPT_HEADER* ptHeader = (const FPT_HEADER*)region.constData();
|
||||
UINT32 romBypassVectorSize = 0;
|
||||
if (region.left(sizeof(UINT32)) != FPT_HEADER_SIGNATURE) {
|
||||
if (*(UINT32*)region.constData() != FPT_HEADER_SIGNATURE) {
|
||||
// Adjust the header to skip ROM bypass vector
|
||||
romBypassVectorSize = ME_ROM_BYPASS_VECTOR_SIZE;
|
||||
ptHeader = (const FPT_HEADER*)(region.constData() + romBypassVectorSize);
|
||||
|
@ -22,7 +22,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
#include "ubytearray.h"
|
||||
#include "treemodel.h"
|
||||
#include "ffsparser.h"
|
||||
#include "sha256.h"
|
||||
|
||||
#include "digest/sha2.h"
|
||||
|
||||
#ifdef U_ENABLE_ME_PARSING_SUPPORT
|
||||
class MeParser
|
||||
|
@ -23,6 +23,7 @@ uefitoolcommon = static_library('uefitoolcommon',
|
||||
'nvram.cpp',
|
||||
'nvramparser.cpp',
|
||||
'meparser.cpp',
|
||||
'fitparser.cpp',
|
||||
'ffsparser.cpp',
|
||||
'ffsreport.cpp',
|
||||
'ffsutils.cpp',
|
||||
@ -31,7 +32,16 @@ uefitoolcommon = static_library('uefitoolcommon',
|
||||
'treemodel.cpp',
|
||||
'utility.cpp',
|
||||
'ustring.cpp',
|
||||
'sha256.c',
|
||||
'generated/intel_acbp_v1.cpp',
|
||||
'generated/intel_acbp_v2.cpp',
|
||||
'generated/intel_keym_v1.cpp',
|
||||
'generated/intel_keym_v2.cpp',
|
||||
'generated/intel_acm.cpp',
|
||||
'kaitai/kaitaistream.cpp',
|
||||
'digest/sha1.c',
|
||||
'digest/sha256.c',
|
||||
'digest/sha512.c',
|
||||
'digest/sm3.c',
|
||||
],
|
||||
cpp_args: [
|
||||
'-DU_ENABLE_NVRAM_PARSING_SUPPORT',
|
||||
|
@ -12,6 +12,66 @@
|
||||
*/
|
||||
|
||||
#include "nvram.h"
|
||||
#include "ubytearray.h"
|
||||
|
||||
//
|
||||
// GUIDs mentioned in by nvram.h
|
||||
//
|
||||
extern const UByteArray NVRAM_NVAR_STORE_FILE_GUID // CEF5B9A3-476D-497F-9FDC-E98143E0422C
|
||||
("\xA3\xB9\xF5\xCE\x6D\x47\x7F\x49\x9F\xDC\xE9\x81\x43\xE0\x42\x2C", 16);
|
||||
extern const UByteArray NVRAM_NVAR_EXTERNAL_DEFAULTS_FILE_GUID // 9221315B-30BB-46B5-813E-1B1BF4712BD3
|
||||
("\x5B\x31\x21\x92\xBB\x30\xB5\x46\x81\x3E\x1B\x1B\xF4\x71\x2B\xD3", 16);
|
||||
extern const UByteArray NVRAM_NVAR_PEI_EXTERNAL_DEFAULTS_FILE_GUID // 77D3DC50-D42B-4916-AC80-8F469035D150
|
||||
("\x50\xDC\xD3\x77\x2B\xD4\x16\x49\xAC\x80\x8F\x46\x90\x35\xD1\x50", 16);
|
||||
extern const UByteArray NVRAM_NVAR_BB_DEFAULTS_FILE_GUID // AF516361-B4C5-436E-A7E3-A149A31B1461
|
||||
("\x61\x63\x51\xAF\xC5\xB4\x6E\x43\xA7\xE3\xA1\x49\xA3\x1B\x14\x61", 16);
|
||||
extern const UByteArray NVRAM_MAIN_STORE_VOLUME_GUID // FFF12B8D-7696-4C8B-A985-2747075B4F50
|
||||
("\x8D\x2B\xF1\xFF\x96\x76\x8B\x4C\xA9\x85\x27\x47\x07\x5B\x4F\x50", 16);
|
||||
extern const UByteArray NVRAM_ADDITIONAL_STORE_VOLUME_GUID // 00504624-8A59-4EEB-BD0F-6B36E96128E0
|
||||
("\x24\x46\x50\x00\x59\x8A\xEB\x4E\xBD\x0F\x6B\x36\xE9\x61\x28\xE0", 16);
|
||||
extern const UByteArray NVRAM_VSS2_AUTH_VAR_KEY_DATABASE_GUID // AAF32C78-947B-439A-A180-2E144EC37792
|
||||
("\x78\x2C\xF3\xAA\x7B\x94\x9A\x43\xA1\x80\x2E\x14\x4E\xC3\x77\x92");
|
||||
extern const UByteArray NVRAM_VSS2_STORE_GUID // DDCF3617-3275-4164-98B6-FE85707FFE7D
|
||||
("\x17\x36\xCF\xDD\x75\x32\x64\x41\x98\xB6\xFE\x85\x70\x7F\xFE\x7D");
|
||||
extern const UByteArray NVRAM_FDC_STORE_GUID // DDCF3616-3275-4164-98B6-FE85707FFE7D
|
||||
("\x16\x36\xCF\xDD\x75\x32\x64\x41\x98\xB6\xFE\x85\x70\x7F\xFE\x7D");
|
||||
extern const UByteArray EDKII_WORKING_BLOCK_SIGNATURE_GUID // 9E58292B-7C68-497D-0ACE6500FD9F1B95
|
||||
("\x2B\x29\x58\x9E\x68\x7C\x7D\x49\x0A\xCE\x65\x00\xFD\x9F\x1B\x95", 16);
|
||||
extern const UByteArray VSS2_WORKING_BLOCK_SIGNATURE_GUID // 9E58292B-7C68-497D-A0CE6500FD9F1B95
|
||||
("\x2B\x29\x58\x9E\x68\x7C\x7D\x49\xA0\xCE\x65\x00\xFD\x9F\x1B\x95", 16);
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_VOLUME_HEADER // B091E7D2-05A0-4198-94F0-74B7B8C55459
|
||||
("\xD2\xE7\x91\xB0\xA0\x05\x98\x41\x94\xF0\x74\xB7\xB8\xC5\x54\x59", 16);
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_MICROCODES_GUID // FD3F690E-B4B0-4D68-89DB-19A1A3318F90
|
||||
("\x0E\x69\x3F\xFD\xB0\xB4\x68\x4D\x89\xDB\x19\xA1\xA3\x31\x8F\x90", 16);
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_CMDB_GUID // 46310243-7B03-4132-BE44-2243FACA7CDD
|
||||
("\x43\x02\x31\x46\x03\x7B\x32\x41\xBE\x44\x22\x43\xFA\xCA\x7C\xDD", 16);
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_PUBKEY1_GUID // 1B2C4952-D778-4B64-BDA1-15A36F5FA545
|
||||
("\x52\x49\x2C\x1B\x78\xD7\x64\x4B\xBD\xA1\x15\xA3\x6F\x5F\xA5\x45", 16);
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_MARKER1_GUID // 127C1C4E-9135-46E3-B006-F9808B0559A5
|
||||
("\x4E\x1C\x7C\x12\x35\x91\xE3\x46\xB0\x06\xF9\x80\x8B\x05\x59\xA5", 16);
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_PUBKEY2_GUID // 7CE75114-8272-45AF-B536-761BD38852CE
|
||||
("\x14\x51\xE7\x7C\x72\x82\xAF\x45\xB5\x36\x76\x1B\xD3\x88\x52\xCE", 16);
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_MARKER2_GUID // 071A3DBE-CFF4-4B73-83F0-598C13DCFDD5
|
||||
("\xBE\x3D\x1A\x07\xF4\xCF\x73\x4B\x83\xF0\x59\x8C\x13\xDC\xFD\xD5", 16);
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA1_GUID // FACFB110-7BFD-4EFB-873E-88B6B23B97EA
|
||||
("\x10\xB1\xCF\xFA\xFD\x7B\xFB\x4E\x87\x3E\x88\xB6\xB2\x3B\x97\xEA", 16);
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA2_GUID // E68DC11A-A5F4-4AC3-AA2E-29E298BFF645
|
||||
("\x1A\xC1\x8D\xE6\xF4\xA5\xC3\x4A\xAA\x2E\x29\xE2\x98\xBF\xF6\x45", 16);
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA3_GUID // 4B3828AE-0ACE-45B6-8CDB-DAFC28BBF8C5
|
||||
("\xAE\x28\x38\x4B\xCE\x0A\xB6\x45\x8C\xDB\xDA\xFC\x28\xBB\xF8\xC5", 16);
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA4_GUID // C22E6B8A-8159-49A3-B353-E84B79DF19C0
|
||||
("\x8A\x6B\x2E\xC2\x59\x81\xA3\x49\xB3\x53\xE8\x4B\x79\xDF\x19\xC0", 16);
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA5_GUID // B6B5FAB9-75C4-4AAE-8314-7FFFA7156EAA
|
||||
("\xB9\xFA\xB5\xB6\xC4\x75\xAE\x4A\x83\x14\x7F\xFF\xA7\x15\x6E\xAA", 16);
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA6_GUID // 919B9699-8DD0-4376-AA0B-0E54CCA47D8F
|
||||
("\x99\x96\x9B\x91\xD0\x8D\x76\x43\xAA\x0B\x0E\x54\xCC\xA4\x7D\x8F", 16);
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA7_GUID // 58A90A52-929F-44F8-AC35-A7E1AB18AC91
|
||||
("\x52\x0A\xA9\x58\x9F\x92\xF8\x44\xAC\x35\xA7\xE1\xAB\x18\xAC\x91", 16);
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_SELF_GUID // 8CB71915-531F-4AF5-82BF-A09140817BAA
|
||||
("\x15\x19\xB7\x8C\x1F\x53\xF5\x4A\x82\xBF\xA0\x91\x40\x81\x7B\xAA", 16);
|
||||
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_SIGNATURE
|
||||
("\x5F\x46\x4C\x41\x53\x48\x5F\x4D\x41\x50", 10);
|
||||
|
||||
UString nvarAttributesToUString(const UINT8 attributes)
|
||||
{
|
||||
|
130
common/nvram.h
130
common/nvram.h
@ -25,22 +25,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
//
|
||||
// NVAR store and entry
|
||||
//
|
||||
|
||||
// CEF5B9A3-476D-497F-9FDC-E98143E0422C
|
||||
const UByteArray NVRAM_NVAR_STORE_FILE_GUID
|
||||
("\xA3\xB9\xF5\xCE\x6D\x47\x7F\x49\x9F\xDC\xE9\x81\x43\xE0\x42\x2C", 16);
|
||||
|
||||
// 9221315B-30BB-46B5-813E-1B1BF4712BD3
|
||||
const UByteArray NVRAM_NVAR_EXTERNAL_DEFAULTS_FILE_GUID
|
||||
("\x5B\x31\x21\x92\xBB\x30\xB5\x46\x81\x3E\x1B\x1B\xF4\x71\x2B\xD3", 16);
|
||||
|
||||
// 77D3DC50-D42B-4916-AC80-8F469035D150
|
||||
const UByteArray NVRAM_NVAR_PEI_EXTERNAL_DEFAULTS_FILE_GUID
|
||||
("\x50\xDC\xD3\x77\x2B\xD4\x16\x49\xAC\x80\x8F\x46\x90\x35\xD1\x50", 16);
|
||||
|
||||
// AF516361-B4C5-436E-A7E3-A149A31B1461
|
||||
const UByteArray NVRAM_NVAR_BB_DEFAULTS_FILE_GUID
|
||||
("\x61\x63\x51\xAF\xC5\xB4\x6E\x43\xA7\xE3\xA1\x49\xA3\x1B\x14\x61", 16);
|
||||
extern const UByteArray NVRAM_NVAR_STORE_FILE_GUID; // CEF5B9A3-476D-497F-9FDC-E98143E0422C
|
||||
extern const UByteArray NVRAM_NVAR_EXTERNAL_DEFAULTS_FILE_GUID; // 9221315B-30BB-46B5-813E-1B1BF4712BD3
|
||||
extern const UByteArray NVRAM_NVAR_PEI_EXTERNAL_DEFAULTS_FILE_GUID; // 77D3DC50-D42B-4916-AC80-8F469035D150
|
||||
extern const UByteArray NVRAM_NVAR_BB_DEFAULTS_FILE_GUID; // AF516361-B4C5-436E-A7E3-A149A31B1461
|
||||
|
||||
extern UString nvarAttributesToUString(const UINT8 attributes);
|
||||
extern UString nvarExtendedAttributesToUString(const UINT8 attributes);
|
||||
@ -75,14 +63,8 @@ typedef struct NVAR_ENTRY_HEADER_ {
|
||||
//
|
||||
// TianoCore VSS store and variables
|
||||
//
|
||||
|
||||
// FFF12B8D-7696-4C8B-A985-2747075B4F50
|
||||
const UByteArray NVRAM_MAIN_STORE_VOLUME_GUID
|
||||
("\x8D\x2B\xF1\xFF\x96\x76\x8B\x4C\xA9\x85\x27\x47\x07\x5B\x4F\x50", 16);
|
||||
|
||||
// 00504624-8A59-4EEB-BD0F-6B36E96128E0
|
||||
const UByteArray NVRAM_ADDITIONAL_STORE_VOLUME_GUID
|
||||
("\x24\x46\x50\x00\x59\x8A\xEB\x4E\xBD\x0F\x6B\x36\xE9\x61\x28\xE0", 16);
|
||||
extern const UByteArray NVRAM_MAIN_STORE_VOLUME_GUID; // FFF12B8D-7696-4C8B-A985-2747075B4F50
|
||||
extern const UByteArray NVRAM_ADDITIONAL_STORE_VOLUME_GUID; // 00504624-8A59-4EEB-BD0F-6B36E96128E0
|
||||
|
||||
#define NVRAM_VSS_STORE_SIGNATURE 0x53535624 // $VSS
|
||||
#define NVRAM_APPLE_SVS_STORE_SIGNATURE 0x53565324 // $SVS
|
||||
@ -182,18 +164,13 @@ extern UString vssAttributesToUString(const UINT32 attributes);
|
||||
//
|
||||
// VSS2 variables
|
||||
//
|
||||
|
||||
// aaf32c78-947b-439a-a180-2e144ec37792
|
||||
#define NVRAM_VSS2_AUTH_VAR_KEY_DATABASE_GUID_PART1 0xaaf32c78
|
||||
const UByteArray NVRAM_VSS2_AUTH_VAR_KEY_DATABASE_GUID
|
||||
("\x78\x2C\xF3\xAA\x7B\x94\x9A\x43\xA1\x80\x2E\x14\x4E\xC3\x77\x92");
|
||||
extern const UByteArray NVRAM_VSS2_AUTH_VAR_KEY_DATABASE_GUID; // AAF32C78-947B-439A-A180-2E144EC37792
|
||||
|
||||
#define NVRAM_VSS2_STORE_GUID_PART1 0xddcf3617
|
||||
const UByteArray NVRAM_VSS2_STORE_GUID
|
||||
("\x17\x36\xCF\xDD\x75\x32\x64\x41\x98\xB6\xFE\x85\x70\x7F\xFE\x7D");
|
||||
extern const UByteArray NVRAM_VSS2_STORE_GUID; // DDCF3617-3275-4164-98B6-FE85707FFE7D
|
||||
|
||||
const UByteArray NVRAM_FDC_STORE_GUID
|
||||
("\x16\x36\xCF\xDD\x75\x32\x64\x41\x98\xB6\xFE\x85\x70\x7F\xFE\x7D");
|
||||
extern const UByteArray NVRAM_FDC_STORE_GUID; // DDCF3616-3275-4164-98B6-FE85707FFE7D
|
||||
|
||||
// Variable store header
|
||||
typedef struct VSS2_VARIABLE_STORE_HEADER_ {
|
||||
@ -226,14 +203,8 @@ typedef struct FDC_VOLUME_HEADER_ {
|
||||
//
|
||||
#define EFI_FAULT_TOLERANT_WORKING_BLOCK_VALID 0x1
|
||||
#define EFI_FAULT_TOLERANT_WORKING_BLOCK_INVALID 0x2
|
||||
|
||||
// 9E58292B-7C68-497D-0ACE6500FD9F1B95
|
||||
const UByteArray EDKII_WORKING_BLOCK_SIGNATURE_GUID
|
||||
("\x2B\x29\x58\x9E\x68\x7C\x7D\x49\x0A\xCE\x65\x00\xFD\x9F\x1B\x95", 16);
|
||||
|
||||
// 9E58292B-7C68-497D-A0CE6500FD9F1B95
|
||||
const UByteArray VSS2_WORKING_BLOCK_SIGNATURE_GUID
|
||||
("\x2B\x29\x58\x9E\x68\x7C\x7D\x49\xA0\xCE\x65\x00\xFD\x9F\x1B\x95", 16);
|
||||
extern const UByteArray EDKII_WORKING_BLOCK_SIGNATURE_GUID; // 9E58292B-7C68-497D-0ACE6500FD9F1B95
|
||||
extern const UByteArray VSS2_WORKING_BLOCK_SIGNATURE_GUID; // 9E58292B-7C68-497D-A0CE6500FD9F1B95
|
||||
|
||||
#define NVRAM_MAIN_STORE_VOLUME_GUID_DATA1 0xFFF12B8D
|
||||
#define EDKII_WORKING_BLOCK_SIGNATURE_GUID_DATA1 0x9E58292B
|
||||
@ -355,8 +326,7 @@ extern UString evsaAttributesToUString(const UINT32 attributes);
|
||||
#define NVRAM_PHOENIX_FLASH_MAP_SIGNATURE_LENGTH 10
|
||||
|
||||
// _FLASH_MAP
|
||||
const UByteArray NVRAM_PHOENIX_FLASH_MAP_SIGNATURE
|
||||
("\x5F\x46\x4C\x41\x53\x48\x5F\x4D\x41\x50", 10);
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_SIGNATURE;
|
||||
|
||||
typedef struct PHOENIX_FLASH_MAP_HEADER_ {
|
||||
UINT8 Signature[10]; // _FLASH_MAP signature
|
||||
@ -378,70 +348,25 @@ typedef struct PHOENIX_FLASH_MAP_ENTRY_ {
|
||||
|
||||
extern UString flashMapGuidToUString(const EFI_GUID & guid);
|
||||
|
||||
// B091E7D2-05A0-4198-94F0-74B7B8C55459
|
||||
const UByteArray NVRAM_PHOENIX_FLASH_MAP_VOLUME_HEADER
|
||||
("\xD2\xE7\x91\xB0\xA0\x05\x98\x41\x94\xF0\x74\xB7\xB8\xC5\x54\x59", 16);
|
||||
|
||||
// FD3F690E-B4B0-4D68-89DB-19A1A3318F90
|
||||
const UByteArray NVRAM_PHOENIX_FLASH_MAP_MICROCODES_GUID
|
||||
("\x0E\x69\x3F\xFD\xB0\xB4\x68\x4D\x89\xDB\x19\xA1\xA3\x31\x8F\x90", 16);
|
||||
|
||||
// 46310243-7B03-4132-BE44-2243FACA7CDD
|
||||
const UByteArray NVRAM_PHOENIX_FLASH_MAP_CMDB_GUID
|
||||
("\x43\x02\x31\x46\x03\x7B\x32\x41\xBE\x44\x22\x43\xFA\xCA\x7C\xDD", 16);
|
||||
|
||||
// 1B2C4952-D778-4B64-BDA1-15A36F5FA545
|
||||
const UByteArray NVRAM_PHOENIX_FLASH_MAP_PUBKEY1_GUID
|
||||
("\x52\x49\x2C\x1B\x78\xD7\x64\x4B\xBD\xA1\x15\xA3\x6F\x5F\xA5\x45", 16);
|
||||
|
||||
// 127C1C4E-9135-46E3-B006-F9808B0559A5
|
||||
const UByteArray NVRAM_PHOENIX_FLASH_MAP_MARKER1_GUID
|
||||
("\x4E\x1C\x7C\x12\x35\x91\xE3\x46\xB0\x06\xF9\x80\x8B\x05\x59\xA5", 16);
|
||||
|
||||
// 7CE75114-8272-45AF-B536-761BD38852CE
|
||||
const UByteArray NVRAM_PHOENIX_FLASH_MAP_PUBKEY2_GUID
|
||||
("\x14\x51\xE7\x7C\x72\x82\xAF\x45\xB5\x36\x76\x1B\xD3\x88\x52\xCE", 16);
|
||||
|
||||
// 071A3DBE-CFF4-4B73-83F0-598C13DCFDD5
|
||||
const UByteArray NVRAM_PHOENIX_FLASH_MAP_MARKER2_GUID
|
||||
("\xBE\x3D\x1A\x07\xF4\xCF\x73\x4B\x83\xF0\x59\x8C\x13\xDC\xFD\xD5", 16);
|
||||
|
||||
// FACFB110-7BFD-4EFB-873E-88B6B23B97EA
|
||||
const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA1_GUID
|
||||
("\x10\xB1\xCF\xFA\xFD\x7B\xFB\x4E\x87\x3E\x88\xB6\xB2\x3B\x97\xEA", 16);
|
||||
|
||||
// E68DC11A-A5F4-4AC3-AA2E-29E298BFF645
|
||||
const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA2_GUID
|
||||
("\x1A\xC1\x8D\xE6\xF4\xA5\xC3\x4A\xAA\x2E\x29\xE2\x98\xBF\xF6\x45", 16);
|
||||
|
||||
// 4B3828AE-0ACE-45B6-8CDB-DAFC28BBF8C5
|
||||
const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA3_GUID
|
||||
("\xAE\x28\x38\x4B\xCE\x0A\xB6\x45\x8C\xDB\xDA\xFC\x28\xBB\xF8\xC5", 16);
|
||||
|
||||
// C22E6B8A-8159-49A3-B353-E84B79DF19C0
|
||||
const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA4_GUID
|
||||
("\x8A\x6B\x2E\xC2\x59\x81\xA3\x49\xB3\x53\xE8\x4B\x79\xDF\x19\xC0", 16);
|
||||
|
||||
// B6B5FAB9-75C4-4AAE-8314-7FFFA7156EAA
|
||||
const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA5_GUID
|
||||
("\xB9\xFA\xB5\xB6\xC4\x75\xAE\x4A\x83\x14\x7F\xFF\xA7\x15\x6E\xAA", 16);
|
||||
|
||||
// 919B9699-8DD0-4376-AA0B-0E54CCA47D8F
|
||||
const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA6_GUID
|
||||
("\x99\x96\x9B\x91\xD0\x8D\x76\x43\xAA\x0B\x0E\x54\xCC\xA4\x7D\x8F", 16);
|
||||
|
||||
// 58A90A52-929F-44F8-AC35-A7E1AB18AC91
|
||||
const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA7_GUID
|
||||
("\x52\x0A\xA9\x58\x9F\x92\xF8\x44\xAC\x35\xA7\xE1\xAB\x18\xAC\x91", 16);
|
||||
|
||||
// 8CB71915-531F-4AF5-82BF-A09140817BAA
|
||||
const UByteArray NVRAM_PHOENIX_FLASH_MAP_SELF_GUID
|
||||
("\x15\x19\xB7\x8C\x1F\x53\xF5\x4A\x82\xBF\xA0\x91\x40\x81\x7B\xAA", 16);
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_VOLUME_HEADER; // B091E7D2-05A0-4198-94F0-74B7B8C55459
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_MICROCODES_GUID; // FD3F690E-B4B0-4D68-89DB-19A1A3318F90
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_CMDB_GUID; // 46310243-7B03-4132-BE44-2243FACA7CDD
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_PUBKEY1_GUID; // 1B2C4952-D778-4B64-BDA1-15A36F5FA545
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_MARKER1_GUID; // 127C1C4E-9135-46E3-B006-F9808B0559A5
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_PUBKEY2_GUID; // 7CE75114-8272-45AF-B536-761BD38852CE
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_MARKER2_GUID; // 071A3DBE-CFF4-4B73-83F0-598C13DCFDD5
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA1_GUID; // FACFB110-7BFD-4EFB-873E-88B6B23B97EA
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA2_GUID; // E68DC11A-A5F4-4AC3-AA2E-29E298BFF645
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA3_GUID; // 4B3828AE-0ACE-45B6-8CDB-DAFC28BBF8C5
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA4_GUID; // C22E6B8A-8159-49A3-B353-E84B79DF19C0
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA5_GUID; // B6B5FAB9-75C4-4AAE-8314-7FFFA7156EAA
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA6_GUID; // 919B9699-8DD0-4376-AA0B-0E54CCA47D8F
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_EVSA7_GUID; // 58A90A52-929F-44F8-AC35-A7E1AB18AC91
|
||||
extern const UByteArray NVRAM_PHOENIX_FLASH_MAP_SELF_GUID; // 8CB71915-531F-4AF5-82BF-A09140817BAA
|
||||
|
||||
//
|
||||
// SLIC pubkey and marker
|
||||
//
|
||||
|
||||
typedef struct OEM_ACTIVATION_PUBKEY_ {
|
||||
UINT32 Type; // 0
|
||||
UINT32 Size; // 0x9C
|
||||
@ -478,7 +403,6 @@ typedef struct OEM_ACTIVATION_MARKER_ {
|
||||
//
|
||||
// Phoenix CMDB, no londer used, requires no parsing
|
||||
//
|
||||
|
||||
typedef struct PHOENIX_CMDB_HEADER_ {
|
||||
UINT32 Signature; // CMDB signature
|
||||
UINT32 HeaderSize; // Size of this header
|
||||
|
@ -12,8 +12,6 @@
|
||||
|
||||
*/
|
||||
|
||||
//TODO: relax fixed restrictions once NVRAM builder is ready
|
||||
|
||||
#include <map>
|
||||
|
||||
#include "nvramparser.h"
|
||||
@ -21,8 +19,7 @@
|
||||
#include "utility.h"
|
||||
#include "nvram.h"
|
||||
#include "ffs.h"
|
||||
#include "fit.h"
|
||||
#include "uinttypes.h"
|
||||
#include "intel_microcode.h"
|
||||
|
||||
#ifdef U_ENABLE_NVRAM_PARSING_SUPPORT
|
||||
USTATUS NvramParser::parseNvarStore(const UModelIndex & index)
|
||||
@ -308,7 +305,7 @@ USTATUS NvramParser::parseNvarStore(const UModelIndex & index)
|
||||
pdata.isValid = FALSE;
|
||||
}
|
||||
else // Add GUID info for valid entries
|
||||
info += UString("Variable GUID: ") + guid + UString("\n");
|
||||
info += UString("Variable GUID: ") + guid + "\n";
|
||||
|
||||
// Add GUID index information
|
||||
if (hasGuidIndex)
|
||||
@ -537,6 +534,8 @@ USTATUS NvramParser::findNextStore(const UModelIndex & index, const UByteArray &
|
||||
return U_STORES_NOT_FOUND;
|
||||
|
||||
// TODO: add checks for restSize
|
||||
// TODO: remove misaligned access by doing the signature checks differently, the current way is UB is C++
|
||||
// TODO: rewrite this all as Kaitai-based parser
|
||||
UINT32 offset = storeOffset;
|
||||
for (; offset < dataSize - sizeof(UINT32); offset++) {
|
||||
const UINT32* currentPos = (const UINT32*)(volume.constData() + offset);
|
||||
@ -1504,7 +1503,7 @@ USTATUS NvramParser::parseVssStoreBody(const UModelIndex & index, UINT8 alignmen
|
||||
}
|
||||
else { // Add GUID and text for valid variables
|
||||
name = guidToUString(readUnaligned(variableGuid));
|
||||
info += UString("Variable GUID: ") + guidToUString(readUnaligned(variableGuid), false) + UString("\n");
|
||||
info += UString("Variable GUID: ") + guidToUString(readUnaligned(variableGuid), false) + "\n";
|
||||
|
||||
#if QT_VERSION_MAJOR >= 6
|
||||
text = UString::fromUtf16((char16_t *)variableName);
|
||||
@ -1859,7 +1858,7 @@ USTATUS NvramParser::parseEvsaStoreBody(const UModelIndex & index)
|
||||
model->setName(current, guid);
|
||||
}
|
||||
model->setText(current, name);
|
||||
model->addInfo(current, UString("GUID: ") + guid + UString("\nName: ") + name + UString("\n"), false);
|
||||
model->addInfo(current, UString("GUID: ") + guid + UString("\nName: ") + name + "\n", false);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1910,10 +1909,10 @@ USTATUS NvramParser::parseFlashMapBody(const UModelIndex & index)
|
||||
// Add info
|
||||
UString info = UString("Entry GUID: ") + guidToUString(entryHeader->Guid, false) +
|
||||
usprintf("\nFull size: 24h (36)\nHeader size: 24h (36)\nBody size: 0h (0)\n"
|
||||
"Entry type: %04Xh\nData type: %04Xh\nMemory address: %08llXh\nSize: %08Xh\nOffset: %08Xh",
|
||||
"Entry type: %04Xh\nData type: %04Xh\nMemory address: %08Xh\nSize: %08Xh\nOffset: %08Xh",
|
||||
entryHeader->EntryType,
|
||||
entryHeader->DataType,
|
||||
(unsigned long long)entryHeader->PhysicalAddress,
|
||||
(UINT32)entryHeader->PhysicalAddress,
|
||||
entryHeader->Size,
|
||||
entryHeader->Offset);
|
||||
|
||||
|
@ -30,6 +30,6 @@ UString machineTypeToUString(UINT16 machineType)
|
||||
case EFI_IMAGE_FILE_MACHINE_RISCV32: return UString("RISC-V 32-bit");
|
||||
case EFI_IMAGE_FILE_MACHINE_RISCV64: return UString("RISC-V 64-bit");
|
||||
case EFI_IMAGE_FILE_MACHINE_RISCV128: return UString("RISC-V 128-bit");
|
||||
default: return usprintf("Unknown (%04Xh)", machineType);
|
||||
}
|
||||
return usprintf("Unknown %04Xh", machineType);
|
||||
}
|
||||
|
212
common/sha256.c
212
common/sha256.c
@ -1,212 +0,0 @@
|
||||
/* sha256.c
|
||||
|
||||
Copyright (c) 2017, LongSoft. 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
|
||||
http://opensource.org/licenses/bsd-license.php
|
||||
|
||||
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
|
||||
*/
|
||||
|
||||
#include "sha256.h"
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
|
||||
struct sha256_state {
|
||||
uint64_t length;
|
||||
uint32_t state[8], curlen;
|
||||
uint8_t buf[SHA256_DIGEST_SIZE*2];
|
||||
};
|
||||
|
||||
void sha256_init(struct sha256_state *md);
|
||||
int sha256_process(struct sha256_state *md, const unsigned char *in, unsigned long inlen);
|
||||
int sha256_done(struct sha256_state *md, uint8_t *out);
|
||||
|
||||
#define GET_BE32(a) ((((uint32_t) (a)[0]) << 24) | (((uint32_t) (a)[1]) << 16) | \
|
||||
(((uint32_t) (a)[2]) << 8) | ((uint32_t) (a)[3]))
|
||||
|
||||
#define PUT_BE32(a, val) \
|
||||
do { \
|
||||
(a)[0] = (uint8_t) ((((uint32_t) (val)) >> 24) & 0xff); \
|
||||
(a)[1] = (uint8_t) ((((uint32_t) (val)) >> 16) & 0xff); \
|
||||
(a)[2] = (uint8_t) ((((uint32_t) (val)) >> 8) & 0xff); \
|
||||
(a)[3] = (uint8_t) (((uint32_t) (val)) & 0xff); \
|
||||
} while (0)
|
||||
|
||||
#define PUT_BE64(a, val) \
|
||||
do { \
|
||||
(a)[0] = (uint8_t) (((uint64_t) (val)) >> 56); \
|
||||
(a)[1] = (uint8_t) (((uint64_t) (val)) >> 48); \
|
||||
(a)[2] = (uint8_t) (((uint64_t) (val)) >> 40); \
|
||||
(a)[3] = (uint8_t) (((uint64_t) (val)) >> 32); \
|
||||
(a)[4] = (uint8_t) (((uint64_t) (val)) >> 24); \
|
||||
(a)[5] = (uint8_t) (((uint64_t) (val)) >> 16); \
|
||||
(a)[6] = (uint8_t) (((uint64_t) (val)) >> 8); \
|
||||
(a)[7] = (uint8_t) (((uint64_t) (val)) & 0xff); \
|
||||
} while (0)
|
||||
|
||||
void sha256(const void *in, unsigned long inlen, void* out)
|
||||
{
|
||||
struct sha256_state ctx;
|
||||
sha256_init(&ctx);
|
||||
sha256_process(&ctx, (const unsigned char*)in, inlen);
|
||||
sha256_done(&ctx, (unsigned char *)out);
|
||||
}
|
||||
|
||||
/* This is based on SHA256 implementation in LibTomCrypt that was released into
|
||||
* public domain by Tom St Denis. */
|
||||
/* the K array */
|
||||
static const unsigned long K[64] = {
|
||||
0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL, 0x3956c25bUL,
|
||||
0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL, 0xd807aa98UL, 0x12835b01UL,
|
||||
0x243185beUL, 0x550c7dc3UL, 0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL,
|
||||
0xc19bf174UL, 0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL,
|
||||
0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL, 0x983e5152UL,
|
||||
0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL, 0xc6e00bf3UL, 0xd5a79147UL,
|
||||
0x06ca6351UL, 0x14292967UL, 0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL,
|
||||
0x53380d13UL, 0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL,
|
||||
0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL, 0xd192e819UL,
|
||||
0xd6990624UL, 0xf40e3585UL, 0x106aa070UL, 0x19a4c116UL, 0x1e376c08UL,
|
||||
0x2748774cUL, 0x34b0bcb5UL, 0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL,
|
||||
0x682e6ff3UL, 0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL,
|
||||
0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL
|
||||
};
|
||||
/* Various logical functions */
|
||||
#define RORc(x, y) \
|
||||
( ((((unsigned long) (x) & 0xFFFFFFFFUL) >> (unsigned long) ((y) & 31)) | \
|
||||
((unsigned long) (x) << (unsigned long) (32 - ((y) & 31)))) & 0xFFFFFFFFUL)
|
||||
#define Ch(x,y,z) (z ^ (x & (y ^ z)))
|
||||
#define Maj(x,y,z) (((x | y) & z) | (x & y))
|
||||
#define S(x, n) RORc((x), (n))
|
||||
#define R(x, n) (((x)&0xFFFFFFFFUL)>>(n))
|
||||
#define Sigma0(x) (S(x, 2) ^ S(x, 13) ^ S(x, 22))
|
||||
#define Sigma1(x) (S(x, 6) ^ S(x, 11) ^ S(x, 25))
|
||||
#define Gamma0(x) (S(x, 7) ^ S(x, 18) ^ R(x, 3))
|
||||
#define Gamma1(x) (S(x, 17) ^ S(x, 19) ^ R(x, 10))
|
||||
#ifndef MIN
|
||||
#define MIN(x, y) (((x) < (y)) ? (x) : (y))
|
||||
#endif
|
||||
/* compress 512-bits */
|
||||
static void sha256_compress(struct sha256_state *md, unsigned char *buf)
|
||||
{
|
||||
uint32_t S[8], W[64], t0, t1;
|
||||
uint32_t t;
|
||||
int i;
|
||||
/* copy state into S */
|
||||
for (i = 0; i < 8; i++) {
|
||||
S[i] = md->state[i];
|
||||
}
|
||||
/* copy the state into 512-bits into W[0..15] */
|
||||
for (i = 0; i < 16; i++)
|
||||
W[i] = GET_BE32(buf + (4 * i));
|
||||
/* fill W[16..63] */
|
||||
for (i = 16; i < 64; i++) {
|
||||
W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) +
|
||||
W[i - 16];
|
||||
}
|
||||
/* Compress */
|
||||
#define RND(a,b,c,d,e,f,g,h,i) \
|
||||
t0 = (uint32_t)(h + Sigma1(e) + Ch(e, f, g) + K[i] + W[i]); \
|
||||
t1 = (uint32_t)(Sigma0(a) + Maj(a, b, c)); \
|
||||
d += t0; \
|
||||
h = t0 + t1;
|
||||
for (i = 0; i < 64; ++i) {
|
||||
RND(S[0], S[1], S[2], S[3], S[4], S[5], S[6], S[7], i);
|
||||
t = S[7]; S[7] = S[6]; S[6] = S[5]; S[5] = S[4];
|
||||
S[4] = S[3]; S[3] = S[2]; S[2] = S[1]; S[1] = S[0]; S[0] = t;
|
||||
}
|
||||
/* feedback */
|
||||
for (i = 0; i < 8; i++) {
|
||||
md->state[i] = md->state[i] + S[i];
|
||||
}
|
||||
}
|
||||
/* Initialize the hash state */
|
||||
void sha256_init(struct sha256_state *md)
|
||||
{
|
||||
md->curlen = 0;
|
||||
md->length = 0;
|
||||
md->state[0] = 0x6A09E667UL;
|
||||
md->state[1] = 0xBB67AE85UL;
|
||||
md->state[2] = 0x3C6EF372UL;
|
||||
md->state[3] = 0xA54FF53AUL;
|
||||
md->state[4] = 0x510E527FUL;
|
||||
md->state[5] = 0x9B05688CUL;
|
||||
md->state[6] = 0x1F83D9ABUL;
|
||||
md->state[7] = 0x5BE0CD19UL;
|
||||
}
|
||||
/**
|
||||
Process a block of memory though the hash
|
||||
@param md The hash state
|
||||
@param in The data to hash
|
||||
@param inlen The length of the data (octets)
|
||||
@return CRYPT_OK if successful
|
||||
*/
|
||||
int sha256_process(struct sha256_state *md, const unsigned char *in,
|
||||
unsigned long inlen)
|
||||
{
|
||||
unsigned long n;
|
||||
#define block_size 64
|
||||
if (md->curlen > sizeof(md->buf))
|
||||
return -1;
|
||||
while (inlen > 0) {
|
||||
if (md->curlen == 0 && inlen >= block_size) {
|
||||
sha256_compress(md, (unsigned char *) in);
|
||||
md->length += block_size * 8;
|
||||
in += block_size;
|
||||
inlen -= block_size;
|
||||
} else {
|
||||
n = MIN(inlen, (block_size - md->curlen));
|
||||
memcpy(md->buf + md->curlen, in, n);
|
||||
md->curlen += n;
|
||||
in += n;
|
||||
inlen -= n;
|
||||
if (md->curlen == block_size) {
|
||||
sha256_compress(md, md->buf);
|
||||
md->length += 8 * block_size;
|
||||
md->curlen = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
/**
|
||||
Terminate the hash to get the digest
|
||||
@param md The hash state
|
||||
@param out [out] The destination of the hash (32 bytes)
|
||||
@return CRYPT_OK if successful
|
||||
*/
|
||||
int sha256_done(struct sha256_state *md, unsigned char *out)
|
||||
{
|
||||
int i;
|
||||
if (md->curlen >= sizeof(md->buf))
|
||||
return -1;
|
||||
/* increase the length of the message */
|
||||
md->length += (uint64_t)md->curlen * 8;
|
||||
/* append the '1' bit */
|
||||
md->buf[md->curlen++] = (unsigned char) 0x80;
|
||||
/* if the length is currently above 56 bytes we append zeros
|
||||
* then compress. Then we can fall back to padding zeros and length
|
||||
* encoding like normal.
|
||||
*/
|
||||
if (md->curlen > 56) {
|
||||
while (md->curlen < 64) {
|
||||
md->buf[md->curlen++] = (unsigned char) 0;
|
||||
}
|
||||
sha256_compress(md, md->buf);
|
||||
md->curlen = 0;
|
||||
}
|
||||
/* pad upto 56 bytes of zeroes */
|
||||
while (md->curlen < 56) {
|
||||
md->buf[md->curlen++] = (unsigned char) 0;
|
||||
}
|
||||
/* store length */
|
||||
PUT_BE64(md->buf + 56, md->length);
|
||||
sha256_compress(md, md->buf);
|
||||
/* copy output */
|
||||
for (i = 0; i < 8; i++)
|
||||
PUT_BE32(out + (4 * i), md->state[i]);
|
||||
return 0;
|
||||
}
|
@ -158,7 +158,7 @@ int TreeModel::rowCount(const UModelIndex &parent) const
|
||||
|
||||
UINT32 TreeModel::base(const UModelIndex ¤t) const
|
||||
{
|
||||
// TODO: rewrite this as loop if we ever see an image that is too deep for this naive implementation
|
||||
// Rewrite this as loop if we ever see an image that is too deep for this naive implementation
|
||||
if (!current.isValid())
|
||||
return 0;
|
||||
|
||||
|
@ -13,7 +13,7 @@
|
||||
#include "ustring.h"
|
||||
#include "types.h"
|
||||
#include "ffs.h"
|
||||
#include "fit.h"
|
||||
#include "intel_fit.h"
|
||||
|
||||
UString regionTypeToUString(const UINT8 type)
|
||||
{
|
||||
@ -36,7 +36,7 @@ UString regionTypeToUString(const UINT8 type)
|
||||
case Subtypes::PttRegion: return UString("PTT");
|
||||
};
|
||||
|
||||
return UString("Unknown");
|
||||
return usprintf("Unknown %02Xh", type);
|
||||
}
|
||||
|
||||
UString itemTypeToUString(const UINT8 type)
|
||||
@ -82,7 +82,7 @@ UString itemTypeToUString(const UINT8 type)
|
||||
case Types::CpdSpiEntry: return UString("CPD SPI entry");
|
||||
}
|
||||
|
||||
return UString("Unknown");
|
||||
return usprintf("Unknown %02Xh", type);
|
||||
}
|
||||
|
||||
UString itemSubtypeToUString(const UINT8 type, const UINT8 subtype)
|
||||
@ -182,7 +182,7 @@ UString compressionTypeToUString(const UINT8 algorithm)
|
||||
case COMPRESSION_ALGORITHM_LZMA_INTEL_LEGACY: return UString("Intel legacy LZMA");
|
||||
}
|
||||
|
||||
return UString("Unknown");
|
||||
return usprintf("Unknown %02Xh", algorithm);
|
||||
}
|
||||
|
||||
UString actionTypeToUString(const UINT8 action)
|
||||
@ -197,23 +197,41 @@ UString actionTypeToUString(const UINT8 action)
|
||||
case Actions::Rebase: return UString("Rebase");
|
||||
}
|
||||
|
||||
return UString("Unknown");
|
||||
return usprintf("Unknown %02Xh", action);
|
||||
}
|
||||
|
||||
UString fitEntryTypeToUString(const UINT8 type)
|
||||
{
|
||||
switch (type & 0x7F) {
|
||||
case FIT_TYPE_HEADER: return UString("FIT Header");
|
||||
case FIT_TYPE_MICROCODE: return UString("Microcode");
|
||||
case FIT_TYPE_BIOS_AC_MODULE: return UString("BIOS ACM");
|
||||
case FIT_TYPE_BIOS_INIT_MODULE: return UString("BIOS Init");
|
||||
case FIT_TYPE_TPM_POLICY: return UString("TPM Policy");
|
||||
case FIT_TYPE_BIOS_POLICY_DATA: return UString("BIOS Policy Data");
|
||||
case FIT_TYPE_TXT_CONF_POLICY: return UString("TXT Configuration Policy");
|
||||
case FIT_TYPE_AC_KEY_MANIFEST: return UString("BootGuard Key Manifest");
|
||||
case FIT_TYPE_AC_BOOT_POLICY: return UString("BootGuard Boot Policy");
|
||||
case FIT_TYPE_EMPTY: return UString("Empty");
|
||||
case INTEL_FIT_TYPE_HEADER: return UString("FIT Header");
|
||||
case INTEL_FIT_TYPE_MICROCODE: return UString("Microcode");
|
||||
case INTEL_FIT_TYPE_STARTUP_AC_MODULE: return UString("Startup ACM");
|
||||
case INTEL_FIT_TYPE_DIAG_AC_MODULE: return UString("Diagnostic ACM");
|
||||
case INTEL_FIT_TYPE_BIOS_STARTUP_MODULE: return UString("BIOS Startup Module");
|
||||
case INTEL_FIT_TYPE_TPM_POLICY: return UString("TPM Policy");
|
||||
case INTEL_FIT_TYPE_BIOS_POLICY: return UString("BIOS Policy");
|
||||
case INTEL_FIT_TYPE_TXT_POLICY: return UString("TXT Policy");
|
||||
case INTEL_FIT_TYPE_BOOT_GUARD_KEY_MANIFEST: return UString("BootGuard Key Manifest");
|
||||
case INTEL_FIT_TYPE_BOOT_GUARD_BOOT_POLICY: return UString("BootGuard Boot Policy");
|
||||
case INTEL_FIT_TYPE_CSE_SECURE_BOOT: return UString("CSE SecureBoot Settings");
|
||||
case INTEL_FIT_TYPE_ACM_FEATURE_POLICY: return UString("ACM Feature Policy");
|
||||
case INTEL_FIT_TYPE_JMP_DEBUG_POLICY: return UString("JMP Debug Policy");
|
||||
case INTEL_FIT_TYPE_EMPTY: return UString("Empty");
|
||||
}
|
||||
|
||||
return UString("Unknown");
|
||||
return usprintf("Unknown %02Xh", (type & 0x7F));
|
||||
}
|
||||
|
||||
UString hashTypeToUString(const UINT16 algorithm_id)
|
||||
{
|
||||
switch (algorithm_id) {
|
||||
case TCG_HASH_ALGORITHM_ID_SHA1: return UString("SHA1");
|
||||
case TCG_HASH_ALGORITHM_ID_SHA256: return UString("SHA256");
|
||||
case TCG_HASH_ALGORITHM_ID_SHA384: return UString("SHA384");
|
||||
case TCG_HASH_ALGORITHM_ID_SHA512: return UString("SHA512");
|
||||
case TCG_HASH_ALGORITHM_ID_NULL: return UString("NULL");
|
||||
case TCG_HASH_ALGORITHM_ID_SM3: return UString("SM3");
|
||||
}
|
||||
|
||||
return usprintf("Unknown %04Xh", algorithm_id);
|
||||
}
|
||||
|
@ -197,5 +197,6 @@ extern UString itemSubtypeToUString(const UINT8 type, const UINT8 subtype);
|
||||
extern UString compressionTypeToUString(const UINT8 algorithm);
|
||||
extern UString regionTypeToUString(const UINT8 type);
|
||||
extern UString fitEntryTypeToUString(const UINT8 type);
|
||||
extern UString hashTypeToUString(const UINT16 digest_agorithm_id);
|
||||
|
||||
#endif // TYPES_H
|
||||
|
@ -13,6 +13,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
#ifndef USTRING_H
|
||||
#define USTRING_H
|
||||
|
||||
#include "basetypes.h"
|
||||
|
||||
#if defined (QT_CORE_LIB)
|
||||
// Use Qt class, if Qt is available
|
||||
#include <QString>
|
||||
@ -24,7 +26,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
#include "bstrlib/bstrwrap.h"
|
||||
#define UString CBString
|
||||
#endif // QT_CORE_LIB
|
||||
#include "uinttypes.h"
|
||||
|
||||
UString usprintf(const char* fmt, ...) ATTRIBUTE_FORMAT_(printf, 1, 2);
|
||||
UString urepeated(char c, int len);
|
||||
|
@ -359,6 +359,7 @@ USTATUS decompress(const UByteArray & compressedData, const UINT8 compressionTyp
|
||||
return U_CUSTOMIZED_DECOMPRESSION_FAILED;
|
||||
}
|
||||
|
||||
// TODO: need to correctly handle non-x86 architecture of the FW image
|
||||
// After LZMA decompression, the data need to be converted to the raw data.
|
||||
UINT32 state = 0;
|
||||
const UINT8 x86LookAhead = 4;
|
||||
|
41
kaitai_regenerate.sh
Executable file
41
kaitai_regenerate.sh
Executable file
@ -0,0 +1,41 @@
|
||||
#!/bin/bash
|
||||
|
||||
UTARGET=$(uname)
|
||||
|
||||
# Determine platform
|
||||
if [ "$UTARGET" = "Darwin" ]; then
|
||||
export UPLATFORM="mac"
|
||||
elif [ "$UTARGET" = "Linux" ]; then
|
||||
export UPLATFORM="linux_$(uname -m)"
|
||||
elif [ "${UTARGET/MINGW32/}" != "$UTARGET" ]; then
|
||||
export UPLATFORM="win32"
|
||||
else
|
||||
# Fallback to something...
|
||||
export UPLATFORM="$UTARGET"
|
||||
fi
|
||||
|
||||
# Generate
|
||||
echo "Attempting to to generate parsers from Kaitai KSY files on ${UPLATFORM}..."
|
||||
kaitai-struct-compiler --target cpp_stl --outdir common/generated common/ksy/* || exit 1
|
||||
|
||||
# Show generated files
|
||||
find -E common/generated \
|
||||
-regex '.*\.(cpp|h)' \
|
||||
-print || exit 1
|
||||
|
||||
# Replace global includes for kaitai with local ones (<> -> "")
|
||||
find -E common/generated \
|
||||
-regex '.*\.(cpp|h)' \
|
||||
-exec sed -i '' '/^#include <kaitai/s/[<>]/\"/g' {} + || exit 1
|
||||
|
||||
# Add .. to the include path for kaitai includes
|
||||
find -E common/generated \
|
||||
-regex '.*\.(cpp|h)' \
|
||||
-exec sed -i '' '/^#include \"kaitai\//s/kaitai\//..\/kaitai\//g' {} + || exit 1
|
||||
|
||||
# Suppress "p__root - unused parameter" warning
|
||||
find -E common/generated \
|
||||
-regex '.*\.(cpp)' \
|
||||
-exec sed -i '' '/^ m__root = this;/s/;/; (void)p__root;/g' {} + || exit 1
|
||||
|
||||
exit 0
|
Loading…
Reference in New Issue
Block a user