luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openssl: fix warning with boringssl and SSL_CTX_set_min_proto_version

Browse Source 
Follow-up to ffe34b7b59
Closes #4359
This commit is contained in:
Daniel Stenberg 2019-09-15 23:58:49 +02:00
parent dda418266c
commit a0f8fccb1e
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/vtls/openssl.c
View File

@ -2165,8 +2165,13 @@ set_ssl_version_min_max(SSL_CTX *ctx, struct connectdata *conn)
long curl_ssl_version_max; long curl_ssl_version_max;
/* convert cURL min SSL version option to OpenSSL constant */ /* convert cURL min SSL version option to OpenSSL constant */
#ifdef OPENSSL_IS_BORINGSSL
uint16_t ossl_ssl_version_min = 0;
uint16_t ossl_ssl_version_max = 0;
#else
long ossl_ssl_version_min = 0; long ossl_ssl_version_min = 0;
long ossl_ssl_version_max = 0; long ossl_ssl_version_max = 0;
#endif
switch(curl_ssl_version_min) { switch(curl_ssl_version_min) {
case CURL_SSLVERSION_TLSv1: /* TLS 1.x */ case CURL_SSLVERSION_TLSv1: /* TLS 1.x */
case CURL_SSLVERSION_TLSv1_0: case CURL_SSLVERSION_TLSv1_0:
@ -2186,10 +2191,10 @@ set_ssl_version_min_max(SSL_CTX *ctx, struct connectdata *conn)
} }
/* CURL_SSLVERSION_DEFAULT means that no option was selected. /* CURL_SSLVERSION_DEFAULT means that no option was selected.
We don't want to pass 0 to SSL_CTX_set_min_proto_version as We don't want to pass 0 to SSL_CTX_set_min_proto_version as
it would enable all versions down to the lowest supported by it would enable all versions down to the lowest supported by
the library. the library.
So we skip this, and stay with the OS default So we skip this, and stay with the OS default
*/ */
if(curl_ssl_version_min != CURL_SSLVERSION_DEFAULT) { if(curl_ssl_version_min != CURL_SSLVERSION_DEFAULT) {
if(!SSL_CTX_set_min_proto_version(ctx, ossl_ssl_version_min)) { if(!SSL_CTX_set_min_proto_version(ctx, ossl_ssl_version_min)) {