Skip to content

Commit 0458e21

Browse files
committed
1. In the sniffer, replace call to strnlen with strlen and
accounted for size differences (fixes issue #60) 2. fixed overrun with long SNI names in hello messages
1 parent 1c19b67 commit 0458e21

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

‎src/sniffer.c‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,8 +1075,12 @@ static int SetNamedPrivateKey(const char* name, const char* address, int port,
10751075
}
10761076
XMEMSET(namedKey, 0, sizeof(NamedKey));
10771077

1078-
namedKey->nameSz = (word32)strnlen(name, sizeof(namedKey->name));
1079-
strncpy(namedKey->name, name, sizeof(namedKey->name));
1078+
namedKey->nameSz = (word32)XSTRLEN(name);
1079+
XSTRNCPY(namedKey->name, name, sizeof(namedKey->name));
1080+
if (namedKey->nameSz >= sizeof(namedKey->name)) {
1081+
namedKey->nameSz = sizeof(namedKey->name) - 1;
1082+
namedKey->name[namedKey->nameSz] = '\0';
1083+
}
10801084

10811085
ret = LoadKeyFile(&namedKey->key, &namedKey->keySz,
10821086
keyFile, type, password);
@@ -1578,6 +1582,8 @@ static int ProcessClientHello(const byte* input, int* sslBytes,
15781582
if (ret == SSL_SUCCESS) {
15791583
NamedKey* namedKey;
15801584

1585+
if (nameSz >= sizeof(name))
1586+
nameSz = sizeof(name) - 1;
15811587
name[nameSz] = 0;
15821588
LockMutex(&session->context->namedKeysMutex);
15831589
namedKey = session->context->namedKeys;

0 commit comments

Comments
 (0)