diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2021-05-11 11:11:40 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-05-12 00:16:52 +0200 |
| commit | a9bc819c89cae273bacc375ebcd71debbfaa79fe (patch) | |
| tree | 078c6dd10c716c5d0b48497f1a162e7d861c7ddc /lib/curl_sasl.h | |
| parent | fa050ffd27524074660d0614d14e7dfd022c893b (diff) | |
| download | curl-a9bc819c89cae273bacc375ebcd71debbfaa79fe.tar.gz | |
sasl: use 'unsigned short' to store mechanism
... saves a few bytes of struct size in memory and it only uses
10 bits anyway.
Closes #7045
Diffstat (limited to 'lib/curl_sasl.h')
| -rw-r--r-- | lib/curl_sasl.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/curl_sasl.h b/lib/curl_sasl.h index 8648c632b..e17d323eb 100644 --- a/lib/curl_sasl.h +++ b/lib/curl_sasl.h @@ -42,7 +42,7 @@ struct connectdata; /* Authentication mechanism values */ #define SASL_AUTH_NONE 0 -#define SASL_AUTH_ANY ~0U +#define SASL_AUTH_ANY 0xffff #define SASL_AUTH_DEFAULT (SASL_AUTH_ANY & ~SASL_MECH_EXTERNAL) /* Authentication mechanism strings */ @@ -108,9 +108,9 @@ struct SASLproto { struct SASL { const struct SASLproto *params; /* Protocol dependent parameters */ saslstate state; /* Current machine state */ - unsigned int authmechs; /* Accepted authentication mechanisms */ - unsigned int prefmech; /* Preferred authentication mechanism */ - unsigned int authused; /* Auth mechanism used for the connection */ + unsigned short authmechs; /* Accepted authentication mechanisms */ + unsigned short prefmech; /* Preferred authentication mechanism */ + unsigned short authused; /* Auth mechanism used for the connection */ bool resetprefs; /* For URL auth option parsing. */ bool mutual_auth; /* Mutual authentication enabled (GSSAPI only) */ bool force_ir; /* Protocol always supports initial response */ @@ -126,8 +126,8 @@ struct SASL { void Curl_sasl_cleanup(struct connectdata *conn, unsigned int authused); /* Convert a mechanism name to a token */ -unsigned int Curl_sasl_decode_mech(const char *ptr, - size_t maxlen, size_t *len); +unsigned short Curl_sasl_decode_mech(const char *ptr, + size_t maxlen, size_t *len); /* Parse the URL login options */ CURLcode Curl_sasl_parse_url_auth_option(struct SASL *sasl, |