Add ALPN (RFC 7301) and remove NPN

1 files changed, 3 insertions, 12 deletions

diff --git a/src/lib/tls/tls_handshake_state.cpp b/src/lib/tls/tls_handshake_state.cpp
index f0d80556d..cbbca3a0d 100644
--- a/src/lib/tls/tls_handshake_state.cpp
+++ b/src/lib/tls/tls_handshake_state.cpp
@@ -58,17 +58,14 @@ u32bit bitmask_for_handshake_type(Handshake_Type type)
       case CLIENT_KEX:
          return (1 << 11);
 
-      case NEXT_PROTOCOL:
-         return (1 << 12);
-
       case NEW_SESSION_TICKET:
-         return (1 << 13);
+         return (1 << 12);
 
       case HANDSHAKE_CCS:
-         return (1 << 14);
+         return (1 << 13);
 
       case FINISHED:
-         return (1 << 15);
+         return (1 << 14);
 
       // allow explicitly disabling new handshakes
       case HANDSHAKE_NONE:
@@ -157,12 +154,6 @@ void Handshake_State::client_verify(Certificate_Verify* client_verify)
    note_message(*m_client_verify);
    }
 
-void Handshake_State::next_protocol(Next_Protocol* next_protocol)
-   {
-   m_next_protocol.reset(next_protocol);
-   note_message(*m_next_protocol);
-   }
-
 void Handshake_State::new_session_ticket(New_Session_Ticket* new_session_ticket)
    {
    m_new_session_ticket.reset(new_session_ticket);