generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nss: explicitly tell NSS to disable NPN/ALPN

Browse Source 
... if disabled at libcurl level.  Otherwise, we would allow to
negotiate NPN despite curl was invoked with the --no-npn option.
This commit is contained in:
Kamil Dudka 2015-03-18 19:38:32 +01:00
parent 28de58504e
commit e3fbdc7c8a
1 changed files with 6 additions and 9 deletions

15
lib/vtls/nss.c

@ -1641,18 +1641,15 @@ static CURLcode nss_setup_connect(struct connectdata *conn, int sockindex)
#endif #endif
#ifdef SSL_ENABLE_NPN #ifdef SSL_ENABLE_NPN
if(data->set.ssl_enable_npn) { if(SSL_OptionSet(connssl->handle, SSL_ENABLE_NPN, data->set.ssl_enable_npn
if(SSL_OptionSet(connssl->handle, SSL_ENABLE_NPN, PR_TRUE) != SECSuccess) ? PR_TRUE : PR_FALSE) != SECSuccess)
goto error; goto error;
}
#endif #endif
#ifdef SSL_ENABLE_ALPN #ifdef SSL_ENABLE_ALPN
if(data->set.ssl_enable_alpn) { if(SSL_OptionSet(connssl->handle, SSL_ENABLE_ALPN, data->set.ssl_enable_alpn
if(SSL_OptionSet(connssl->handle, SSL_ENABLE_ALPN, PR_TRUE) ? PR_TRUE : PR_FALSE) != SECSuccess)
!= SECSuccess) goto error;
goto error;
}
#endif #endif
#if defined(SSL_ENABLE_NPN) || defined(SSL_ENABLE_ALPN) #if defined(SSL_ENABLE_NPN) || defined(SSL_ENABLE_ALPN)