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

fixed Windows / Cygwin / MinGW compile

Browse Source
This commit is contained in:
Per Allansson 2015-08-31 23:03:58 +02:00
parent 4ef0e54438
commit e72a1937d1
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
osslsigncode.c
View File

@ -1,7 +1,7 @@
/* /*
OpenSSL based Authenticode signing for PE/MSI/Java CAB files. OpenSSL based Authenticode signing for PE/MSI/Java CAB files.
Copyright (C) 2005-2014 Per Allansson <pallansson@gmail.com> Copyright (C) 2005-2015 Per Allansson <pallansson@gmail.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
@ -61,23 +61,29 @@ static const char *rcsid = "$Id: osslsigncode.c,v 1.7.1 2014/07/11 14:14:14 mfiv
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include "config.h"
#endif #endif
#ifdef HAVE_WINDOWS_H #ifdef HAVE_WINDOWS_H
#define NOCRYPT #define NOCRYPT
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
typedef unsigned char u_char;
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifndef _WIN32
#include <unistd.h> #include <unistd.h>
#endif
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <ctype.h> #include <ctype.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#ifndef _WIN32
#ifdef HAVE_SYS_MMAN_H #ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h> #include <sys/mman.h>
#endif #endif
@ -85,6 +91,7 @@ static const char *rcsid = "$Id: osslsigncode.c,v 1.7.1 2014/07/11 14:14:14 mfiv
#ifdef HAVE_TERMIOS_H #ifdef HAVE_TERMIOS_H
#include <termios.h> #include <termios.h>
#endif #endif
#endif
#ifdef WITH_GSF #ifdef WITH_GSF
#include <gsf/gsf-infile-msole.h> #include <gsf/gsf-infile-msole.h>
@ -110,6 +117,11 @@ static const char *rcsid = "$Id: osslsigncode.c,v 1.7.1 2014/07/11 14:14:14 mfiv
#endif #endif
#ifdef ENABLE_CURL #ifdef ENABLE_CURL
#ifdef __CYGWIN__
#ifndef SOCKET
#define SOCKET UINT_PTR
#endif
#endif
#include <curl/curl.h> #include <curl/curl.h>
#define MAX_TS_SERVERS 256 #define MAX_TS_SERVERS 256
@ -2289,8 +2301,15 @@ static STACK_OF(X509) *PEM_read_certs(BIO *bin, char *certpass)
static off_t get_file_size(const char *infile) static off_t get_file_size(const char *infile)
{ {
int ret;
#ifdef _WIN32
struct _stat st;
ret = _stat(infile, &st);
#else
struct stat st; struct stat st;
if (stat(infile, &st)) ret = stat(infile, &st);
#endif
if (ret)
{ {
fprintf(stderr, "Failed to open file: %s\n", infile); fprintf(stderr, "Failed to open file: %s\n", infile);
return 0; return 0;
@ -2631,7 +2650,7 @@ int main(int argc, char **argv)
int passfd = open(readpass, O_RDONLY); int passfd = open(readpass, O_RDONLY);
if (passfd < 0) if (passfd < 0)
DO_EXIT_1("Failed to open password file: %s\n", readpass); DO_EXIT_1("Failed to open password file: %s\n", readpass);
ssize_t passlen = read(passfd, passbuf, sizeof(passbuf)-1); int passlen = read(passfd, passbuf, sizeof(passbuf)-1);
close(passfd); close(passfd);
if (passlen <= 0) if (passlen <= 0)
DO_EXIT_1("Failed to read password from file: %s\n", readpass); DO_EXIT_1("Failed to read password from file: %s\n", readpass);
@ -3100,7 +3119,7 @@ int main(int argc, char **argv)
} }
else if (type == FILE_TYPE_MSI) { else if (type == FILE_TYPE_MSI) {
#ifdef WITH_GSF #ifdef WITH_GSF
const unsigned char *p = insigdata; const unsigned char *p = (unsigned char*)insigdata;
sig = d2i_PKCS7(NULL, &p, sigfilesize); sig = d2i_PKCS7(NULL, &p, sigfilesize);
#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);