Added safe renegotiation patch from Steve Dispensa, modified to suit gnutls

code style and error checking. Modified to conform to draft-ietf-tls-renegotiation-03.txt.

gnutls-cli will search input for **RENEGOTIATION** to perform a renegotiation
and gnutls-serv will perform one if requested.

1 files changed, 11 insertions, 0 deletions

diff --git a/src/cli.c b/src/cli.c
index 2aa2da4197..4e5bebe9d6 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -826,6 +826,17 @@ after_handshake:
 	      continue;
 	    }
 
+          if (strstr(buffer, "**REHANDSHAKE**") != NULL) {
+  	    fprintf (stderr, "*** Starting TLS rehandshake\n");
+	    ret = do_handshake (&hd);
+	    if (ret < 0)
+	      {
+	        fprintf (stderr, "*** Rehandshake has failed\n");
+	        user_term = 1;
+	        retval = 1;
+	        break;
+	      }
+          }
 	  if (crlf != 0)
 	    {
 	      char *b = strchr (buffer, '\n');