denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

memleak fixed when reading smartcard secrets

Browse Source
This commit is contained in:
Tobias Brunner
2009-03-12 15:12:11 +00:00
parent 0e950903ed
commit 9086102dfd
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/plugins/stroke/stroke_cred.c
+4 -3
View File
@@ -804,7 +804,7 @@ static void load_secrets(private_stroke_cred_t *this)
} }
else if (match("PIN", &token)) else if (match("PIN", &token))
{ {
chunk_t sc = chunk_empty; chunk_t sc = chunk_empty, secret = chunk_empty;
char smartcard[32], keyid[22], pin[32]; char smartcard[32], keyid[22], pin[32];
private_key_t *key; private_key_t *key;
u_int slot; u_int slot;
@@ -847,13 +847,13 @@ static void load_secrets(private_stroke_cred_t *this)
DBG1(DBG_CFG, "line %d: expected PIN", line_nr); DBG1(DBG_CFG, "line %d: expected PIN", line_nr);
goto error; goto error;
} }
ugh = extract_secret(&chunk, &line); ugh = extract_secret(&secret, &line);
if (ugh != NULL) if (ugh != NULL)
{ {
DBG1(DBG_CFG, "line %d: malformed PIN: %s", line_nr, ugh); DBG1(DBG_CFG, "line %d: malformed PIN: %s", line_nr, ugh);
goto error; goto error;
} }
snprintf(pin, sizeof(pin), "%.*s", chunk.len, chunk.ptr); snprintf(pin, sizeof(pin), "%.*s", secret.len, secret.ptr);
pin[sizeof(pin) - 1] = '\0'; pin[sizeof(pin) - 1] = '\0';
/* we assume an RSA key */ /* we assume an RSA key */
@@ -867,6 +867,7 @@ static void load_secrets(private_stroke_cred_t *this)
this->private->insert_last(this->private, key); this->private->insert_last(this->private, key);
} }
memset(pin, 0, sizeof(pin)); memset(pin, 0, sizeof(pin));
chunk_clear(&secret);
} }
else if ((match("PSK", &token) && (type = SHARED_IKE)) || else if ((match("PSK", &token) && (type = SHARED_IKE)) ||
(match("EAP", &token) && (type = SHARED_EAP)) || (match("EAP", &token) && (type = SHARED_EAP)) ||