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

MSI: add support for remove-signature.

Browse Source
This commit is contained in:
Mikkel Krautz 2013-04-30 23:08:39 +02:00 committed by Per Allansson
parent 31facc400d
commit 9904aea27f
1 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
osslsigncode.c
View File

@ -1195,7 +1195,8 @@ static gboolean msi_handle_dir(GsfInfile *infile, GsfOutfile *outole, BIO *hash)
GSList *sorted = NULL; GSList *sorted = NULL;
gsf_infile_msole_get_class_id(GSF_INFILE_MSOLE(infile), classid); gsf_infile_msole_get_class_id(GSF_INFILE_MSOLE(infile), classid);
gsf_outfile_msole_set_class_id(GSF_OUTFILE_MSOLE(outole), classid); if (outole != NULL)
gsf_outfile_msole_set_class_id(GSF_OUTFILE_MSOLE(outole), classid);
sorted = msi_sorted_infile_children(infile); sorted = msi_sorted_infile_children(infile);
@ -1206,7 +1207,9 @@ static gboolean msi_handle_dir(GsfInfile *infile, GsfOutfile *outole, BIO *hash)
continue; continue;
gboolean is_dir = GSF_IS_INFILE(child) && gsf_infile_num_children(GSF_INFILE(child)) > 0; gboolean is_dir = GSF_IS_INFILE(child) && gsf_infile_num_children(GSF_INFILE(child)) > 0;
GsfOutput *outchild = gsf_outfile_new_child(outole, name, is_dir); GsfOutput *outchild = NULL;
if (outole != NULL)
outchild = gsf_outfile_new_child(outole, name, is_dir);
if (is_dir) { if (is_dir) {
if (!msi_handle_dir(GSF_INFILE(child), GSF_OUTFILE(outchild), hash)) { if (!msi_handle_dir(GSF_INFILE(child), GSF_OUTFILE(outchild), hash)) {
return FALSE; return FALSE;
@ -1216,14 +1219,16 @@ static gboolean msi_handle_dir(GsfInfile *infile, GsfOutfile *outole, BIO *hash)
gsf_off_t size = MIN(gsf_input_remaining(child), 4096); gsf_off_t size = MIN(gsf_input_remaining(child), 4096);
guint8 const *data = gsf_input_read(child, size, NULL); guint8 const *data = gsf_input_read(child, size, NULL);
BIO_write(hash, data, size); BIO_write(hash, data, size);
if (!gsf_output_write(outchild, size, data)) { if (outchild != NULL && !gsf_output_write(outchild, size, data)) {
return FALSE; return FALSE;
} }
} }
} }
gsf_output_close(outchild); if (outchild != NULL) {
g_object_unref(outchild); gsf_output_close(outchild);
g_object_unref(outchild);
}
} }
BIO_write(hash, classid, sizeof(classid)); BIO_write(hash, classid, sizeof(classid));
@ -1852,8 +1857,8 @@ int main(int argc, char **argv)
DO_EXIT_1("Unrecognized file type: %s\n", infile); DO_EXIT_1("Unrecognized file type: %s\n", infile);
} }
if (cmd != CMD_SIGN && type != FILE_TYPE_PE) if (cmd != CMD_SIGN && !(type == FILE_TYPE_PE || type == FILE_TYPE_MSI))
DO_EXIT_1("Command is not supported for non-PE files: %s\n", infile); DO_EXIT_1("Command is not supported for non-PE/non-MSI files: %s\n", infile);
hash = BIO_new(BIO_f_md()); hash = BIO_new(BIO_f_md());
BIO_set_md(hash, md); BIO_set_md(hash, md);
@ -1882,12 +1887,14 @@ int main(int argc, char **argv)
if (!src) if (!src)
DO_EXIT_1("Error opening file %s", infile); DO_EXIT_1("Error opening file %s", infile);
sink = gsf_output_stdio_new(outfile, NULL); if (cmd == CMD_SIGN || cmd == CMD_REMOVE) {
if (!sink) sink = gsf_output_stdio_new(outfile, NULL);
DO_EXIT_1("Error opening output file %s", outfile); if (!sink)
DO_EXIT_1("Error opening output file %s", outfile);
ole = gsf_infile_msole_new(src, NULL); ole = gsf_infile_msole_new(src, NULL);
outole = gsf_outfile_msole_new(sink); outole = gsf_outfile_msole_new(sink);
}
#ifndef NO_MSI_DIGITALSIGNATUREEX #ifndef NO_MSI_DIGITALSIGNATUREEX
/* /*
@ -1948,6 +1955,11 @@ int main(int argc, char **argv)
if (!msi_handle_dir(ole, outole, hash)) { if (!msi_handle_dir(ole, outole, hash)) {
DO_EXIT_0("unable to msi_handle_dir()\n"); DO_EXIT_0("unable to msi_handle_dir()\n");
} }
if (cmd == CMD_REMOVE) {
gsf_output_close(GSF_OUTPUT(outole));
g_object_unref(sink);
}
#else #else
DO_EXIT_1("libgsf is not available, msi support is disabled: %s\n", infile); DO_EXIT_1("libgsf is not available, msi support is disabled: %s\n", infile);
#endif #endif
@ -2260,21 +2272,24 @@ int main(int argc, char **argv)
} }
#ifdef WITH_GSF #ifdef WITH_GSF
} else if (type == FILE_TYPE_MSI) { } else if (type == FILE_TYPE_MSI) {
GsfOutput *child = gsf_outfile_new_child(outole, "\05DigitalSignature", FALSE); /* Only output signatures if we're signing. */
if (!gsf_output_write(child, len, p)) if (cmd == CMD_SIGN) {
DO_EXIT_1("Failed to write MSI 'DigitalSignature' signature to %s", infile); GsfOutput *child = gsf_outfile_new_child(outole, "\05DigitalSignature", FALSE);
gsf_output_close(child); if (!gsf_output_write(child, len, p))
DO_EXIT_1("Failed to write MSI 'DigitalSignature' signature to %s", infile);
if (p_msiex != NULL) {
child = gsf_outfile_new_child(outole, "\05MsiDigitalSignatureEx", FALSE);
if (!gsf_output_write(child, len_msiex, p_msiex)) {
DO_EXIT_1("Failed to write MSI 'MsiDigitalSignatureEx' signature to %s", infile);
}
gsf_output_close(child); gsf_output_close(child);
}
gsf_output_close(GSF_OUTPUT(outole)); if (p_msiex != NULL) {
g_object_unref(sink); child = gsf_outfile_new_child(outole, "\05MsiDigitalSignatureEx", FALSE);
if (!gsf_output_write(child, len_msiex, p_msiex)) {
DO_EXIT_1("Failed to write MSI 'MsiDigitalSignatureEx' signature to %s", infile);
}
gsf_output_close(child);
}
gsf_output_close(GSF_OUTPUT(outole));
g_object_unref(sink);
}
#endif #endif
} }