From e02bb24b04e4771ecdfdbe12fe474f886882e66f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 30 Aug 2012 12:01:14 -0500 Subject: Make sure to lock the password buffer --- src/freerdp-auth-check.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/freerdp-auth-check.c') diff --git a/src/freerdp-auth-check.c b/src/freerdp-auth-check.c index d50833b..178db98 100644 --- a/src/freerdp-auth-check.c +++ b/src/freerdp-auth-check.c @@ -60,6 +60,10 @@ main (int argc, char * argv[]) return -1; } + if (mlock(password, sizeof(password)) != 0) { + return -1; + } + freerdp_channels_global_init(); freerdp * instance = freerdp_new(); @@ -88,10 +92,14 @@ main (int argc, char * argv[]) instance->settings->port = strtoul(colonloc, NULL, 10); } + int retval = -1; if (freerdp_connect(instance)) { freerdp_disconnect(instance); - return 0; - } else { - return -1; + retval = 0; } + + memset(password, 0, sizeof(password)); + munlock(password, sizeof(password)); + + return retval; } -- cgit v1.2.3 From ef23e22300f10da9c1bb86e8148516994ae49033 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 30 Aug 2012 12:02:34 -0500 Subject: Dropping the ignoring of the cert --- src/freerdp-auth-check.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/freerdp-auth-check.c') diff --git a/src/freerdp-auth-check.c b/src/freerdp-auth-check.c index 178db98..e5e9d13 100644 --- a/src/freerdp-auth-check.c +++ b/src/freerdp-auth-check.c @@ -81,7 +81,6 @@ main (int argc, char * argv[]) instance->settings->username = argv[2]; instance->settings->domain = argv[3]; instance->settings->password = password; - instance->settings->ignore_certificate = true; char * colonloc = strstr(argv[1], ":"); if (colonloc != NULL) { -- cgit v1.2.3