mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-18 14:04:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

nss: support pre-ALPN versions

Browse Source
This commit is contained in:
Daniel Stenberg 2014-02-07 15:38:45 +01:00
parent f3a12460ad
commit 09d907ee68
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/vtls/nss.c
View File

@ -632,21 +632,23 @@ static void HandshakeCallback(PRFileDesc *sock, void *arg)
case SSL_NEXT_PROTO_NO_OVERLAP: case SSL_NEXT_PROTO_NO_OVERLAP:
infof(conn->data, "TLS, neither ALPN nor NPN succeeded\n"); infof(conn->data, "TLS, neither ALPN nor NPN succeeded\n");
return; return;
#ifdef SSL_NEXT_PROTO_SELECTED
case SSL_NEXT_PROTO_SELECTED: case SSL_NEXT_PROTO_SELECTED:
infof(conn->data, "ALPN, server accepted to use %.*s\n", buflen, buf); infof(conn->data, "ALPN, server accepted to use %.*s\n", buflen, buf);
break; break;
#endif
case SSL_NEXT_PROTO_NEGOTIATED: case SSL_NEXT_PROTO_NEGOTIATED:
infof(conn->data, "NPN, server accepted to use %.*s\n", buflen, buf); infof(conn->data, "NPN, server accepted to use %.*s\n", buflen, buf);
break; break;
} }
if(buflen == NGHTTP2_PROTO_VERSION_ID_LEN && if(buflen == NGHTTP2_PROTO_VERSION_ID_LEN &&
memcmp(NGHTTP2_PROTO_VERSION_ID, buf, NGHTTP2_PROTO_VERSION_ID_LEN) memcmp(NGHTTP2_PROTO_VERSION_ID, buf, NGHTTP2_PROTO_VERSION_ID_LEN)
== 0) { == 0) {
conn->negnpn = NPN_HTTP2_DRAFT09; conn->negnpn = NPN_HTTP2_DRAFT09;
} }
else if(buflen == ALPN_HTTP_1_1_LENGTH && memcmp(ALPN_HTTP_1_1, buf, 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; conn->negnpn = NPN_HTTP1_1;
} }
} }