maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-249: Correct prototype of certificate verification callback. If accepting the certificate, request that FreeRDP not store it.

Browse Source
This commit is contained in:
Michael Jumper 2019-09-22 12:12:26 -07:00
parent 82664b4e6b
commit 3b560044bc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/protocols/rdp/rdp.c
View File

@ -378,8 +378,9 @@ static BOOL rdp_freerdp_authenticate(freerdp* instance, char** username,
* @return * @return
* TRUE if the certificate passes verification, FALSE otherwise. * TRUE if the certificate passes verification, FALSE otherwise.
*/ */
static BOOL rdp_freerdp_verify_certificate(freerdp* instance, char* subject, static DWORD rdp_freerdp_verify_certificate(freerdp* instance,
char* issuer, char* fingerprint) { const char* common_name, const char* subject, const char* issuer,
const char* fingerprint, BOOL host_mismatch) {
rdpContext* context = instance->context; rdpContext* context = instance->context;
guac_client* client = ((rdp_freerdp_context*) context)->client; guac_client* client = ((rdp_freerdp_context*) context)->client;
@ -389,11 +390,11 @@ static BOOL rdp_freerdp_verify_certificate(freerdp* instance, char* subject,
/* Bypass validation if ignore_certificate given */ /* Bypass validation if ignore_certificate given */
if (rdp_client->settings->ignore_certificate) { if (rdp_client->settings->ignore_certificate) {
guac_client_log(client, GUAC_LOG_INFO, "Certificate validation bypassed"); guac_client_log(client, GUAC_LOG_INFO, "Certificate validation bypassed");
return TRUE; return 2; /* Accept only for this session */
} }
guac_client_log(client, GUAC_LOG_INFO, "Certificate validation failed"); guac_client_log(client, GUAC_LOG_INFO, "Certificate validation failed");
return FALSE; return 0; /* Reject certificate */
} }