From 39626bb34962a6850bf0102bc6e8cbd1a63d8910 Mon Sep 17 00:00:00 2001
From: John Safranek <john@wolfssl.com>
Date: Thu, 21 Feb 2019 10:06:55 -0800
Subject: [PATCH] 1. Add a newline to the client's "non-blocking socket and
 renegotiation" notice. 2. Add suite test cases for more renegotiation setting
 combinations.

---
 examples/client/client.c |  2 +-
 tests/test.conf          | 60 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/examples/client/client.c b/examples/client/client.c
index 748c0a299..ae6f358a8 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -2849,7 +2849,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
     if (scr && forceScr) {
         if (nonBlocking) {
             printf("not doing secure renegotiation on example with"
-                   " nonblocking yet");
+                   " nonblocking yet\n");
         } else {
             if (!resumeScr) {
                 printf("Beginning secure rengotiation.\n");
diff --git a/tests/test.conf b/tests/test.conf
index faad62e6e..eaece3e6e 100644
--- a/tests/test.conf
+++ b/tests/test.conf
@@ -2378,3 +2378,63 @@
 -c ./certs/client-ecc384-cert.pem
 -k ./certs/client-ecc384-key.pem
 -A ./certs/ca-ecc384-cert.pem
+
+# server TLSv1.2 default with secure renegotiation (renegotiation available)
+-v 3
+-l ECDHE-RSA-AES128-GCM-SHA256
+-M
+
+# client TLSv1.2 default with secure renegotiation (client initiated)
+-v 3
+-l ECDHE-RSA-AES128-GCM-SHA256
+-i
+
+# server TLSv1.2 default with secure renegotiation (renegotiation available)
+-v 3
+-l ECDHE-RSA-AES128-GCM-SHA256
+-M
+
+# client TLSv1.2 default with secure renegotiation (client initiated as resume)
+-v 3
+-l ECDHE-RSA-AES128-GCM-SHA256
+-i -4
+
+# server TLSv1.2 default with secure renegotiation (server initiated)
+-v 3
+-l ECDHE-RSA-AES128-GCM-SHA256
+-m
+
+# client TLSv1.2 default with secure renegotiation (renegotiation available)
+-v 3
+-l ECDHE-RSA-AES128-GCM-SHA256
+-R
+
+# server TLSv1.2 default with secure renegotiation (server initiated)
+-v 3
+-l ECDHE-RSA-AES128-GCM-SHA256
+-m
+
+# client TLSv1.2 default with secure renegotiation (renegotiation available as resume)
+-v 3
+-l ECDHE-RSA-AES128-GCM-SHA256
+-R -4
+
+# server TLSv1.2 default with secure renegotiation (server initiated)
+-v 3
+-l ECDHE-RSA-AES128-GCM-SHA256
+-m
+
+# client TLSv1.2 default with secure renegotiation (client initiated)
+-v 3
+-l ECDHE-RSA-AES128-GCM-SHA256
+-i
+
+# server TLSv1.2 default with secure renegotiation (server initiated)
+-v 3
+-l ECDHE-RSA-AES128-GCM-SHA256
+-m
+
+# client TLSv1.2 default with secure renegotiation (client initiated as resume)
+-v 3
+-l ECDHE-RSA-AES128-GCM-SHA256
+-i -4