nhyatt/osslsigncode
1
0
Fork 0
mirror of https://github.com/mtrojnar/osslsigncode.git synced 2025-04-05 09:08:04 -05:00
Code Issues Projects Releases Wiki Activity

Fix SpcPageHashLink generation

Browse Source 
The orginal code handles ASN1_SET improperly, which results in INVALID
page hash SpcLink.
This commit fixes the bug. osslsigncode can now generate valid
signatures with -ph (page hash) option.
This commit is contained in:
Jemmy Wang 2019-06-19 20:46:54 +08:00 committed by Michał Trojnara
parent 0bea1ac8f6
commit c740b097df
1 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
osslsigncode.c
View File

@ -917,10 +917,6 @@ static const unsigned char classid_page_hash[] = {
0xAE, 0x05, 0xA2, 0x17, 0xDA, 0x8E, 0x60, 0xD6 0xAE, 0x05, 0xA2, 0x17, 0xDA, 0x8E, 0x60, 0xD6
}; };
DEFINE_STACK_OF(ASN1_OCTET_STRING)
DEFINE_STACK_OF(SpcAttributeTypeAndOptionalValue)
static unsigned char *calc_page_hash(char *indata, size_t peheader, static unsigned char *calc_page_hash(char *indata, size_t peheader,
int pe32plus, size_t sigpos, int phtype, size_t *rphlen) int pe32plus, size_t sigpos, int phtype, size_t *rphlen)
{ {
@ -977,26 +973,32 @@ static unsigned char *calc_page_hash(char *indata, size_t peheader,
static SpcLink *get_page_hash_link(int phtype, char *indata, static SpcLink *get_page_hash_link(int phtype, char *indata,
size_t peheader, int pe32plus, size_t sigpos) size_t peheader, int pe32plus, size_t sigpos)
{ {
unsigned char *p, *tmp;
size_t l;
size_t phlen; size_t phlen;
unsigned char *ph = calc_page_hash(indata, peheader, pe32plus, sigpos, phtype, &phlen); unsigned char *ph = calc_page_hash(indata, peheader, pe32plus, sigpos, phtype, &phlen);
if (!ph) { if (!ph) {
fprintf(stderr, "Failed to calculate page hash\n"); fprintf(stderr, "Failed to calculate page hash\n");
exit(-1); exit(-1);
} }
char hexbuf[EVP_MAX_MD_SIZE*2+1];
tohex(ph, hexbuf, (phlen < 32) ? phlen : 32);
printf("Calculated page hash : %s ...\n", hexbuf);
ASN1_OCTET_STRING *ostr = ASN1_OCTET_STRING_new(); ASN1_TYPE *tostr = ASN1_TYPE_new();
ASN1_OCTET_STRING_set(ostr, ph, phlen); tostr->type = V_ASN1_OCTET_STRING;
tostr->value.octet_string = ASN1_OCTET_STRING_new();
ASN1_OCTET_STRING_set(tostr->value.octet_string, ph, phlen);
OPENSSL_free(ph); OPENSSL_free(ph);
STACK_OF(ASN1_OCTET_STRING) *oset = sk_ASN1_OCTET_STRING_new_null(); STACK_OF(ASN1_TYPE) *oset = sk_ASN1_TYPE_new_null();
sk_ASN1_OCTET_STRING_push(oset, ostr); sk_ASN1_TYPE_push(oset, tostr);
unsigned char *p, *tmp; l = i2d_ASN1_SET_ANY(oset, NULL);
size_t l;
l = i2d_ASN1_SET_ANY((ASN1_SEQUENCE_ANY *)oset, NULL);
tmp = p = OPENSSL_malloc(l); tmp = p = OPENSSL_malloc(l);
i2d_ASN1_SET_ANY((ASN1_SEQUENCE_ANY *)oset, &tmp); i2d_ASN1_SET_ANY(oset, &tmp);
ASN1_OCTET_STRING_free(ostr); ASN1_TYPE_free(tostr);
sk_ASN1_OCTET_STRING_free(oset); sk_ASN1_TYPE_free(oset);
SpcAttributeTypeAndOptionalValue *aval = SpcAttributeTypeAndOptionalValue_new(); SpcAttributeTypeAndOptionalValue *aval = SpcAttributeTypeAndOptionalValue_new();
aval->type = OBJ_txt2obj((phtype == NID_sha1) ? SPC_PE_IMAGE_PAGE_HASHES_V1 : SPC_PE_IMAGE_PAGE_HASHES_V2, 1); aval->type = OBJ_txt2obj((phtype == NID_sha1) ? SPC_PE_IMAGE_PAGE_HASHES_V1 : SPC_PE_IMAGE_PAGE_HASHES_V2, 1);
@ -1005,14 +1007,25 @@ static SpcLink *get_page_hash_link(int phtype, char *indata,
aval->value->value.set = ASN1_STRING_new(); aval->value->value.set = ASN1_STRING_new();
ASN1_STRING_set(aval->value->value.set, p, l); ASN1_STRING_set(aval->value->value.set, p, l);
OPENSSL_free(p); OPENSSL_free(p);
l = i2d_SpcAttributeTypeAndOptionalValue(aval, NULL);
STACK_OF(SpcAttributeTypeAndOptionalValue) *aset = sk_SpcAttributeTypeAndOptionalValue_new_null();
sk_SpcAttributeTypeAndOptionalValue_push(aset, aval);
l = i2d_ASN1_SET_ANY((ASN1_SEQUENCE_ANY *)aset, NULL);
tmp = p = OPENSSL_malloc(l); tmp = p = OPENSSL_malloc(l);
l = i2d_ASN1_SET_ANY((ASN1_SEQUENCE_ANY *)aset, &tmp); i2d_SpcAttributeTypeAndOptionalValue(aval, &tmp);
sk_SpcAttributeTypeAndOptionalValue_free(aset);
SpcAttributeTypeAndOptionalValue_free(aval); SpcAttributeTypeAndOptionalValue_free(aval);
ASN1_TYPE *taval = ASN1_TYPE_new();
taval->type = V_ASN1_SEQUENCE;
taval->value.sequence = ASN1_STRING_new();
ASN1_STRING_set(taval->value.sequence, p, l);
OPENSSL_free(p);
STACK_OF(ASN1_TYPE) *aset = sk_ASN1_TYPE_new_null();
sk_ASN1_TYPE_push(aset, taval);
l = i2d_ASN1_SET_ANY(aset, NULL);
tmp = p = OPENSSL_malloc(l);
l = i2d_ASN1_SET_ANY(aset, &tmp);
SpcAttributeTypeAndOptionalValue_free(aval);
ASN1_TYPE_free(taval);
sk_ASN1_TYPE_free(aset);
SpcSerializedObject *so = SpcSerializedObject_new(); SpcSerializedObject *so = SpcSerializedObject_new();
ASN1_OCTET_STRING_set(so->classId, classid_page_hash, sizeof(classid_page_hash)); ASN1_OCTET_STRING_set(so->classId, classid_page_hash, sizeof(classid_page_hash));