Add a Policy item for if a client will accept a server-initiated

renegotiation request. Defaults to true. If false, the client will
send a non-fatal no_renegotiation alert.

2 files changed, 7 insertions, 1 deletions

diff --git a/src/tls/tls_client.cpp b/src/tls/tls_client.cpp
index aed524dbe..33ab044b1 100644
--- a/src/tls/tls_client.cpp
+++ b/src/tls/tls_client.cpp
@@ -165,7 +165,8 @@ void Client::process_handshake_msg(Handshake_Type type,
       if(m_state->client_hello())
          return;
 
-      if(!m_secure_renegotiation.supported() && !m_policy.allow_insecure_renegotiation())
+      if(!m_policy.allow_server_initiated_renegotiation() ||
+         (!m_policy.allow_insecure_renegotiation()) && !m_secure_renegotiation.supported())
          {
          m_state.reset();
 
diff --git a/src/tls/tls_policy.h b/src/tls/tls_policy.h
index 55ae14176..323a0c285 100644
--- a/src/tls/tls_policy.h
+++ b/src/tls/tls_policy.h
@@ -83,6 +83,11 @@ class BOTAN_DLL Policy
       virtual bool allow_insecure_renegotiation() const { return false; }
 
       /**
+      * Allow servers to initiate a new handshake
+      */
+      virtual bool allow_server_initiated_renegotiation() const { return true; }
+
+      /**
       * Return the group to use for ephemeral Diffie-Hellman key agreement
       */
       virtual DL_Group dh_group() const;