mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4638 from akallabeth/known_hosts_comment_support

Browse Source 
Added comment support for known_hosts format.
This commit is contained in:
David Fort 2018-05-14 15:04:34 +02:00 committed by GitHub
commit c5b84db7e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libfreerdp/crypto/certificate.c
View File

@ -48,6 +48,29 @@ static const char certificate_legacy_hosts_file[] = "known_hosts";
static BOOL certificate_split_line(char* line, char** host, UINT16* port,
char**subject, char**issuer,
char** fingerprint);
static BOOL certificate_line_is_comment(const char* line, size_t length)
{
while(length > 0)
{
switch(*line)
{
case ' ':
case '\t':
line++;
length--;
break;
case '#':
return TRUE;
default:
return FALSE;
}
}
if (length < 1)
return TRUE;
return FALSE;
}
BOOL certificate_store_init(rdpCertificateStore* certificate_store)
{
@ -303,7 +326,10 @@ static int certificate_data_match_raw(rdpCertificateStore* certificate_store,
if (length > 0)
{
if (!certificate_split_line(pline, &hostname, &port,
if (certificate_line_is_comment(pline, length))
{
}
else if (!certificate_split_line(pline, &hostname, &port,
&subject, &issuer, &fingerprint))
WLog_WARN(TAG, "Invalid %s entry %s!",
certificate_known_hosts_file, pline);
@ -446,7 +472,10 @@ BOOL certificate_data_replace(rdpCertificateStore* certificate_store,
char* issuer = NULL;
char* tdata;
if (!certificate_split_line(pline, &hostname, &port, &subject, &issuer, &fingerprint))
if (certificate_line_is_comment(pline, length))
{
}
else if (!certificate_split_line(pline, &hostname, &port, &subject, &issuer, &fingerprint))
WLog_WARN(TAG, "Skipping invalid %s entry %s!",
certificate_known_hosts_file, pline);
else

6
libfreerdp/crypto/test/TestKnownHosts.c
View File

@ -29,8 +29,10 @@ static int prepare(const char* currentFileV2, const char* legacyFileV2, const ch
"legacyurl aa:bb:cc:dd\n"
};
char* hosts[] = {
"someurl 3389 ff:11:22:dd subject issuer\r\n",
"otherurl\t3389\taa:bb:cc:dd\tsubject2\tissuer2\r",
"#somecomment\r\n"
"someurl 3389 ff:11:22:dd subject issuer\r\n"
" \t#anothercomment\r\n"
"otherurl\t3389\taa:bb:cc:dd\tsubject2\tissuer2\r"
};
FILE* fl = NULL;
FILE* fc = NULL;