Merge pull request #741 from JacobBarthelmeh/version

show version of wolfSSL linked to
pull/746/head
David Garske 2024-09-27 14:03:22 -07:00 committed by GitHub
commit 3cabbdb703
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 14 additions and 7 deletions

View File

@ -93,7 +93,8 @@ static void ShowUsage(char* appPath)
appName = "wolfssh";
}
printf("%s v%s\n", appName, LIBWOLFSSH_VERSION_STRING);
printf("%s v%s linked with wolfSSL %s\n", appName,
LIBWOLFSSH_VERSION_STRING, LIBWOLFSSL_VERSION_STRING);
printf("usage: %s [-E logfile] [-G] [-l login_name] [-N] [-p port] "
"[-V] destination\n",
appName);

View File

@ -181,7 +181,8 @@ static void ServiceDebugCb(enum wolfSSH_LogLevel level, const char* const msgStr
static void ShowUsage(void)
{
printf("wolfsshd %s\n", LIBWOLFSSH_VERSION_STRING);
printf("wolfSSHd %s linked with wolfSSL %s\n", LIBWOLFSSH_VERSION_STRING,
LIBWOLFSSL_VERSION_STRING);
printf(" -? display this help and exit\n");
printf(" -f <file name> Configuration file to use, default is "
"/etc/ssh/sshd_config\n");

View File

@ -82,7 +82,8 @@ static const char testString[] = "Hello, wolfSSH!";
static void ShowUsage(void)
{
printf("client %s\n", LIBWOLFSSH_VERSION_STRING);
printf("client %s linked with wolfSSL %s\n", LIBWOLFSSH_VERSION_STRING,
LIBWOLFSSL_VERSION_STRING);
printf(" -? display this help and exit\n");
printf(" -h <host> host to connect to, default %s\n", wolfSshIp);
printf(" -p <num> port to connect on, default %d\n", wolfSshPort);

View File

@ -2288,7 +2288,8 @@ static int SetDefaultSftpPath(WOLFSSH* ssh, const char* defaultSftpPath)
static void ShowUsage(void)
{
printf("echoserver %s\n", LIBWOLFSSH_VERSION_STRING);
printf("echoserver %s linked with wolfSSL %s\n", LIBWOLFSSH_VERSION_STRING,
LIBWOLFSSL_VERSION_STRING);
printf(" -? display this help and exit\n");
printf(" -1 exit after single (one) connection\n");
printf(" -e expect ECC public key from client\n");

View File

@ -79,7 +79,7 @@ static inline int max(int a, int b)
static void ShowUsage(void)
{
printf("portfwd %s\n"
printf("portfwd %s linked with wolfSSL %s\n"
" -? display this help and exit\n"
" -h <host> host to connect to, default %s\n"
" -p <num> port to connect on, default %u\n"
@ -90,6 +90,7 @@ static void ShowUsage(void)
" -T <host> host to forward to, default to host\n"
" -t <num> port to forward to (REQUIRED)\n",
LIBWOLFSSH_VERSION_STRING,
LIBWOLFSSL_VERSION_STRING,
wolfSshIp, wolfSshPort, defaultFwdFromHost);
}

View File

@ -51,7 +51,8 @@
#define USAGE_WIDE "12"
static void ShowUsage(void)
{
printf("wolfscp %s\n", LIBWOLFSSH_VERSION_STRING);
printf("wolfscp %s linked with wolfSSL %s\n", LIBWOLFSSH_VERSION_STRING,
LIBWOLFSSL_VERSION_STRING);
printf(" -%c %-" USAGE_WIDE "s %s\n", 'h', "",
"display this help and exit");
printf(" -%c %-" USAGE_WIDE "s %s, default %s\n", 'H', "<host>",

View File

@ -328,7 +328,8 @@ static void ShowCommands(void)
static void ShowUsage(void)
{
printf("wolfsftp %s\n", LIBWOLFSSH_VERSION_STRING);
printf("wolfsftp %s linked with wolfSSL %s\n", LIBWOLFSSH_VERSION_STRING,
LIBWOLFSSL_VERSION_STRING);
printf(" -? display this help and exit\n");
printf(" -h <host> host to connect to, default %s\n", wolfSshIp);
printf(" -p <num> port to connect on, default %d\n", wolfSshPort);