As someone pointed out on the TLS list, NPN isn't really a negotiation

per-se, it's a notification by the client. Rename accordingly.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/tls/tls_client.cpp b/src/tls/tls_client.cpp
index f796736fa..e79fb18d8 100644
--- a/src/tls/tls_client.cpp
+++ b/src/tls/tls_client.cpp
@@ -154,8 +154,8 @@ void TLS_Client::process_handshake_msg(Handshake_Type type,
                              "Server replied with compression method we didn't send");
          }
 
-      if(!state->client_hello->next_protocol_negotiation() &&
-         state->server_hello->next_protocol_negotiation())
+      if(!state->client_hello->next_protocol_notification() &&
+         state->server_hello->next_protocol_notification())
          {
          throw TLS_Exception(HANDSHAKE_FAILURE,
                              "Server sent next protocol but we didn't request it");
@@ -350,7 +350,7 @@ void TLS_Client::process_handshake_msg(Handshake_Type type,
 
       writer.activate(state->suite, state->keys, CLIENT);
 
-      if(state->server_hello->next_protocol_negotiation())
+      if(state->server_hello->next_protocol_notification())
          {
          const std::string protocol =
             state->client_npn_cb(state->server_hello->next_protocols());