NSS: rename ALPN extension to have _xtn suffix.

net/third_party/nss/patches/alpn.patch

 diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c
 --- a/nss/lib/ssl/ssl3con.c     2013-07-31 14:17:20.669282120 -0700
 +++ b/nss/lib/ssl/ssl3con.c     2013-07-31 14:28:56.549496061 -0700
 @@ -9912,8 +9912,10 @@ ssl3_SendNextProto(sslSocket *ss)
      int padding_len;
      static const unsigned char padding[32] = {0};
  
 -    if (ss->ssl3.nextProto.len == 0)
 +    if (ss->ssl3.nextProto.len == 0 ||
 +        ss->ssl3.nextProtoState == SSL_NEXT_PROTO_SELECTED) {
@@ skipping 27 matching lines @@
      /* TODO: add a handler for ssl_ec_point_formats_xtn */
 -    { ssl_session_ticket_xtn,     &ssl3_ClientHandleSessionTicketXtn },
 -    { ssl_renegotiation_info_xtn, &ssl3_HandleRenegotiationInfoXtn },
 -    { ssl_next_proto_nego_xtn,    &ssl3_ClientHandleNextProtoNegoXtn },
 -    { ssl_use_srtp_xtn,           &ssl3_HandleUseSRTPXtn },
 -    { ssl_channel_id_xtn,         &ssl3_ClientHandleChannelIDXtn },
 -    { ssl_cert_status_xtn,        &ssl3_ClientHandleStatusRequestXtn },
 +    { ssl_session_ticket_xtn,         &ssl3_ClientHandleSessionTicketXtn },
 +    { ssl_renegotiation_info_xtn,     &ssl3_HandleRenegotiationInfoXtn },
 +    { ssl_next_proto_nego_xtn,        &ssl3_ClientHandleNextProtoNegoXtn },
-+    { ssl_application_layer_protocol, &ssl3_ClientHandleAppProtoXtn },
++    { ssl_app_layer_protocol_xtn,     &ssl3_ClientHandleAppProtoXtn },
 +    { ssl_use_srtp_xtn,               &ssl3_HandleUseSRTPXtn },
 +    { ssl_channel_id_xtn,             &ssl3_ClientHandleChannelIDXtn },
 +    { ssl_cert_status_xtn,            &ssl3_ClientHandleStatusRequestXtn },
      { -1, NULL }
  };
  
 @@ -270,17 +275,18 @@ static const ssl3HelloExtensionHandler s
   */
  static const 
  ssl3HelloExtensionSender clientHelloSendersTLS[SSL_MAX_EXTENSIONS] = {
 -    { ssl_server_name_xtn,        &ssl3_SendServerNameXtn        },
 -    { ssl_renegotiation_info_xtn, &ssl3_SendRenegotiationInfoXtn },
 +    { ssl_server_name_xtn,            &ssl3_SendServerNameXtn        },
 +    { ssl_renegotiation_info_xtn,     &ssl3_SendRenegotiationInfoXtn },
  #ifdef NSS_ENABLE_ECC
 -    { ssl_elliptic_curves_xtn,    &ssl3_SendSupportedCurvesXtn },
 -    { ssl_ec_point_formats_xtn,   &ssl3_SendSupportedPointFormatsXtn },
 +    { ssl_elliptic_curves_xtn,        &ssl3_SendSupportedCurvesXtn },
 +    { ssl_ec_point_formats_xtn,       &ssl3_SendSupportedPointFormatsXtn },
  #endif
 -    { ssl_session_ticket_xtn,     &ssl3_SendSessionTicketXtn },
 -    { ssl_next_proto_nego_xtn,    &ssl3_ClientSendNextProtoNegoXtn },
 -    { ssl_use_srtp_xtn,           &ssl3_SendUseSRTPXtn },
 -    { ssl_channel_id_xtn,         &ssl3_ClientSendChannelIDXtn },
 -    { ssl_cert_status_xtn,        &ssl3_ClientSendStatusRequestXtn },
 +    { ssl_session_ticket_xtn,         &ssl3_SendSessionTicketXtn },
 +    { ssl_next_proto_nego_xtn,        &ssl3_ClientSendNextProtoNegoXtn },
-+    { ssl_application_layer_protocol, &ssl3_ClientSendAppProtoXtn },
++    { ssl_app_layer_protocol_xtn,     &ssl3_ClientSendAppProtoXtn },
 +    { ssl_use_srtp_xtn,               &ssl3_SendUseSRTPXtn },
 +    { ssl_channel_id_xtn,             &ssl3_ClientSendChannelIDXtn },
 +    { ssl_cert_status_xtn,            &ssl3_ClientSendStatusRequestXtn },
      { ssl_signature_algorithms_xtn, &ssl3_ClientSendSigAlgsXtn }
      /* any extra entries will appear as { 0, NULL }    */
  };
 @@ -605,6 +611,11 @@ ssl3_ClientHandleNextProtoNegoXtn(sslSoc
  
      PORT_Assert(!ss->firstHsDone);
  
-+    if (ssl3_ExtensionNegotiated(ss, ssl_application_layer_protocol)) {
++    if (ssl3_ExtensionNegotiated(ss, ssl_app_layer_protocol_xtn)) {
 +       PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
 +       return SECFailure;
 +    }
 +
      rv = ssl3_ValidateNextProtoNego(data->data, data->len);
      if (rv != SECSuccess)
         return rv;
 @@ -638,6 +649,44 @@ ssl3_ClientHandleNextProtoNegoXtn(sslSoc
      return SECITEM_CopyItem(NULL, &ss->ssl3.nextProto, &result);
  }
@@ skipping 59 matching lines @@
 +    if (!ss->opt.nextProtoNego.data || ss->firstHsDone) {
 +       return 0;
 +    }
 +
 +    extension_length = 2 /* extension type */ + 2 /* extension length */ +
 +                       2 /* protocol name list length */ +
 +                       ss->opt.nextProtoNego.len;
 +
 +    if (append && maxBytes >= extension_length) {
 +       SECStatus rv;
-+       rv = ssl3_AppendHandshakeNumber(ss, ssl_application_layer_protocol, 2);
++       rv = ssl3_AppendHandshakeNumber(ss, ssl_app_layer_protocol_xtn, 2);
 +       if (rv != SECSuccess)
 +           goto loser;
 +       rv = ssl3_AppendHandshakeNumber(ss, extension_length - 4, 2);
 +       if (rv != SECSuccess)
 +           goto loser;
 +       rv = ssl3_AppendHandshakeVariable(ss, ss->opt.nextProtoNego.data,
 +                                         ss->opt.nextProtoNego.len, 2);
 +       if (rv != SECSuccess)
 +           goto loser;
 +       ss->xtnData.advertised[ss->xtnData.numAdvertised++] =
-+               ssl_application_layer_protocol;
++               ssl_app_layer_protocol_xtn;
 +    } else if (maxBytes < extension_length) {
 +       return 0;
 +    }
  
      return extension_length;
  
 diff -pu a/nss/lib/ssl/ssl.h b/nss/lib/ssl/ssl.h
 --- a/nss/lib/ssl/ssl.h 2013-07-31 14:10:35.113325316 -0700
 +++ b/nss/lib/ssl/ssl.h 2013-07-31 14:28:56.589496647 -0700
 @@ -203,6 +203,11 @@ SSL_IMPORT SECStatus SSL_SetNextProtoCal
@@ skipping 18 matching lines @@
  } SSLNextProtoState;
  
  /* SSL_GetNextProto can be used in the HandshakeCallback or any time after
 diff -pu a/nss/lib/ssl/sslt.h b/nss/lib/ssl/sslt.h
 --- a/nss/lib/ssl/sslt.h        2013-07-31 14:13:43.806096237 -0700
 +++ b/nss/lib/ssl/sslt.h        2013-07-31 14:28:56.609496941 -0700
 @@ -195,12 +195,13 @@ typedef enum {
  #endif
      ssl_signature_algorithms_xtn     = 13,
      ssl_use_srtp_xtn                 = 14,
-+    ssl_application_layer_protocol   = 16,
++    ssl_app_layer_protocol_xtn       = 16,
      ssl_session_ticket_xtn           = 35,
      ssl_next_proto_nego_xtn          = 13172,
      ssl_channel_id_xtn               = 30031,
      ssl_renegotiation_info_xtn       = 0xff01  /* experimental number */
  } SSLExtensionType;
  
 -#define SSL_MAX_EXTENSIONS             10
 +#define SSL_MAX_EXTENSIONS             11
  
  #endif /* __sslt_h_ */