From d17549f8485f67f31b65faed4f7131c52fffeb54 Mon Sep 17 00:00:00 2001 From: John Safranek Date: Wed, 23 Dec 2015 12:12:41 -0800 Subject: [PATCH 1/2] update example client ShowVersions() to not show disabled old-tls versions --- examples/client/client.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/examples/client/client.c b/examples/client/client.c index f1be58e94..932aed198 100644 --- a/examples/client/client.c +++ b/examples/client/client.c @@ -129,10 +129,13 @@ static void ShowCiphers(void) /* Shows which versions are valid */ static void ShowVersions(void) { +#ifndef NO_OLD_TLS #ifdef WOLFSSL_ALLOW_SSLV3 printf("0:"); -#endif - printf("1:2:3\n"); +#endif /* WOLFSSL_ALLOW_SSLV3 */ + printf("1:2:"); +#endif /* NO_OLD_TLS */ + printf("3\n"); } int ClientBenchmarkConnections(WOLFSSL_CTX* ctx, char* host, word16 port, From 4b836f8476ce4874d07939b587d5647dbadd45a5 Mon Sep 17 00:00:00 2001 From: John Safranek Date: Wed, 23 Dec 2015 12:20:53 -0800 Subject: [PATCH 2/2] added note to client and server regarding port 0 --- examples/client/client.c | 4 ++++ examples/server/server.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/examples/client/client.c b/examples/client/client.c index 932aed198..ef651fbe7 100644 --- a/examples/client/client.c +++ b/examples/client/client.c @@ -52,6 +52,10 @@ #include "examples/client/client.h" +/* Note on using port 0: the client and server standalone examples don't + * utilize the port 0 port sharing; that is used by the testsuite which uses + * this code and sets up the correct port numbers when the internal thread, + * using the server code, uses port 0. */ #ifdef WOLFSSL_CALLBACKS int handShakeCB(HandShakeInfo*); diff --git a/examples/server/server.c b/examples/server/server.c index 3e10c8f81..a97bcc93b 100644 --- a/examples/server/server.c +++ b/examples/server/server.c @@ -54,6 +54,10 @@ #include "examples/server/server.h" +/* Note on using port 0: the client and server standalone examples don't + * utilize the port 0 port sharing; that is used by the testsuite which uses + * this code and sets up the correct port numbers when the internal thread, + * using the server code, uses port 0. */ #ifdef CYASSL_CALLBACKS int srvHandShakeCB(HandShakeInfo*);