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

Add the MSI-specific flag '-add-msi-se' to the 'sign' command for explicitly adding a MsiDigitalSignatureEx section.

Browse Source
This commit is contained in:
Mikkel Krautz 2014-07-10 23:00:19 +02:00
parent 9fa7e17770
commit ec3d58ad4b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osslsigncode.c
View File

@ -765,7 +765,9 @@ static void usage(const char *argv0)
"\t\t[ -t <timestampurl> [ -t ... ] [ -p <proxy> ]]\n" "\t\t[ -t <timestampurl> [ -t ... ] [ -p <proxy> ]]\n"
"\t\t[ -ts <timestampurl> [ -ts ... ] [ -p <proxy> ]]\n" "\t\t[ -ts <timestampurl> [ -ts ... ] [ -p <proxy> ]]\n"
#endif #endif
"\t\t[ -nest ]\n" "\t\t[ -nest ]\n\n"
"\t\tMSI specific:\n"
"\t\t[ -add-msi-dse ]\n\n"
"\t\t[ -in ] <infile> [-out ] <outfile>\n\n" "\t\t[ -in ] <infile> [-out ] <outfile>\n\n"
"\textract-signature [ -in ] <infile> [ -out ] <outfile>\n\n" "\textract-signature [ -in ] <infile> [ -out ] <outfile>\n\n"
"\tremove-signature [ -in ] <infile> [ -out ] <outfile>\n\n" "\tremove-signature [ -in ] <infile> [ -out ] <outfile>\n\n"
@ -2252,6 +2254,7 @@ int main(int argc, char **argv)
char *turl[MAX_TS_SERVERS], *proxy = NULL, *tsurl[MAX_TS_SERVERS]; char *turl[MAX_TS_SERVERS], *proxy = NULL, *tsurl[MAX_TS_SERVERS];
#endif #endif
int nest = 0; int nest = 0;
int add_msi_dse = 0;
int nturl = 0, ntsurl = 0; int nturl = 0, ntsurl = 0;
u_char *p = NULL; u_char *p = NULL;
int ret = 0, i, len = 0, jp = -1, pe32plus = 0, comm = 0, pagehash = 0; int ret = 0, i, len = 0, jp = -1, pe32plus = 0, comm = 0, pagehash = 0;
@ -2390,6 +2393,8 @@ int main(int argc, char **argv)
#endif #endif
} else if ((cmd == CMD_SIGN) && !strcmp(*argv, "-nest")) { } else if ((cmd == CMD_SIGN) && !strcmp(*argv, "-nest")) {
nest = 1; nest = 1;
} else if ((cmd == CMD_SIGN) && !strcmp(*argv, "-add-msi-dse")) {
add_msi_dse = 1;
} else if ((cmd == CMD_VERIFY) && !strcmp(*argv, "-require-leaf-hash")) { } else if ((cmd == CMD_VERIFY) && !strcmp(*argv, "-require-leaf-hash")) {
if (--argc < 1) usage(argv0); if (--argc < 1) usage(argv0);
leafhash = (*++argv); leafhash = (*++argv);
@ -2665,10 +2670,7 @@ int main(int argc, char **argv)
* section, and its content must be the output of the pre-hash * section, and its content must be the output of the pre-hash
* ("metadata") hash. * ("metadata") hash.
*/ */
/* if (add_msi_dse) {
* Disabled for now. Does not work well with nested sigantures.
*/
if (0) {
BIO *prehash = BIO_new(BIO_f_md()); BIO *prehash = BIO_new(BIO_f_md());
BIO_set_md(prehash, md); BIO_set_md(prehash, md);
BIO_push(prehash, BIO_new(BIO_s_null())); BIO_push(prehash, BIO_new(BIO_s_null()));