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

Use proper buffer sizes for parse_smartcard()

Browse Source
This commit is contained in:
Tobias Brunner
2013-01-24 23:35:42 +01:00
parent 677812dc66
commit 9ccfeb8ca1
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/stroke/stroke_cred.c
+10 -7
View File
@@ -82,6 +82,9 @@ struct private_stroke_cred_t {
bool cachecrl; bool cachecrl;
}; };
/** Length of smartcard specifier parts (module, keyid) */
#define SC_PART_LEN 128
/** /**
* Kind of smartcard specifier token * Kind of smartcard specifier token
*/ */
@@ -96,14 +99,14 @@ typedef enum {
* Parse a smartcard specifier token * Parse a smartcard specifier token
*/ */
static smartcard_format_t parse_smartcard(char *smartcard, u_int *slot, static smartcard_format_t parse_smartcard(char *smartcard, u_int *slot,
char module[128], char keyid[128]) char *module, char *keyid)
{ {
/* The token has one of the following three formats: /* The token has one of the following three formats:
* - %smartcard<slot>@<module>:<keyid> * - %smartcard<slot>@<module>:<keyid>
* - %smartcard<slot>:<keyid> * - %smartcard<slot>:<keyid>
* - %smartcard:<keyid> * - %smartcard:<keyid>
*/ */
char buf[256], *pos; char buf[2 * SC_PART_LEN], *pos;
if (sscanf(smartcard, "%%smartcard%u@%255s", slot, buf) == 2) if (sscanf(smartcard, "%%smartcard%u@%255s", slot, buf) == 2)
{ {
@@ -113,8 +116,8 @@ static smartcard_format_t parse_smartcard(char *smartcard, u_int *slot,
return SC_FORMAT_INVALID; return SC_FORMAT_INVALID;
} }
*pos++ = '\0'; *pos++ = '\0';
snprintf(module, BUF_LEN, "%s", buf); snprintf(module, SC_PART_LEN, "%s", buf);
snprintf(keyid, BUF_LEN, "%s", pos); snprintf(keyid, SC_PART_LEN, "%s", pos);
return SC_FORMAT_SLOT_MODULE_KEYID; return SC_FORMAT_SLOT_MODULE_KEYID;
} }
if (sscanf(smartcard, "%%smartcard%u:%127s", slot, keyid) == 2) if (sscanf(smartcard, "%%smartcard%u:%127s", slot, keyid) == 2)
@@ -174,7 +177,7 @@ METHOD(stroke_cred_t, load_ca, certificate_t*,
if (strneq(filename, "%smartcard", strlen("%smartcard"))) if (strneq(filename, "%smartcard", strlen("%smartcard")))
{ {
smartcard_format_t format; smartcard_format_t format;
char module[128], keyid[128]; char module[SC_PART_LEN], keyid[SC_PART_LEN];
u_int slot; u_int slot;
format = parse_smartcard(filename, &slot, module, keyid); format = parse_smartcard(filename, &slot, module, keyid);
@@ -238,7 +241,7 @@ METHOD(stroke_cred_t, load_peer, certificate_t*,
if (strneq(filename, "%smartcard", strlen("%smartcard"))) if (strneq(filename, "%smartcard", strlen("%smartcard")))
{ {
smartcard_format_t format; smartcard_format_t format;
char module[128], keyid[128]; char module[SC_PART_LEN], keyid[SC_PART_LEN];
u_int slot; u_int slot;
format = parse_smartcard(filename, &slot, module, keyid); format = parse_smartcard(filename, &slot, module, keyid);
@@ -702,7 +705,7 @@ static bool load_pin(private_stroke_cred_t *this, chunk_t line, int line_nr,
FILE *prompt) FILE *prompt)
{ {
chunk_t sc = chunk_empty, secret = chunk_empty; chunk_t sc = chunk_empty, secret = chunk_empty;
char smartcard[256], keyid[128], module[128]; char smartcard[BUF_LEN], keyid[SC_PART_LEN], module[SC_PART_LEN];
private_key_t *key = NULL; private_key_t *key = NULL;
u_int slot; u_int slot;
chunk_t chunk; chunk_t chunk;