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

Fix in snifftest to try loading private key into static ephemeral and private key. Updated pcap files (were missing TCP packets).

Browse Source
This commit is contained in:
David Garske 2020-07-20 11:10:46 -07:00
parent 23a3ead758
commit e6017de19d
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/sniffer-testsuite.test
View File

@ -2,6 +2,9 @@
#sniffer-testsuite.test #sniffer-testsuite.test
# ./configure --enable-sniffer [--enable-session-ticket]
# Resumption tests require "--enable-session-ticket"
echo -e "\nStaring snifftest on testsuite.pcap...\n" echo -e "\nStaring snifftest on testsuite.pcap...\n"
./sslSniffer/sslSnifferTest/snifftest ./scripts/testsuite.pcap ./certs/server-key.pem 127.0.0.1 11111 ./sslSniffer/sslSnifferTest/snifftest ./scripts/testsuite.pcap ./certs/server-key.pem 127.0.0.1 11111

BIN
scripts/sniffer-tls13-dh.pcap
View File

Binary file not shown.

BIN
scripts/sniffer-tls13-ecc.pcap
View File

Binary file not shown.

25
sslSniffer/sslSnifferTest/snifftest.c
View File

@ -491,7 +491,8 @@ int main(int argc, char** argv)
} }
else { else {
const char* passwd = NULL; const char* passwd = NULL;
int isEphemeralKey = 0; int loadCount = 0;
/* defaults for server and port */ /* defaults for server and port */
port = 443; port = 443;
server = "127.0.0.1"; server = "127.0.0.1";
@ -505,23 +506,31 @@ int main(int argc, char** argv)
if (argc >= 6) if (argc >= 6)
passwd = argv[5]; passwd = argv[5];
if (argc >= 7) /* try and load as both static ephemeral and private key */
isEphemeralKey = 1; /* only fail if no key is loaded */
#ifdef WOLFSSL_STATIC_EPHEMERAL
if (isEphemeralKey) {
ret = ssl_SetEphemeralKey(server, port, argv[2], ret = ssl_SetEphemeralKey(server, port, argv[2],
FILETYPE_PEM, passwd, err); FILETYPE_PEM, passwd, err);
} if (ret == 0)
else { loadCount++;
#endif
ret = ssl_SetPrivateKey(server, port, argv[2], ret = ssl_SetPrivateKey(server, port, argv[2],
FILETYPE_PEM, passwd, err); FILETYPE_PEM, passwd, err);
if (ret == 0)
loadCount++;
if (loadCount > 0) {
ret = 0;
}
else {
printf("Failed loading private key %d\n", ret);
exit(EXIT_FAILURE);
} }
} }
} }
else { else {
/* usage error */ /* usage error */
printf( "usage: ./snifftest or ./snifftest dump pemKey" printf( "usage: ./snifftest or ./snifftest dump pemKey"
" [server] [port] [password] [isEphemeral]\n"); " [server] [port] [password]\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }