From 550faf230b01c657b5883a35643e8b9865b122ca Mon Sep 17 00:00:00 2001 From: lloyd Date: Wed, 4 Jan 2012 18:46:49 +0000 Subject: 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. --- src/tls/tls_client.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/tls/tls_client.cpp') 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()); -- cgit v1.2.3