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

curl.h: change CURL_SSLVERSION_* from enum to defines

Browse Source 
C++20 and later compilers emit a deprecation warning if values from two
different enums are combined with a bitwise operation the way the
CURL_SSLVERSION_* values were previously created.

Reported-by: Michael Kaufmann
Fixes #13510
Closes #13511
This commit is contained in:
Daniel Stenberg 2024-04-30 23:11:59 +02:00
parent 137aecfbf1
commit eb06c1b25b
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/curl/curl.h
View File

@ -2318,30 +2318,26 @@ enum CURL_NETRC_OPTION {
CURL_NETRC_LAST CURL_NETRC_LAST
}; };
enum { #define CURL_SSLVERSION_DEFAULT 0
CURL_SSLVERSION_DEFAULT, #define CURL_SSLVERSION_TLSv1 1 /* TLS 1.x */
CURL_SSLVERSION_TLSv1, /* TLS 1.x */ #define CURL_SSLVERSION_SSLv2 2
CURL_SSLVERSION_SSLv2, #define CURL_SSLVERSION_SSLv3 3
CURL_SSLVERSION_SSLv3, #define CURL_SSLVERSION_TLSv1_0 4
CURL_SSLVERSION_TLSv1_0, #define CURL_SSLVERSION_TLSv1_1 5
CURL_SSLVERSION_TLSv1_1, #define CURL_SSLVERSION_TLSv1_2 6
CURL_SSLVERSION_TLSv1_2, #define CURL_SSLVERSION_TLSv1_3 7
CURL_SSLVERSION_TLSv1_3,
CURL_SSLVERSION_LAST /* never use, keep last */ #define CURL_SSLVERSION_LAST 8 /* never use, keep last */
};
enum { #define CURL_SSLVERSION_MAX_NONE 0
CURL_SSLVERSION_MAX_NONE = 0, #define CURL_SSLVERSION_MAX_DEFAULT (CURL_SSLVERSION_TLSv1 << 16)
CURL_SSLVERSION_MAX_DEFAULT = (CURL_SSLVERSION_TLSv1 << 16), #define CURL_SSLVERSION_MAX_TLSv1_0 (CURL_SSLVERSION_TLSv1_0 << 16)
CURL_SSLVERSION_MAX_TLSv1_0 = (CURL_SSLVERSION_TLSv1_0 << 16), #define CURL_SSLVERSION_MAX_TLSv1_1 (CURL_SSLVERSION_TLSv1_1 << 16)
CURL_SSLVERSION_MAX_TLSv1_1 = (CURL_SSLVERSION_TLSv1_1 << 16), #define CURL_SSLVERSION_MAX_TLSv1_2 (CURL_SSLVERSION_TLSv1_2 << 16)
CURL_SSLVERSION_MAX_TLSv1_2 = (CURL_SSLVERSION_TLSv1_2 << 16), #define CURL_SSLVERSION_MAX_TLSv1_3 (CURL_SSLVERSION_TLSv1_3 << 16)
CURL_SSLVERSION_MAX_TLSv1_3 = (CURL_SSLVERSION_TLSv1_3 << 16),
/* never use, keep last */ /* never use, keep last */
CURL_SSLVERSION_MAX_LAST = (CURL_SSLVERSION_LAST << 16) #define CURL_SSLVERSION_MAX_LAST (CURL_SSLVERSION_LAST << 16)
};
enum CURL_TLSAUTH { enum CURL_TLSAUTH {
CURL_TLSAUTH_NONE, CURL_TLSAUTH_NONE,