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

print osslsigncode version and usage

Browse Source
This commit is contained in:
olszomal
2020-04-02 12:18:37 +02:00
parent 26d35cee40
commit 1e4681980f
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
osslsigncode.c
View File

@ -4638,6 +4638,28 @@ static cmd_type_t get_command(char **argv)
#endif #endif
); );
help_for(argv[0], "all"); help_for(argv[0], "all");
} else if (!strcmp(argv[1], "-v") || !strcmp(argv[1], "--version")) {
printf(PACKAGE_STRING ", using:\n\t%s\n\t%s\n",
SSLeay_version(SSLEAY_VERSION),
#ifdef ENABLE_CURL
curl_version()
#else
"no libcurl available"
#endif /* ENABLE_CURL */
);
printf(
#ifdef WITH_GSF
"\tlibgsf %d.%d.%d\n",
libgsf_major_version,
libgsf_minor_version,
libgsf_micro_version
#else
"\tno libgsf available\n"
#endif /* WITH_GSF */
);
printf("\nPlease send bug-reports to "
PACKAGE_BUGREPORT
"\n");
} else if (!strcmp(argv[1], "sign")) } else if (!strcmp(argv[1], "sign"))
return CMD_SIGN; return CMD_SIGN;
else if (!strcmp(argv[1], "extract-signature")) else if (!strcmp(argv[1], "extract-signature"))
@ -4785,28 +4807,6 @@ static void main_configure(int argc, char **argv, cmd_type_t *cmd, GLOBAL_OPTION
} else if ((*cmd == CMD_VERIFY) && !strcmp(*argv, "-require-leaf-hash")) { } else if ((*cmd == CMD_VERIFY) && !strcmp(*argv, "-require-leaf-hash")) {
if (--argc < 1) usage(argv0, "all"); if (--argc < 1) usage(argv0, "all");
options->leafhash = (*++argv); options->leafhash = (*++argv);
} else if (!strcmp(*argv, "-v") || !strcmp(*argv, "--version")) {
printf(PACKAGE_STRING ", using:\n\t%s\n\t%s\n",
SSLeay_version(SSLEAY_VERSION),
#ifdef ENABLE_CURL
curl_version()
#else
"no libcurl available"
#endif /* ENABLE_CURL */
);
printf(
#ifdef WITH_GSF
"\tlibgsf %d.%d.%d\n",
libgsf_major_version,
libgsf_minor_version,
libgsf_micro_version
#else
"\tno libgsf available\n"
#endif /* WITH_GSF */
);
printf("\nPlease send bug-reports to "
PACKAGE_BUGREPORT
"\n");
} else if ((*cmd == CMD_ADD) && !strcmp(*argv, "--help")) { } else if ((*cmd == CMD_ADD) && !strcmp(*argv, "--help")) {
help_for(argv0, "add"); help_for(argv0, "add");
} else if ((*cmd == CMD_ATTACH) && !strcmp(*argv, "--help")) { } else if ((*cmd == CMD_ATTACH) && !strcmp(*argv, "--help")) {

2
tests/testall.sh
View File

@ -91,7 +91,7 @@ if grep -q "no libgsf available" "results.log"
# Timestamping support # Timestamping support
if grep -q "no libcurl available" "results.log" if grep -q "no libcurl available" "results.log"
then then
printf "%s\n" "configure --with_curl is required for timestamping support" printf "%s\n" "configure --with-curl is required for timestamping support"
fi fi
# Tests requirements # Tests requirements