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

1. In the sniffer, replace call to strnlen with strlen and

Browse Source 
accounted for size differences (fixes issue #60)
2. fixed overrun with long SNI names in hello messages
This commit is contained in:
John Safranek 2015-03-31 09:51:55 -07:00
parent 1c19b67885
commit 0458e21211
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/sniffer.c
View File

@ -1075,8 +1075,12 @@ static int SetNamedPrivateKey(const char* name, const char* address, int port,
}
XMEMSET(namedKey, 0, sizeof(NamedKey));
namedKey->nameSz = (word32)strnlen(name, sizeof(namedKey->name));
strncpy(namedKey->name, name, sizeof(namedKey->name));
namedKey->nameSz = (word32)XSTRLEN(name);
XSTRNCPY(namedKey->name, name, sizeof(namedKey->name));
if (namedKey->nameSz >= sizeof(namedKey->name)) {
namedKey->nameSz = sizeof(namedKey->name) - 1;
namedKey->name[namedKey->nameSz] = '\0';
}
ret = LoadKeyFile(&namedKey->key, &namedKey->keySz,
keyFile, type, password);
@ -1578,6 +1582,8 @@ static int ProcessClientHello(const byte* input, int* sslBytes,
if (ret == SSL_SUCCESS) {
NamedKey* namedKey;
if (nameSz >= sizeof(name))
nameSz = sizeof(name) - 1;
name[nameSz] = 0;
LockMutex(&session->context->namedKeysMutex);
namedKey = session->context->namedKeys;