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

nturl/ntsurl GLOBAL_OPTIONS related to turl/tsurl

Browse Source
This commit is contained in:
olszomal 2020-03-16 14:41:21 +01:00
parent 6e46f71e69
commit f93bdc0f98
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
osslsigncode.c
View File

@ -207,7 +207,9 @@ typedef struct {
time_t signing_time; time_t signing_time;
#ifdef ENABLE_CURL #ifdef ENABLE_CURL
char *turl[MAX_TS_SERVERS]; char *turl[MAX_TS_SERVERS];
int nturl;
char *tsurl[MAX_TS_SERVERS]; char *tsurl[MAX_TS_SERVERS];
int ntsurl;
char *proxy; char *proxy;
int noverifypeer; int noverifypeer;
#endif #endif
@ -804,7 +806,7 @@ static int add_timestamp(PKCS7 *sig, char *url, char *proxy, int rfc3161,
if (c) { if (c) {
BIO_free_all(bin); BIO_free_all(bin);
if (verbose) if (verbose)
fprintf(stderr, "CURL failure: %s\n", curl_easy_strerror(c)); fprintf(stderr, "CURL failure: %s %s\n", curl_easy_strerror(c), url);
} else { } else {
(void)BIO_flush(bin); (void)BIO_flush(bin);
@ -905,23 +907,23 @@ static int add_timestamp(PKCS7 *sig, char *url, char *proxy, int rfc3161,
return (int)c; return (int)c;
} }
static int add_timestamp_authenticode(PKCS7 *sig, int nurls, GLOBAL_OPTIONS *options) static int add_timestamp_authenticode(PKCS7 *sig, GLOBAL_OPTIONS *options)
{ {
int i; int i;
for (i=0; i<nurls; i++) { for (i=0; i<options->nturl; i++) {
int res = add_timestamp(sig, options->turl[i], options->proxy, 0, NULL, int res = add_timestamp(sig, options->turl[i], options->proxy, 0, NULL,
options->verbose || nurls == 1, options->noverifypeer); options->verbose || options->nturl == 1, options->noverifypeer);
if (!res) return 0; if (!res) return 0;
} }
return -1; return -1;
} }
static int add_timestamp_rfc3161(PKCS7 *sig, int nurls, GLOBAL_OPTIONS *options) static int add_timestamp_rfc3161(PKCS7 *sig, GLOBAL_OPTIONS *options)
{ {
int i; int i;
for (i=0; i<nurls; i++) { for (i=0; i<options->ntsurl; i++) {
int res = add_timestamp(sig, options->tsurl[i], options->proxy, 1, options->md, int res = add_timestamp(sig, options->tsurl[i], options->proxy, 1, options->md,
options->verbose || nurls == 1, options->noverifypeer); options->verbose || options->ntsurl == 1, options->noverifypeer);
if (!res) return 0; if (!res) return 0;
} }
return -1; return -1;
@ -4263,8 +4265,7 @@ static cmd_type_t get_command(char **argv)
return CMD_SIGN; return CMD_SIGN;
} }
static void main_configure(int argc, char **argv, cmd_type_t *cmd, static void main_configure(int argc, char **argv, cmd_type_t *cmd, GLOBAL_OPTIONS *options)
GLOBAL_OPTIONS *options, int *nturl, int *ntsurl)
{ {
int i; int i;
char *failarg = NULL; char *failarg = NULL;
@ -4364,12 +4365,10 @@ static void main_configure(int argc, char **argv, cmd_type_t *cmd,
#ifdef ENABLE_CURL #ifdef ENABLE_CURL
} else if ((*cmd == CMD_SIGN || *cmd == CMD_ADD) && !strcmp(*argv, "-t")) { } else if ((*cmd == CMD_SIGN || *cmd == CMD_ADD) && !strcmp(*argv, "-t")) {
if (--argc < 1) usage(argv0, "all"); if (--argc < 1) usage(argv0, "all");
options->turl[*nturl] = *(++argv); options->turl[options->nturl++] = *(++argv);
*nturl += 1;
} else if ((*cmd == CMD_SIGN || *cmd == CMD_ADD) && !strcmp(*argv, "-ts")) { } else if ((*cmd == CMD_SIGN || *cmd == CMD_ADD) && !strcmp(*argv, "-ts")) {
if (--argc < 1) usage(argv0, "all"); if (--argc < 1) usage(argv0, "all");
options->tsurl[*ntsurl] = *(++argv); options->tsurl[options->ntsurl++] = *(++argv);
*ntsurl += 1;
} else if ((*cmd == CMD_SIGN || *cmd == CMD_ADD) && !strcmp(*argv, "-p")) { } else if ((*cmd == CMD_SIGN || *cmd == CMD_ADD) && !strcmp(*argv, "-p")) {
if (--argc < 1) usage(argv0, "all"); if (--argc < 1) usage(argv0, "all");
options->proxy = *(++argv); options->proxy = *(++argv);
@ -4469,7 +4468,7 @@ static void main_configure(int argc, char **argv, cmd_type_t *cmd,
} }
} }
if (argc > 0 || (*nturl && *ntsurl) || !options->infile || if (argc > 0 || (options->nturl && options->ntsurl) || !options->infile ||
(*cmd != CMD_VERIFY && !options->outfile) || (*cmd != CMD_VERIFY && !options->outfile) ||
(*cmd == CMD_SIGN && !((options->certfile && options->keyfile) || (*cmd == CMD_SIGN && !((options->certfile && options->keyfile) ||
options->pkcs12file || options->p11module))) { options->pkcs12file || options->p11module))) {
@ -4493,7 +4492,6 @@ int main(int argc, char **argv)
static char buf[64*1024]; static char buf[64*1024];
char *indata, *outdataverify, *pvkfile = NULL; char *indata, *outdataverify, *pvkfile = NULL;
int nturl = 0, ntsurl = 0;
u_char *p = NULL; u_char *p = NULL;
int ret = 0, len = 0; int ret = 0, len = 0;
size_t padlen = 0; size_t padlen = 0;
@ -4523,7 +4521,7 @@ int main(int argc, char **argv)
!OBJ_create(SPC_NESTED_SIGNATURE_OBJID, NULL, NULL)) !OBJ_create(SPC_NESTED_SIGNATURE_OBJID, NULL, NULL))
DO_EXIT_0("Failed to add objects\n"); DO_EXIT_0("Failed to add objects\n");
main_configure(argc, argv, &cmd, &options, &nturl, &ntsurl); main_configure(argc, argv, &cmd, &options);
if (!read_password(&options)) if (!read_password(&options))
goto err_cleanup; goto err_cleanup;
@ -4737,9 +4735,9 @@ add_only:
#ifdef ENABLE_CURL #ifdef ENABLE_CURL
/* add counter-signature/timestamp */ /* add counter-signature/timestamp */
if (nturl && add_timestamp_authenticode(sig, nturl, &options)) if (options.nturl && add_timestamp_authenticode(sig, &options))
DO_EXIT_0("Authenticode timestamping failed\n"); DO_EXIT_0("Authenticode timestamping failed\n");
if (ntsurl && add_timestamp_rfc3161(sig, ntsurl, &options)) if (options.ntsurl && add_timestamp_rfc3161(sig, &options))
DO_EXIT_0("RFC 3161 timestamping failed\n"); DO_EXIT_0("RFC 3161 timestamping failed\n");
#endif #endif