nhyatt/osslsigncode
1
0
Fork 0
mirror of https://github.com/mtrojnar/osslsigncode.git synced 2025-05-21 02:44:28 -05:00
Code Issues Projects Releases Wiki Activity

fixed merge fail

Browse Source
This commit is contained in:
Per Allansson 2013-03-07 07:36:27 +01:00
parent 2d8764f8f9
commit b34b3b67e7
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osslsigncode.c
View File

@ -994,18 +994,11 @@ int main(int argc, char **argv)
#endif #endif
} }
<<<<<<< HEAD if (type == FILE_TYPE_CAB || type == FILE_TYPE_PE) {
/* Create outdata file */ /* Create outdata file */
outdata = BIO_new_file(outfile, "w+b"); outdata = BIO_new_file(outfile, "w+b");
if (outdata == NULL) if (outdata == NULL)
DO_EXIT_1("Failed to create file: %s\n", outfile); DO_EXIT_1("Failed to create file: %s\n", outfile);
=======
if (type == FILE_TYPE_CAB || type == FILE_TYPE_PE) {
/* Create outdata file */
outdata = BIO_new_file(outfile, "wb");
if (outdata == NULL)
DO_EXIT_1("Failed to create file: %s\n", outfile);
>>>>>>> elmarco/master
BIO_push(hash, outdata); BIO_push(hash, outdata);
} }
@ -1256,12 +1249,8 @@ int main(int argc, char **argv)
BIO_write(outdata, buf, 4); BIO_write(outdata, buf, 4);
PUT_UINT32_LE(len+8+padlen, buf); PUT_UINT32_LE(len+8+padlen, buf);
BIO_write(outdata, buf, 4); BIO_write(outdata, buf, 4);
<<<<<<< HEAD
recalc_pe_checksum(outdata, peheader); recalc_pe_checksum(outdata, peheader);
} else {
=======
} else if (type == FILE_TYPE_CAB) { } else if (type == FILE_TYPE_CAB) {
>>>>>>> elmarco/master
(void)BIO_seek(outdata, 0x30); (void)BIO_seek(outdata, 0x30);
PUT_UINT32_LE(len+padlen, buf); PUT_UINT32_LE(len+padlen, buf);
BIO_write(outdata, buf, 4); BIO_write(outdata, buf, 4);