-
Notifications
You must be signed in to change notification settings - Fork 962
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Integrate new authenticode parser #1027
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
31a09c7
Integrate new authenticode-parser
HoundThe 45eae2a
Add comments
HoundThe 1d7da2a
Integrate authenticode-parser repository as dependency
HoundThe 6074b01
Update to new authenticode-parser version
HoundThe 7645276
Change the verification flow
HoundThe 354dafe
Merge branch 'master' into rewrite_signatures
PeterMatula File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
cmake_minimum_required(VERSION 3.14) | ||
|
||
project(authenticode_parser VERSION 1.0.0 LANGUAGES C) | ||
|
||
find_package(OpenSSL 1.1.1 REQUIRED) | ||
|
||
include(GNUInstallDirs) | ||
|
||
add_library(authenticode STATIC | ||
src/authenticode.c | ||
src/helper.c | ||
src/structs.c | ||
src/countersignature.c | ||
src/certificate.c | ||
) | ||
|
||
add_library(retdec::deps::authenticode ALIAS authenticode) | ||
|
||
include (TestBigEndian) | ||
TEST_BIG_ENDIAN(IS_BIG_ENDIAN) | ||
if(IS_BIG_ENDIAN) | ||
target_compile_definitions(-DWORDS_BIGENDIAN) | ||
endif() | ||
|
||
target_compile_options(authenticode PRIVATE -Wall) | ||
target_compile_features(authenticode PRIVATE c_std_11) | ||
|
||
target_include_directories(authenticode | ||
PUBLIC | ||
$<BUILD_INTERFACE:${RETDEC_DEPS_DIR}/authenticode-parser/include> | ||
$<INSTALL_INTERFACE:${RETDEC_INSTALL_DEPS_INCLUDE_DIR}> | ||
PRIVATE | ||
${CMAKE_CURRENT_SOURCE_DIR}/src | ||
) | ||
|
||
target_link_libraries(authenticode | ||
PRIVATE | ||
OpenSSL::Crypto | ||
) | ||
|
||
install( | ||
DIRECTORY ${RETDEC_DEPS_DIR}/authenticode-parser/include/ | ||
DESTINATION ${RETDEC_INSTALL_DEPS_INCLUDE_DIR} | ||
) | ||
|
||
install(TARGETS authenticode | ||
EXPORT authenticode-targets | ||
ARCHIVE DESTINATION ${RETDEC_INSTALL_LIB_DIR} | ||
LIBRARY DESTINATION ${RETDEC_INSTALL_LIB_DIR} | ||
) | ||
|
||
install(EXPORT authenticode-targets | ||
FILE "retdec-authenticode-targets.cmake" | ||
NAMESPACE retdec::deps:: | ||
DESTINATION ${RETDEC_INSTALL_CMAKE_DIR} | ||
) | ||
|
||
configure_file( | ||
"retdec-authenticode-config.cmake" | ||
"${CMAKE_CURRENT_LIST_DIR}/retdec-authenticode-config.cmake" | ||
@ONLY | ||
) | ||
install( | ||
FILES "${CMAKE_CURRENT_LIST_DIR}/retdec-authenticode-config.cmake" | ||
DESTINATION ${RETDEC_INSTALL_CMAKE_DIR} | ||
) |
198 changes: 198 additions & 0 deletions
198
deps/authenticode-parser/include/authenticode-parser/authenticode.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,198 @@ | ||
/* Copyright (c) 2021 Avast Software | ||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy of | ||
this software and associated documentation files (the "Software"), to deal | ||
in the Software without restriction, including without limitation the rights to | ||
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies | ||
of the Software, and to permit persons to whom the Software is furnished to do | ||
so, subject to the following conditions: | ||
|
||
The above copyright notice and this permission notice shall be included in all | ||
copies or substantial portions of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
SOFTWARE. | ||
*/ | ||
|
||
#ifndef AUTHENTICODE_PARSER_AUTHENTICODE_H | ||
#define AUTHENTICODE_PARSER_AUTHENTICODE_H | ||
|
||
#ifdef __cplusplus | ||
extern "C" { | ||
#endif | ||
|
||
#include <stdint.h> | ||
#include <time.h> | ||
|
||
/* Signature is valid */ | ||
#define AUTHENTICODE_VFY_VALID 0 | ||
/* Parsing error (from OpenSSL functions) */ | ||
#define AUTHENTICODE_VFY_CANT_PARSE 1 | ||
/* Signers certificate is missing */ | ||
#define AUTHENTICODE_VFY_NO_SIGNER_CERT 2 | ||
/* No digest saved inside the signature */ | ||
#define AUTHENTICODE_VFY_DIGEST_MISSING 3 | ||
/* Non verification errors - allocations etc. */ | ||
#define AUTHENTICODE_VFY_INTERNAL_ERROR 4 | ||
/* SignerInfo part of PKCS7 is missing */ | ||
#define AUTHENTICODE_VFY_NO_SIGNER_INFO 5 | ||
/* PKCS7 doesn't have type of SignedData, can't proceed */ | ||
#define AUTHENTICODE_VFY_WRONG_PKCS7_TYPE 6 | ||
/* PKCS7 doesn't have corrent content, can't proceed */ | ||
#define AUTHENTICODE_VFY_BAD_CONTENT 7 | ||
/* Contained and calculated digest don't match */ | ||
#define AUTHENTICODE_VFY_INVALID 8 | ||
/* Signature hash and file hash doesn't match */ | ||
#define AUTHENTICODE_VFY_WRONG_FILE_DIGEST 9 | ||
/* Unknown algorithm, can't proceed with verification */ | ||
#define AUTHENTICODE_VFY_UNKNOWN_ALGORITHM 10 | ||
|
||
/* Countersignature is valid */ | ||
#define COUNTERSIGNATURE_VFY_VALID 0 | ||
/* Parsing error (from OpenSSL functions) */ | ||
#define COUNTERSIGNATURE_VFY_CANT_PARSE 1 | ||
/* Signers certificate is missing */ | ||
#define COUNTERSIGNATURE_VFY_NO_SIGNER_CERT 2 | ||
/* Unknown algorithm, can't proceed with verification */ | ||
#define COUNTERSIGNATURE_VFY_UNKNOWN_ALGORITHM 3 | ||
/* Verification failed, digest mismatch */ | ||
#define COUNTERSIGNATURE_VFY_INVALID 4 | ||
/* Failed to decrypt countersignature enc_digest for verification */ | ||
#define COUNTERSIGNATURE_VFY_CANT_DECRYPT_DIGEST 5 | ||
/* No digest saved inside the countersignature */ | ||
#define COUNTERSIGNATURE_VFY_DIGEST_MISSING 6 | ||
/* Message digest inside countersignature doesn't match signature it countersigns */ | ||
#define COUNTERSIGNATURE_VFY_DOESNT_MATCH_SIGNATURE 7 | ||
/* Non verification errors - allocations etc. */ | ||
#define COUNTERSIGNATURE_VFY_INTERNAL_ERROR 8 | ||
/* Time is missing in the timestamp signature */ | ||
#define COUNTERSIGNATURE_VFY_TIME_MISSING 9 | ||
|
||
typedef struct { | ||
uint8_t* data; | ||
int len; | ||
} ByteArray; | ||
|
||
typedef struct { /* Various X509 attributes parsed out in raw bytes*/ | ||
ByteArray country; | ||
ByteArray organization; | ||
ByteArray organizationalUnit; | ||
ByteArray nameQualifier; | ||
ByteArray state; | ||
ByteArray commonName; | ||
ByteArray serialNumber; | ||
ByteArray locality; | ||
ByteArray title; | ||
ByteArray surname; | ||
ByteArray givenName; | ||
ByteArray initials; | ||
ByteArray pseudonym; | ||
ByteArray generationQualifier; | ||
ByteArray emailAddress; | ||
} Attributes; | ||
|
||
typedef struct { | ||
long version; /* Raw version of X509 */ | ||
char* issuer; /* Oneline name of Issuer */ | ||
char* subject; /* Oneline name of Subject */ | ||
char* serial; /* Serial number in format 00:01:02:03:04... */ | ||
ByteArray sha1; /* SHA1 of the DER representation of the cert */ | ||
ByteArray sha256; /* SHA256 of the DER representation of the cert */ | ||
char* key_alg; /* Name of the key algorithm */ | ||
char* sig_alg; /* Name of the signature algorithm */ | ||
time_t not_before; /* NotBefore validity */ | ||
time_t not_after; /* NotAfter validity */ | ||
char* key; /* PEM encoded public key */ | ||
Attributes issuer_attrs; /* Parsed X509 Attributes of Issuer */ | ||
Attributes subject_attrs; /* Parsed X509 Attributes of Subject */ | ||
} Certificate; | ||
|
||
typedef struct { | ||
Certificate** certs; | ||
size_t count; | ||
} CertificateArray; | ||
|
||
typedef struct { | ||
int verify_flags; /* COUNTERISGNATURE_VFY_ flag */ | ||
time_t sign_time; /* Signing time of the timestamp countersignature */ | ||
char* digest_alg; /* Name of the digest algorithm used */ | ||
ByteArray digest; /* Stored message digest */ | ||
CertificateArray* chain; /* Certificate chain of the signer */ | ||
} Countersignature; | ||
|
||
typedef struct { | ||
Countersignature** counters; | ||
size_t count; | ||
} CountersignatureArray; | ||
|
||
typedef struct { /* Represents SignerInfo structure */ | ||
ByteArray digest; /* Message Digest of the SignerInfo */ | ||
char* digest_alg; /* name of the digest algorithm */ | ||
char* program_name; /* Program name stored in SpcOpusInfo structure of Authenticode */ | ||
CertificateArray* chain; /* Certificate chain of the signer */ | ||
} Signer; | ||
|
||
typedef struct { | ||
int verify_flags; /* AUTHENTICODE_VFY_ flag */ | ||
int version; /* Raw PKCS7 version */ | ||
char* digest_alg; /* name of the digest algorithm */ | ||
ByteArray digest; /* File Digest stored in the Signature */ | ||
ByteArray file_digest; /* Actual calculated file digest */ | ||
Signer* signer; /* SignerInfo information of the Authenticode */ | ||
CertificateArray* certs; /* All certificates in the Signature including the ones in timestamp | ||
countersignatures */ | ||
CountersignatureArray* countersigs; /* Array of timestamp countersignatures */ | ||
} Authenticode; | ||
|
||
typedef struct { | ||
Authenticode** signatures; | ||
size_t count; | ||
} AuthenticodeArray; | ||
|
||
/** | ||
* @brief Constructs AuthenticodeArray from PE file data. Authenticode can | ||
* contains nested Authenticode signatures as its unsigned attribute, | ||
* which can also contain nested signatures. For this reason the function returns | ||
* an Array of parsed Authenticode signatures. Any field of the parsed out | ||
* structures can be NULL, depending on the input data. | ||
* Verification result is stored in verify_flags with the first verification error. | ||
* | ||
* @param pe_data PE binary data | ||
* @param pe_len | ||
* @return AuthenticodeArray* | ||
*/ | ||
AuthenticodeArray* parse_authenticode(const uint8_t* pe_data, long pe_len); | ||
|
||
/** | ||
* @brief Constructs AuthenticodeArray from binary data containing Authenticode | ||
* signature. Authenticode can contains nested Authenticode signatures | ||
* as its unsigned attribute, which can also contain nested signatures. | ||
* For this reason the function return an Array of parsed Authenticode signatures. | ||
* Any field of the parsed out structures can be NULL, depending on the input data. | ||
* WARNING: in case of this interface, the file and signature digest comparison is | ||
* up to the library user, as there is no pe data to calculate file digest from. | ||
* Verification result is stored in verify_flags with the first verification error | ||
* | ||
* @param data Binary data containing Authenticode signature | ||
* @param len | ||
* @return AuthenticodeArray* | ||
*/ | ||
AuthenticodeArray* authenticode_new(const uint8_t* data, long len); | ||
|
||
/** | ||
* @brief Deallocates AuthenticodeArray and all it's allocated members | ||
* | ||
* @param auth | ||
*/ | ||
void authenticode_array_free(AuthenticodeArray* auth); | ||
|
||
#ifdef __cplusplus | ||
} | ||
#endif | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
|
||
if(NOT TARGET retdec::deps::authenticode) | ||
include(${CMAKE_CURRENT_LIST_DIR}/retdec-authenticode-targets.cmake) | ||
endif() |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just for future reference, 1) this should also be added conditionaly (I will fix it in
master
and send you a commit), 2) It would be easier for me to modify it if you used theavast/retdec
directly instead of your own fork, now that you have the rights. Maybe I could somehow modify your fork or this PR, but it complicates the things.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!, okay, I'll switch to
avast/retdec
repository for future