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

Windows workaround for the #9 fix

Browse Source
This commit is contained in:
Michal Trojnara 2020-04-16 14:24:09 +02:00
parent 146b79bd04
commit 8cafe0a102
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osslsigncode.c
View File

@ -141,6 +141,12 @@ typedef unsigned char u_char;
#define PROVIDE_ASKPASS 1 #define PROVIDE_ASKPASS 1
#endif #endif
#ifdef _WIN32
#define FILE_CREATE_MODE "w+x"
#else
#define FILE_CREATE_MODE "w+bx"
#endif
/* MS Authenticode object ids */ /* MS Authenticode object ids */
#define SPC_INDIRECT_DATA_OBJID "1.3.6.1.4.1.311.2.1.4" #define SPC_INDIRECT_DATA_OBJID "1.3.6.1.4.1.311.2.1.4"
#define SPC_STATEMENT_TYPE_OBJID "1.3.6.1.4.1.311.2.1.11" #define SPC_STATEMENT_TYPE_OBJID "1.3.6.1.4.1.311.2.1.11"
@ -2703,7 +2709,7 @@ static int msi_extract_signature_to_file(GsfInfile *infile, char *outfile)
goto out; goto out;
} }
/* Create outdata file */ /* Create outdata file */
outdata = BIO_new_file(outfile, "w+bx"); outdata = BIO_new_file(outfile, FILE_CREATE_MODE);
if (outdata == NULL) { if (outdata == NULL) {
printf("Unable to create %s\n\n", outfile); printf("Unable to create %s\n\n", outfile);
ret = 1; ret = 1;
@ -2784,7 +2790,7 @@ static int msi_extract_file(GsfInfile *ole, GLOBAL_OPTIONS *options)
fprintf(stderr, "Unable to extract existing signature\n"); fprintf(stderr, "Unable to extract existing signature\n");
return 1; /* FAILED */ return 1; /* FAILED */
} }
outdata = BIO_new_file(options->outfile, "w+bx"); outdata = BIO_new_file(options->outfile, FILE_CREATE_MODE);
if (outdata == NULL) { if (outdata == NULL) {
fprintf(stderr, "Unable to create %s\n", options->outfile); fprintf(stderr, "Unable to create %s\n", options->outfile);
return 1; /* FAILED */ return 1; /* FAILED */
@ -4975,7 +4981,7 @@ int main(int argc, char **argv)
if ((type == FILE_TYPE_CAB || type == FILE_TYPE_PE) && (cmd != CMD_VERIFY)) { if ((type == FILE_TYPE_CAB || type == FILE_TYPE_PE) && (cmd != CMD_VERIFY)) {
/* Create outdata file */ /* Create outdata file */
outdata = BIO_new_file(options.outfile, "w+bx"); outdata = BIO_new_file(options.outfile, FILE_CREATE_MODE);
if (outdata == NULL) if (outdata == NULL)
DO_EXIT_1("Failed to create file: %s\n", options.outfile); DO_EXIT_1("Failed to create file: %s\n", options.outfile);
BIO_push(hash, outdata); BIO_push(hash, outdata);