From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 7 Feb 2014 14:38:45 +0000 (+0100)
Subject: nss: support pre-ALPN versions
X-Git-Tag: curl-7_36_0~199
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09d907ee689538b5552411e31f8dc5e37b65e8d2;p=curl

nss: support pre-ALPN versions
---

diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c
index 84e6d98d1..59cc769cf 100644
--- a/lib/vtls/nss.c
+++ b/lib/vtls/nss.c
@@ -632,21 +632,23 @@ static void HandshakeCallback(PRFileDesc *sock, void *arg)
       case SSL_NEXT_PROTO_NO_OVERLAP:
         infof(conn->data, "TLS, neither ALPN nor NPN succeeded\n");
         return;
+#ifdef SSL_NEXT_PROTO_SELECTED
       case SSL_NEXT_PROTO_SELECTED:
         infof(conn->data, "ALPN, server accepted to use %.*s\n", buflen, buf);
         break;
+#endif
       case SSL_NEXT_PROTO_NEGOTIATED:
         infof(conn->data, "NPN, server accepted to use %.*s\n", buflen, buf);
         break;
     }
 
     if(buflen == NGHTTP2_PROTO_VERSION_ID_LEN &&
-        memcmp(NGHTTP2_PROTO_VERSION_ID, buf, NGHTTP2_PROTO_VERSION_ID_LEN)
-        == 0) {
+       memcmp(NGHTTP2_PROTO_VERSION_ID, buf, NGHTTP2_PROTO_VERSION_ID_LEN)
+       == 0) {
       conn->negnpn = NPN_HTTP2_DRAFT09;
     }
     else if(buflen == ALPN_HTTP_1_1_LENGTH && memcmp(ALPN_HTTP_1_1, buf,
-        ALPN_HTTP_1_1_LENGTH)) {
+                                                     ALPN_HTTP_1_1_LENGTH)) {
       conn->negnpn = NPN_HTTP1_1;
     }
   }