lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-05 20:55:46 +03:00
Code Activity

tests/pkd: Fix OpenSSH version check

Browse Source 
When running in FIPS mode, the OpenSSH version is not the first string
printed by "ssh -V".  This makes the parser to find the first occurrence
of the version ignoring anything printed before it.

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Anderson Toshiyuki Sasaki
2019-06-13 13:51:41 +02:00
committed by Andreas Schneider
parent 905b027f0f
commit 5568e5e520
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/pkd/pkd_util.c
View File

@@ -43,7 +43,8 @@ static int bin_exists(const char *binary) {
static int is_openssh_client_new_enough(void) { static int is_openssh_client_new_enough(void) {
int rc = -1; int rc = -1;
FILE *fp = NULL; FILE *fp = NULL;
char version[1024] = { 0 }; char version_buff[1024] = { 0 };
char *version;
static int version_ok = 0; static int version_ok = 0;
unsigned long int major = 0; unsigned long int major = 0;
@@ -59,10 +60,13 @@ static int is_openssh_client_new_enough(void) {
goto done; goto done;
} }
if (fgets(&version[0], sizeof(version), fp) == NULL) { do {
fprintf(stderr, "failed to get OpenSSH client version string\n"); if (fgets(&version_buff[0], sizeof(version_buff), fp) == NULL) {
goto errfgets; fprintf(stderr, "failed to get OpenSSH client version string\n");
} goto errfgets;
}
version = strstr(version_buff, "OpenSSH");
} while(version == NULL);
/* "OpenSSH_<major>.<minor><SP>..." */ /* "OpenSSH_<major>.<minor><SP>..." */
if (strlen(version) < 11) { if (strlen(version) < 11) {