mirror of
https://github.com/curl/curl.git
synced 2026-07-25 13:47:23 +03:00
tidy-up: miscellaneous
- INSTALL-CMAKE.md: add missing periods, text fixes. - md4, md5: sync variables names. - curl_trc: sync an argument type. - docs/examples: sync debug/trace function copies, constify, tidy-ups. - replace commented code with `#if 0`. - drop redundant parenthesis (macro values, `return`, around single variables, function calls). - fix indentation, apply clang-format in places. Closes #20481
This commit is contained in:
Viktor Szakats
parent
ca5efd02b6
commit
3003c32cb2
62 changed files with 291 additions and 281 deletions
|
|
@ -27,14 +27,13 @@
|
|||
/*
|
||||
* Telnet option defines. Add more here if in need.
|
||||
*/
|
||||
#define CURL_TELOPT_BINARY 0 /* binary 8-bit data */
|
||||
#define CURL_TELOPT_ECHO 1 /* just echo! */
|
||||
#define CURL_TELOPT_SGA 3 /* Suppress Go Ahead */
|
||||
#define CURL_TELOPT_EXOPL 255 /* EXtended OPtions List */
|
||||
#define CURL_TELOPT_TTYPE 24 /* Terminal TYPE */
|
||||
#define CURL_TELOPT_NAWS 31 /* Negotiate About Window Size */
|
||||
#define CURL_TELOPT_XDISPLOC 35 /* X DISPlay LOCation */
|
||||
|
||||
#define CURL_TELOPT_BINARY 0 /* binary 8-bit data */
|
||||
#define CURL_TELOPT_ECHO 1 /* just echo! */
|
||||
#define CURL_TELOPT_SGA 3 /* Suppress Go Ahead */
|
||||
#define CURL_TELOPT_EXOPL 255 /* EXtended OPtions List */
|
||||
#define CURL_TELOPT_TTYPE 24 /* Terminal TYPE */
|
||||
#define CURL_TELOPT_NAWS 31 /* Negotiate About Window Size */
|
||||
#define CURL_TELOPT_XDISPLOC 35 /* X DISPlay LOCation */
|
||||
#define CURL_TELOPT_NEW_ENVIRON 39 /* NEW ENVIRONment variables */
|
||||
#define CURL_NEW_ENV_VAR 0
|
||||
#define CURL_NEW_ENV_VALUE 1
|
||||
|
|
@ -55,9 +54,9 @@ static const char * const telnetoptions[] = {
|
|||
"TERM SPEED", "LFLOW", "LINEMODE", "XDISPLOC",
|
||||
"OLD-ENVIRON", "AUTHENTICATION", "ENCRYPT", "NEW-ENVIRON"
|
||||
};
|
||||
#define CURL_TELOPT(x) telnetoptions[x]
|
||||
#define CURL_TELOPT(x) telnetoptions[x]
|
||||
#else
|
||||
#define CURL_TELOPT(x) ""
|
||||
#define CURL_TELOPT(x) ""
|
||||
#endif
|
||||
|
||||
#define CURL_TELOPT_MAXIMUM CURL_TELOPT_NEW_ENVIRON
|
||||
|
|
@ -101,13 +100,14 @@ static const char * const telnetcmds[] = {
|
|||
#define CURL_TELQUAL_INFO 2
|
||||
#define CURL_TELQUAL_NAME 3
|
||||
|
||||
#define CURL_TELCMD_OK(x) (((unsigned int)(x) >= CURL_TELCMD_MINIMUM) && \
|
||||
((unsigned int)(x) <= CURL_TELCMD_MAXIMUM))
|
||||
#define CURL_TELCMD_OK(x) \
|
||||
(((unsigned int)(x) >= CURL_TELCMD_MINIMUM) && \
|
||||
((unsigned int)(x) <= CURL_TELCMD_MAXIMUM))
|
||||
|
||||
#ifdef CURLVERBOSE
|
||||
#define CURL_TELCMD(x) telnetcmds[(x) - CURL_TELCMD_MINIMUM]
|
||||
#define CURL_TELCMD(x) telnetcmds[(x) - CURL_TELCMD_MINIMUM]
|
||||
#else
|
||||
#define CURL_TELCMD(x) ""
|
||||
#define CURL_TELCMD(x) ""
|
||||
#endif
|
||||
|
||||
#endif /* CURL_DISABLE_TELNET */
|
||||
|
|
|
|||
|
|
@ -309,7 +309,7 @@ CURLcode Curl_async_is_resolved(struct Curl_easy *data,
|
|||
(ares->happy_eyeballs_dns_time.tv_sec ||
|
||||
ares->happy_eyeballs_dns_time.tv_usec) &&
|
||||
(curlx_ptimediff_ms(Curl_pgrs_now(data),
|
||||
&ares->happy_eyeballs_dns_time) >=
|
||||
&ares->happy_eyeballs_dns_time) >=
|
||||
HAPPY_EYEBALLS_DNS_TIMEOUT)) {
|
||||
/* Remember that the EXPIRE_HAPPY_EYEBALLS_DNS timer is no longer
|
||||
running. */
|
||||
|
|
@ -743,8 +743,7 @@ CURLcode Curl_async_getaddrinfo(struct Curl_easy *data, const char *hostname,
|
|||
ares->ares_status = ARES_ENOTFOUND;
|
||||
ares->result = CURLE_OK;
|
||||
|
||||
#if defined(CURLVERBOSE) && \
|
||||
ARES_VERSION >= 0x011800 /* >= v1.24.0 */
|
||||
#if defined(CURLVERBOSE) && ARES_VERSION >= 0x011800 /* >= v1.24.0 */
|
||||
if(CURL_TRC_DNS_is_verbose(data)) {
|
||||
char *csv = ares_get_servers_csv(ares->channel);
|
||||
CURL_TRC_DNS(data, "asyn-ares: servers=%s", csv);
|
||||
|
|
@ -759,8 +758,7 @@ CURLcode Curl_async_getaddrinfo(struct Curl_easy *data, const char *hostname,
|
|||
int pf = PF_INET;
|
||||
memset(&hints, 0, sizeof(hints));
|
||||
#ifdef CURLRES_IPV6
|
||||
if((ip_version != CURL_IPRESOLVE_V4) &&
|
||||
Curl_ipv6works(data)) {
|
||||
if((ip_version != CURL_IPRESOLVE_V4) && Curl_ipv6works(data)) {
|
||||
/* The stack seems to be IPv6-enabled */
|
||||
if(ip_version == CURL_IPRESOLVE_V6)
|
||||
pf = PF_INET6;
|
||||
|
|
|
|||
|
|
@ -226,8 +226,7 @@ static CURLcode proxy_h2_nw_out_writer(void *writer_ctx,
|
|||
if(cf) {
|
||||
struct Curl_easy *data = CF_DATA_CURRENT(cf);
|
||||
CURLcode result;
|
||||
result = Curl_conn_cf_send(cf->next, data, buf, buflen,
|
||||
FALSE, pnwritten);
|
||||
result = Curl_conn_cf_send(cf->next, data, buf, buflen, FALSE, pnwritten);
|
||||
CURL_TRC_CF(data, cf, "[0] nw_out_writer(len=%zu) -> %d, %zu",
|
||||
buflen, result, *pnwritten);
|
||||
return result;
|
||||
|
|
@ -422,7 +421,7 @@ static ssize_t on_session_send(nghttp2_session *h2,
|
|||
if(!nwritten)
|
||||
return NGHTTP2_ERR_WOULDBLOCK;
|
||||
|
||||
return (nwritten > SSIZE_MAX) ?
|
||||
return (nwritten > SSIZE_MAX) ?
|
||||
NGHTTP2_ERR_CALLBACK_FAILURE : (ssize_t)nwritten;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -500,8 +500,8 @@ out:
|
|||
next_expire_ms = Curl_timeleft_ms(data);
|
||||
if(next_expire_ms < 0) {
|
||||
failf(data, "Connection timeout after %" FMT_OFF_T " ms",
|
||||
curlx_ptimediff_ms(Curl_pgrs_now(data),
|
||||
&data->progress.t_startsingle));
|
||||
curlx_ptimediff_ms(Curl_pgrs_now(data),
|
||||
&data->progress.t_startsingle));
|
||||
return CURLE_OPERATION_TIMEDOUT;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -280,8 +280,7 @@
|
|||
*/
|
||||
|
||||
/* Default define to enable threaded asynchronous DNS lookups. */
|
||||
#if !defined(USE_SYNC_DNS) && !defined(USE_ARES) && \
|
||||
!defined(USE_THREADS_WIN32)
|
||||
#if !defined(USE_SYNC_DNS) && !defined(USE_ARES) && !defined(USE_THREADS_WIN32)
|
||||
# define USE_THREADS_WIN32 1
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
} \
|
||||
} while(0)
|
||||
|
||||
#define CPOOL_UNLOCK(c,d) \
|
||||
#define CPOOL_UNLOCK(c, d) \
|
||||
do { \
|
||||
if(c) { \
|
||||
DEBUGASSERT((c)->locked); \
|
||||
|
|
|
|||
10
lib/cookie.c
10
lib/cookie.c
|
|
@ -372,10 +372,10 @@ static bool invalid_octets(const char *ptr, size_t len)
|
|||
*/
|
||||
#define MAX_DATE_LENGTH 80
|
||||
|
||||
#define COOKIE_NAME 0
|
||||
#define COOKIE_VALUE 1
|
||||
#define COOKIE_NAME 0
|
||||
#define COOKIE_VALUE 1
|
||||
#define COOKIE_DOMAIN 2
|
||||
#define COOKIE_PATH 3
|
||||
#define COOKIE_PATH 3
|
||||
|
||||
#define COOKIE_PIECES 4 /* the list above */
|
||||
|
||||
|
|
@ -783,7 +783,7 @@ static bool is_public_suffix(struct Curl_easy *data,
|
|||
* dereference it.
|
||||
*/
|
||||
DEBUGF(infof(data, "PSL check set-cookie '%s' for domain=%s in %s",
|
||||
co->name, co->domain, domain));
|
||||
co->name, co->domain, domain));
|
||||
if(data && (domain && co->domain && !Curl_host_is_ipnum(co->domain))) {
|
||||
bool acceptable = FALSE;
|
||||
char lcase[256];
|
||||
|
|
@ -814,7 +814,7 @@ static bool is_public_suffix(struct Curl_easy *data,
|
|||
(void)co;
|
||||
(void)domain;
|
||||
DEBUGF(infof(data, "NO PSL to check set-cookie '%s' for domain=%s in %s",
|
||||
co->name, co->domain, domain));
|
||||
co->name, co->domain, domain));
|
||||
#endif
|
||||
return FALSE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -401,8 +401,8 @@ void Curl_cshutdn_add(struct cshutdn *cshutdn,
|
|||
|
||||
/* Add the connection to our shutdown list for non-blocking shutdown
|
||||
* during multi processing. */
|
||||
if(max_total > 0 && (max_total <=
|
||||
(conns_in_pool + Curl_llist_count(&cshutdn->list)))) {
|
||||
if(max_total > 0 &&
|
||||
(max_total <= (conns_in_pool + Curl_llist_count(&cshutdn->list)))) {
|
||||
CURL_TRC_M(data, "[SHUTDOWN] discarding oldest shutdown connection "
|
||||
"due to connection limit of %zu", max_total);
|
||||
cshutdn_destroy_oldest(cshutdn, data, NULL);
|
||||
|
|
|
|||
|
|
@ -485,7 +485,7 @@ struct Curl_addrinfo *Curl_unix2addr(const char *path, bool *longpath,
|
|||
}
|
||||
#endif
|
||||
|
||||
#if defined(CURL_MEMDEBUG) && defined(HAVE_GETADDRINFO) && \
|
||||
#if defined(CURL_MEMDEBUG) && defined(HAVE_GETADDRINFO) && \
|
||||
defined(HAVE_FREEADDRINFO)
|
||||
/*
|
||||
* curl_dbg_freeaddrinfo()
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
***************************************************************************/
|
||||
#include "curl_setup.h"
|
||||
|
||||
#if !defined(CURL_DISABLE_COOKIES) || !defined(CURL_DISABLE_ALTSVC) || \
|
||||
#if !defined(CURL_DISABLE_COOKIES) || !defined(CURL_DISABLE_ALTSVC) || \
|
||||
!defined(CURL_DISABLE_HSTS)
|
||||
|
||||
#include "urldata.h"
|
||||
|
|
|
|||
|
|
@ -23,12 +23,12 @@
|
|||
***************************************************************************/
|
||||
#include "curl_setup.h"
|
||||
|
||||
#if !defined(CURL_DISABLE_COOKIES) || !defined(CURL_DISABLE_ALTSVC) || \
|
||||
#if !defined(CURL_DISABLE_COOKIES) || !defined(CURL_DISABLE_ALTSVC) || \
|
||||
!defined(CURL_DISABLE_HSTS) || !defined(CURL_DISABLE_NETRC)
|
||||
|
||||
#include "curl_get_line.h"
|
||||
|
||||
#define appendnl(b) curlx_dyn_addn(buf, "\n", 1)
|
||||
#define appendnl(b) curlx_dyn_addn(buf, "\n", 1)
|
||||
|
||||
/*
|
||||
* Curl_get_line() returns only complete whole lines that end with newline.
|
||||
|
|
|
|||
|
|
@ -84,13 +84,10 @@
|
|||
# define DES_set_key_unchecked wolfSSL_DES_set_key_unchecked
|
||||
# define DES_ecb_encrypt wolfSSL_DES_ecb_encrypt
|
||||
# define DESKEY(x) ((WOLFSSL_DES_key_schedule *)(x))
|
||||
|
||||
# if defined(LIBWOLFSSL_VERSION_HEX) && \
|
||||
(LIBWOLFSSL_VERSION_HEX >= 0x05007006)
|
||||
# if defined(LIBWOLFSSL_VERSION_HEX) && LIBWOLFSSL_VERSION_HEX >= 0x05007006
|
||||
# define DES_ENCRYPT WC_DES_ENCRYPT
|
||||
# define DES_DECRYPT WC_DES_DECRYPT
|
||||
# endif
|
||||
|
||||
# else
|
||||
# define DESKEY(x) &x
|
||||
# endif
|
||||
|
|
@ -340,7 +337,7 @@ void Curl_ntlm_core_lm_resp(const unsigned char *keys,
|
|||
des_encrypt(&des, 8, results + 8, plaintext);
|
||||
setup_des_key(keys + 14, &des);
|
||||
des_encrypt(&des, 8, results + 16, plaintext);
|
||||
#elif defined(USE_MBEDTLS_DES) || defined(USE_OS400CRYPTO) || \
|
||||
#elif defined(USE_MBEDTLS_DES) || defined(USE_OS400CRYPTO) || \
|
||||
defined(USE_WIN32_CRYPTO)
|
||||
encrypt_des(plaintext, results, keys);
|
||||
encrypt_des(plaintext, results + 8, keys + 7);
|
||||
|
|
@ -386,7 +383,7 @@ CURLcode Curl_ntlm_core_mk_lm_hash(const char *password,
|
|||
des_encrypt(&des, 8, lmbuffer, magic);
|
||||
setup_des_key(pw + 7, &des);
|
||||
des_encrypt(&des, 8, lmbuffer + 8, magic);
|
||||
#elif defined(USE_MBEDTLS_DES) || defined(USE_OS400CRYPTO) || \
|
||||
#elif defined(USE_MBEDTLS_DES) || defined(USE_OS400CRYPTO) || \
|
||||
defined(USE_WIN32_CRYPTO)
|
||||
encrypt_des(magic, lmbuffer, pw);
|
||||
encrypt_des(magic, lmbuffer + 8, pw + 7);
|
||||
|
|
|
|||
|
|
@ -63,9 +63,9 @@
|
|||
/* Macro to strip 'const' without triggering a compiler warning.
|
||||
Use it for APIs that do not or cannot support the const qualifier. */
|
||||
#ifdef HAVE_UINTPTR_T
|
||||
# define CURL_UNCONST(p) ((void *)(uintptr_t)(const void *)(p))
|
||||
#define CURL_UNCONST(p) ((void *)(uintptr_t)(const void *)(p))
|
||||
#else
|
||||
# define CURL_UNCONST(p) ((void *)(p)) /* Fall back to simple cast */
|
||||
#define CURL_UNCONST(p) ((void *)(p)) /* Fall back to simple cast */
|
||||
#endif
|
||||
|
||||
#ifdef USE_SCHANNEL
|
||||
|
|
@ -284,9 +284,9 @@ typedef unsigned int curl_bit;
|
|||
*/
|
||||
#ifdef USE_WINSOCK
|
||||
#define SOCKERRNO ((int)WSAGetLastError())
|
||||
#define SET_SOCKERRNO(x) (WSASetLastError((int)(x)))
|
||||
#define SET_SOCKERRNO(x) WSASetLastError((int)(x))
|
||||
#else
|
||||
#define SOCKERRNO (errno)
|
||||
#define SOCKERRNO errno
|
||||
#define SET_SOCKERRNO(x) (errno = (x))
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@ struct Curl_ssl_scache;
|
|||
#define CURL_GOOD_SHARE 0x7e117a1e
|
||||
#define GOOD_SHARE_HANDLE(x) ((x) && (x)->magic == CURL_GOOD_SHARE)
|
||||
|
||||
#define CURL_SHARE_KEEP_CONNECT(s) \
|
||||
((s) && ((s)->specifier & (1 << CURL_LOCK_DATA_CONNECT)))
|
||||
#define CURL_SHARE_KEEP_CONNECT(s) \
|
||||
((s) && ((s)->specifier & (1 << CURL_LOCK_DATA_CONNECT)))
|
||||
|
||||
/* this struct is libcurl-private, do not export details */
|
||||
struct Curl_share {
|
||||
|
|
|
|||
|
|
@ -580,7 +580,7 @@ static void trc_apply_level_by_name(struct Curl_str *token, int lvl)
|
|||
}
|
||||
}
|
||||
|
||||
static void trc_apply_level_by_category(int category, int lvl)
|
||||
static void trc_apply_level_by_category(unsigned int category, int lvl)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
|
|
|
|||
|
|
@ -616,7 +616,9 @@ static CURLcode wait_or_timeout(struct Curl_multi *multi, struct events *ev)
|
|||
if(!pollrc) {
|
||||
/* timeout! */
|
||||
ev->ms = 0;
|
||||
/* curl_mfprintf(stderr, "call curl_multi_socket_action(TIMEOUT)\n"); */
|
||||
#if 0
|
||||
curl_mfprintf(stderr, "call curl_multi_socket_action(TIMEOUT)\n");
|
||||
#endif
|
||||
mresult = curl_multi_socket_action(multi, CURL_SOCKET_TIMEOUT, 0,
|
||||
&ev->running_handles);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -986,8 +986,8 @@ CURLcode Curl_output_aws_sigv4(struct Curl_easy *data)
|
|||
goto fail;
|
||||
|
||||
result = canon_path(data->state.up.path, strlen(data->state.up.path),
|
||||
&canonical_path,
|
||||
should_urlencode(&service));
|
||||
&canonical_path,
|
||||
should_urlencode(&service));
|
||||
if(result)
|
||||
goto fail;
|
||||
result = CURLE_OUT_OF_MEMORY;
|
||||
|
|
|
|||
|
|
@ -565,7 +565,7 @@ static CURLcode imap_perform_upgrade_tls(struct Curl_easy *data,
|
|||
DEBUGASSERT(!imapc->ssldone);
|
||||
result = Curl_conn_connect(data, FIRSTSOCKET, FALSE, &ssldone);
|
||||
DEBUGF(infof(data, "imap_perform_upgrade_tls, connect -> %d, %d",
|
||||
result, ssldone));
|
||||
result, ssldone));
|
||||
if(!result && ssldone) {
|
||||
imapc->ssldone = ssldone;
|
||||
/* perform CAPA now, changes imapc->state out of IMAP_UPGRADETLS */
|
||||
|
|
@ -866,6 +866,7 @@ static CURLcode imap_perform_append(struct Curl_easy *data,
|
|||
/* Prepare the mime data if some. */
|
||||
if(IS_MIME_POST(data)) {
|
||||
curl_mimepart *postp = data->set.mimepostp;
|
||||
|
||||
/* Use the whole structure as data. */
|
||||
postp->flags &= ~(unsigned int)MIME_BODY_ONLY;
|
||||
|
||||
|
|
|
|||
91
lib/md4.c
91
lib/md4.c
|
|
@ -86,14 +86,14 @@ static int MD4_Init(MD4_CTX *ctx)
|
|||
return CC_MD4_Init(ctx);
|
||||
}
|
||||
|
||||
static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size)
|
||||
static void MD4_Update(MD4_CTX *ctx, const void *input, unsigned long len)
|
||||
{
|
||||
(void)CC_MD4_Update(ctx, data, (CC_LONG)size);
|
||||
(void)CC_MD4_Update(ctx, input, (CC_LONG)len);
|
||||
}
|
||||
|
||||
static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
|
||||
static void MD4_Final(unsigned char *digest, MD4_CTX *ctx)
|
||||
{
|
||||
(void)CC_MD4_Final(result, ctx);
|
||||
(void)CC_MD4_Final(digest, ctx);
|
||||
}
|
||||
|
||||
#elif defined(USE_WIN32_CRYPTO)
|
||||
|
|
@ -122,18 +122,18 @@ static int MD4_Init(MD4_CTX *ctx)
|
|||
return 1;
|
||||
}
|
||||
|
||||
static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size)
|
||||
static void MD4_Update(MD4_CTX *ctx, const void *input, unsigned long len)
|
||||
{
|
||||
CryptHashData(ctx->hHash, (const BYTE *)data, (unsigned int)size, 0);
|
||||
CryptHashData(ctx->hHash, (const BYTE *)input, (unsigned int)len, 0);
|
||||
}
|
||||
|
||||
static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
|
||||
static void MD4_Final(unsigned char *digest, MD4_CTX *ctx)
|
||||
{
|
||||
unsigned long length = 0;
|
||||
|
||||
CryptGetHashParam(ctx->hHash, HP_HASHVAL, NULL, &length, 0);
|
||||
if(length == MD4_DIGEST_LENGTH)
|
||||
CryptGetHashParam(ctx->hHash, HP_HASHVAL, result, &length, 0);
|
||||
CryptGetHashParam(ctx->hHash, HP_HASHVAL, digest, &length, 0);
|
||||
|
||||
if(ctx->hHash)
|
||||
CryptDestroyHash(ctx->hHash);
|
||||
|
|
@ -152,14 +152,14 @@ static int MD4_Init(MD4_CTX *ctx)
|
|||
return 1;
|
||||
}
|
||||
|
||||
static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size)
|
||||
static void MD4_Update(MD4_CTX *ctx, const void *input, unsigned long len)
|
||||
{
|
||||
md4_update(ctx, size, data);
|
||||
md4_update(ctx, len, input);
|
||||
}
|
||||
|
||||
static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
|
||||
static void MD4_Final(unsigned char *digest, MD4_CTX *ctx)
|
||||
{
|
||||
md4_digest(ctx, MD4_DIGEST_SIZE, result);
|
||||
md4_digest(ctx, MD4_DIGEST_SIZE, digest);
|
||||
}
|
||||
|
||||
#else
|
||||
|
|
@ -240,12 +240,12 @@ typedef struct md4_ctx MD4_CTX;
|
|||
* the bit counters. There are no alignment requirements.
|
||||
*/
|
||||
static const void *my_md4_body(MD4_CTX *ctx,
|
||||
const void *data, unsigned long size)
|
||||
const void *input, unsigned long size)
|
||||
{
|
||||
const unsigned char *ptr;
|
||||
uint32_t a, b, c, d;
|
||||
|
||||
ptr = (const unsigned char *)data;
|
||||
ptr = (const unsigned char *)input;
|
||||
|
||||
a = ctx->a;
|
||||
b = ctx->b;
|
||||
|
|
@ -339,45 +339,46 @@ static int MD4_Init(MD4_CTX *ctx)
|
|||
|
||||
ctx->lo = 0;
|
||||
ctx->hi = 0;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void MD4_Update(MD4_CTX *ctx, const void *data, unsigned long size)
|
||||
static void MD4_Update(MD4_CTX *ctx, const void *input, unsigned long len)
|
||||
{
|
||||
uint32_t saved_lo;
|
||||
unsigned long used;
|
||||
|
||||
saved_lo = ctx->lo;
|
||||
ctx->lo = (saved_lo + size) & 0x1fffffff;
|
||||
ctx->lo = (saved_lo + len) & 0x1fffffff;
|
||||
if(ctx->lo < saved_lo)
|
||||
ctx->hi++;
|
||||
ctx->hi += (uint32_t)size >> 29;
|
||||
ctx->hi += (uint32_t)len >> 29;
|
||||
|
||||
used = saved_lo & 0x3f;
|
||||
|
||||
if(used) {
|
||||
unsigned long available = 64 - used;
|
||||
|
||||
if(size < available) {
|
||||
memcpy(&ctx->buffer[used], data, size);
|
||||
if(len < available) {
|
||||
memcpy(&ctx->buffer[used], input, len);
|
||||
return;
|
||||
}
|
||||
|
||||
memcpy(&ctx->buffer[used], data, available);
|
||||
data = (const unsigned char *)data + available;
|
||||
size -= available;
|
||||
memcpy(&ctx->buffer[used], input, available);
|
||||
input = (const unsigned char *)input + available;
|
||||
len -= available;
|
||||
my_md4_body(ctx, ctx->buffer, 64);
|
||||
}
|
||||
|
||||
if(size >= 64) {
|
||||
data = my_md4_body(ctx, data, size & ~(unsigned long)0x3f);
|
||||
size &= 0x3f;
|
||||
if(len >= 64) {
|
||||
input = my_md4_body(ctx, input, len & ~(unsigned long)0x3f);
|
||||
len &= 0x3f;
|
||||
}
|
||||
|
||||
memcpy(ctx->buffer, data, size);
|
||||
memcpy(ctx->buffer, input, len);
|
||||
}
|
||||
|
||||
static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
|
||||
static void MD4_Final(unsigned char *digest, MD4_CTX *ctx)
|
||||
{
|
||||
unsigned long used, available;
|
||||
|
||||
|
|
@ -408,30 +409,30 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
|
|||
|
||||
my_md4_body(ctx, ctx->buffer, 64);
|
||||
|
||||
result[0] = curlx_ultouc((ctx->a) & 0xff);
|
||||
result[1] = curlx_ultouc((ctx->a >> 8) & 0xff);
|
||||
result[2] = curlx_ultouc((ctx->a >> 16) & 0xff);
|
||||
result[3] = curlx_ultouc(ctx->a >> 24);
|
||||
result[4] = curlx_ultouc((ctx->b) & 0xff);
|
||||
result[5] = curlx_ultouc((ctx->b >> 8) & 0xff);
|
||||
result[6] = curlx_ultouc((ctx->b >> 16) & 0xff);
|
||||
result[7] = curlx_ultouc(ctx->b >> 24);
|
||||
result[8] = curlx_ultouc((ctx->c) & 0xff);
|
||||
result[9] = curlx_ultouc((ctx->c >> 8) & 0xff);
|
||||
result[10] = curlx_ultouc((ctx->c >> 16) & 0xff);
|
||||
result[11] = curlx_ultouc(ctx->c >> 24);
|
||||
result[12] = curlx_ultouc((ctx->d) & 0xff);
|
||||
result[13] = curlx_ultouc((ctx->d >> 8) & 0xff);
|
||||
result[14] = curlx_ultouc((ctx->d >> 16) & 0xff);
|
||||
result[15] = curlx_ultouc(ctx->d >> 24);
|
||||
digest[0] = curlx_ultouc((ctx->a) & 0xff);
|
||||
digest[1] = curlx_ultouc((ctx->a >> 8) & 0xff);
|
||||
digest[2] = curlx_ultouc((ctx->a >> 16) & 0xff);
|
||||
digest[3] = curlx_ultouc(ctx->a >> 24);
|
||||
digest[4] = curlx_ultouc((ctx->b) & 0xff);
|
||||
digest[5] = curlx_ultouc((ctx->b >> 8) & 0xff);
|
||||
digest[6] = curlx_ultouc((ctx->b >> 16) & 0xff);
|
||||
digest[7] = curlx_ultouc(ctx->b >> 24);
|
||||
digest[8] = curlx_ultouc((ctx->c) & 0xff);
|
||||
digest[9] = curlx_ultouc((ctx->c >> 8) & 0xff);
|
||||
digest[10] = curlx_ultouc((ctx->c >> 16) & 0xff);
|
||||
digest[11] = curlx_ultouc(ctx->c >> 24);
|
||||
digest[12] = curlx_ultouc((ctx->d) & 0xff);
|
||||
digest[13] = curlx_ultouc((ctx->d >> 8) & 0xff);
|
||||
digest[14] = curlx_ultouc((ctx->d >> 16) & 0xff);
|
||||
digest[15] = curlx_ultouc(ctx->d >> 24);
|
||||
|
||||
memset(ctx, 0, sizeof(*ctx));
|
||||
}
|
||||
|
||||
#endif /* CRYPTO LIBS */
|
||||
|
||||
CURLcode Curl_md4it(unsigned char *output, const unsigned char *input,
|
||||
const size_t len)
|
||||
CURLcode Curl_md4it(unsigned char *output,
|
||||
const unsigned char *input, const size_t len)
|
||||
{
|
||||
MD4_CTX ctx;
|
||||
|
||||
|
|
|
|||
97
lib/md5.c
97
lib/md5.c
|
|
@ -87,10 +87,9 @@ static CURLcode my_md5_init(void *ctx)
|
|||
}
|
||||
|
||||
static void my_md5_update(void *ctx,
|
||||
const unsigned char *input,
|
||||
unsigned int inputLen)
|
||||
const unsigned char *input, unsigned int len)
|
||||
{
|
||||
md5_update(ctx, inputLen, input);
|
||||
md5_update(ctx, len, input);
|
||||
}
|
||||
|
||||
static void my_md5_final(unsigned char *digest, void *ctx)
|
||||
|
|
@ -112,8 +111,7 @@ static CURLcode my_md5_init(void *ctx)
|
|||
}
|
||||
|
||||
static void my_md5_update(void *ctx,
|
||||
const unsigned char *input,
|
||||
unsigned int len)
|
||||
const unsigned char *input, unsigned int len)
|
||||
{
|
||||
(void)MD5_Update(ctx, input, len);
|
||||
}
|
||||
|
|
@ -136,8 +134,7 @@ static CURLcode my_md5_init(void *ctx)
|
|||
}
|
||||
|
||||
static void my_md5_update(void *ctx,
|
||||
const unsigned char *input,
|
||||
unsigned int len)
|
||||
const unsigned char *input, unsigned int len)
|
||||
{
|
||||
(void)wolfSSL_MD5_Update(ctx, input, len);
|
||||
}
|
||||
|
|
@ -160,10 +157,9 @@ static CURLcode my_md5_init(void *ctx)
|
|||
}
|
||||
|
||||
static void my_md5_update(void *ctx,
|
||||
const unsigned char *data,
|
||||
unsigned int length)
|
||||
const unsigned char *input, unsigned int len)
|
||||
{
|
||||
(void)psa_hash_update(ctx, data, length);
|
||||
(void)psa_hash_update(ctx, input, len);
|
||||
}
|
||||
|
||||
static void my_md5_final(unsigned char *digest, void *ctx)
|
||||
|
|
@ -191,10 +187,9 @@ static CURLcode my_md5_init(void *ctx)
|
|||
}
|
||||
|
||||
static void my_md5_update(void *ctx,
|
||||
const unsigned char *input,
|
||||
unsigned int inputLen)
|
||||
const unsigned char *input, unsigned int len)
|
||||
{
|
||||
CC_MD5_Update(ctx, input, inputLen);
|
||||
CC_MD5_Update(ctx, input, len);
|
||||
}
|
||||
|
||||
static void my_md5_final(unsigned char *digest, void *ctx)
|
||||
|
|
@ -227,11 +222,10 @@ static CURLcode my_md5_init(void *in)
|
|||
}
|
||||
|
||||
static void my_md5_update(void *in,
|
||||
const unsigned char *input,
|
||||
unsigned int inputLen)
|
||||
const unsigned char *input, unsigned int len)
|
||||
{
|
||||
my_md5_ctx *ctx = in;
|
||||
CryptHashData(ctx->hHash, (const BYTE *)input, inputLen, 0);
|
||||
CryptHashData(ctx->hHash, (const BYTE *)input, len, 0);
|
||||
}
|
||||
|
||||
static void my_md5_final(unsigned char *digest, void *in)
|
||||
|
|
@ -452,44 +446,44 @@ static CURLcode my_md5_init(void *in)
|
|||
return CURLE_OK;
|
||||
}
|
||||
|
||||
static void my_md5_update(void *in, const unsigned char *data,
|
||||
unsigned int size)
|
||||
static void my_md5_update(void *in,
|
||||
const unsigned char *input, unsigned int len)
|
||||
{
|
||||
uint32_t saved_lo;
|
||||
unsigned int used;
|
||||
my_md5_ctx *ctx = (my_md5_ctx *)in;
|
||||
|
||||
saved_lo = ctx->lo;
|
||||
ctx->lo = (saved_lo + size) & 0x1fffffff;
|
||||
ctx->lo = (saved_lo + len) & 0x1fffffff;
|
||||
if(ctx->lo < saved_lo)
|
||||
ctx->hi++;
|
||||
ctx->hi += (uint32_t)size >> 29;
|
||||
ctx->hi += (uint32_t)len >> 29;
|
||||
|
||||
used = saved_lo & 0x3f;
|
||||
|
||||
if(used) {
|
||||
unsigned int available = 64 - used;
|
||||
|
||||
if(size < available) {
|
||||
memcpy(&ctx->buffer[used], data, size);
|
||||
if(len < available) {
|
||||
memcpy(&ctx->buffer[used], input, len);
|
||||
return;
|
||||
}
|
||||
|
||||
memcpy(&ctx->buffer[used], data, available);
|
||||
data = (const unsigned char *)data + available;
|
||||
size -= available;
|
||||
memcpy(&ctx->buffer[used], input, available);
|
||||
input = (const unsigned char *)input + available;
|
||||
len -= available;
|
||||
my_md5_body(ctx, ctx->buffer, 64);
|
||||
}
|
||||
|
||||
if(size >= 64) {
|
||||
data = my_md5_body(ctx, data, size & ~(unsigned long)0x3f);
|
||||
size &= 0x3f;
|
||||
if(len >= 64) {
|
||||
input = my_md5_body(ctx, input, len & ~(unsigned long)0x3f);
|
||||
len &= 0x3f;
|
||||
}
|
||||
|
||||
memcpy(ctx->buffer, data, size);
|
||||
memcpy(ctx->buffer, input, len);
|
||||
}
|
||||
|
||||
static void my_md5_final(unsigned char *result, void *in)
|
||||
static void my_md5_final(unsigned char *digest, void *in)
|
||||
{
|
||||
unsigned int used, available;
|
||||
my_md5_ctx *ctx = (my_md5_ctx *)in;
|
||||
|
|
@ -521,22 +515,22 @@ static void my_md5_final(unsigned char *result, void *in)
|
|||
|
||||
my_md5_body(ctx, ctx->buffer, 64);
|
||||
|
||||
result[0] = curlx_ultouc((ctx->a) & 0xff);
|
||||
result[1] = curlx_ultouc((ctx->a >> 8) & 0xff);
|
||||
result[2] = curlx_ultouc((ctx->a >> 16) & 0xff);
|
||||
result[3] = curlx_ultouc(ctx->a >> 24);
|
||||
result[4] = curlx_ultouc((ctx->b) & 0xff);
|
||||
result[5] = curlx_ultouc((ctx->b >> 8) & 0xff);
|
||||
result[6] = curlx_ultouc((ctx->b >> 16) & 0xff);
|
||||
result[7] = curlx_ultouc(ctx->b >> 24);
|
||||
result[8] = curlx_ultouc((ctx->c) & 0xff);
|
||||
result[9] = curlx_ultouc((ctx->c >> 8) & 0xff);
|
||||
result[10] = curlx_ultouc((ctx->c >> 16) & 0xff);
|
||||
result[11] = curlx_ultouc(ctx->c >> 24);
|
||||
result[12] = curlx_ultouc((ctx->d) & 0xff);
|
||||
result[13] = curlx_ultouc((ctx->d >> 8) & 0xff);
|
||||
result[14] = curlx_ultouc((ctx->d >> 16) & 0xff);
|
||||
result[15] = curlx_ultouc(ctx->d >> 24);
|
||||
digest[0] = curlx_ultouc((ctx->a) & 0xff);
|
||||
digest[1] = curlx_ultouc((ctx->a >> 8) & 0xff);
|
||||
digest[2] = curlx_ultouc((ctx->a >> 16) & 0xff);
|
||||
digest[3] = curlx_ultouc(ctx->a >> 24);
|
||||
digest[4] = curlx_ultouc((ctx->b) & 0xff);
|
||||
digest[5] = curlx_ultouc((ctx->b >> 8) & 0xff);
|
||||
digest[6] = curlx_ultouc((ctx->b >> 16) & 0xff);
|
||||
digest[7] = curlx_ultouc(ctx->b >> 24);
|
||||
digest[8] = curlx_ultouc((ctx->c) & 0xff);
|
||||
digest[9] = curlx_ultouc((ctx->c >> 8) & 0xff);
|
||||
digest[10] = curlx_ultouc((ctx->c >> 16) & 0xff);
|
||||
digest[11] = curlx_ultouc(ctx->c >> 24);
|
||||
digest[12] = curlx_ultouc((ctx->d) & 0xff);
|
||||
digest[13] = curlx_ultouc((ctx->d >> 8) & 0xff);
|
||||
digest[14] = curlx_ultouc((ctx->d >> 16) & 0xff);
|
||||
digest[15] = curlx_ultouc(ctx->d >> 24);
|
||||
|
||||
memset(ctx, 0, sizeof(*ctx));
|
||||
}
|
||||
|
|
@ -564,8 +558,8 @@ const struct MD5_params Curl_DIGEST_MD5 = {
|
|||
* @unittest: 1601
|
||||
* Returns CURLE_OK on success.
|
||||
*/
|
||||
CURLcode Curl_md5it(unsigned char *outbuffer, const unsigned char *input,
|
||||
const size_t len)
|
||||
CURLcode Curl_md5it(unsigned char *output,
|
||||
const unsigned char *input, const size_t len)
|
||||
{
|
||||
CURLcode result;
|
||||
my_md5_ctx ctx;
|
||||
|
|
@ -573,7 +567,7 @@ CURLcode Curl_md5it(unsigned char *outbuffer, const unsigned char *input,
|
|||
result = my_md5_init(&ctx);
|
||||
if(!result) {
|
||||
my_md5_update(&ctx, input, curlx_uztoui(len));
|
||||
my_md5_final(outbuffer, &ctx);
|
||||
my_md5_final(output, &ctx);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
@ -607,10 +601,9 @@ struct MD5_context *Curl_MD5_init(const struct MD5_params *md5params)
|
|||
}
|
||||
|
||||
CURLcode Curl_MD5_update(struct MD5_context *context,
|
||||
const unsigned char *data,
|
||||
unsigned int len)
|
||||
const unsigned char *input, unsigned int len)
|
||||
{
|
||||
(*context->md5_hash->md5_update_func)(context->md5_hashctx, data, len);
|
||||
(*context->md5_hash->md5_update_func)(context->md5_hashctx, input, len);
|
||||
|
||||
return CURLE_OK;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -495,7 +495,7 @@ static CURLcode pop3_perform_upgrade_tls(struct Curl_easy *data,
|
|||
DEBUGASSERT(!pop3c->ssldone);
|
||||
result = Curl_conn_connect(data, FIRSTSOCKET, FALSE, &ssldone);
|
||||
DEBUGF(infof(data, "pop3_perform_upgrade_tls, connect -> %d, %d",
|
||||
result, ssldone));
|
||||
result, ssldone));
|
||||
if(!result && ssldone) {
|
||||
pop3c->ssldone = ssldone;
|
||||
/* perform CAPA now, changes pop3c->state out of POP3_UPGRADETLS */
|
||||
|
|
|
|||
|
|
@ -292,7 +292,7 @@ static CURLcode req_flush(struct Curl_easy *data)
|
|||
return result;
|
||||
if(!Curl_bufq_is_empty(&data->req.sendbuf)) {
|
||||
DEBUGF(infof(data, "Curl_req_flush(len=%zu) -> EAGAIN",
|
||||
Curl_bufq_len(&data->req.sendbuf)));
|
||||
Curl_bufq_len(&data->req.sendbuf)));
|
||||
return CURLE_AGAIN;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,7 +71,6 @@
|
|||
* just as under Linux (e.g. <sys/socket.h>) and the Winsock headers should
|
||||
* never be included when __CYGWIN__ is defined.
|
||||
*/
|
||||
|
||||
#ifdef _WIN32
|
||||
# if defined(UNICODE) && !defined(_UNICODE)
|
||||
# error "UNICODE is defined but _UNICODE is not defined"
|
||||
|
|
@ -89,7 +88,6 @@
|
|||
* those symbols to compare against, and even those that do may be missing
|
||||
* newer symbols.
|
||||
*/
|
||||
|
||||
#ifndef _WIN32_WINNT_VISTA
|
||||
#define _WIN32_WINNT_VISTA 0x0600 /* Windows Vista */
|
||||
#endif
|
||||
|
|
|
|||
25
lib/smtp.c
25
lib/smtp.c
|
|
@ -433,7 +433,7 @@ static CURLcode cr_eob_read(struct Curl_easy *data,
|
|||
}
|
||||
*peos = (bool)ctx->eos;
|
||||
DEBUGF(infof(data, "cr_eob_read(%zu) -> %d, %zd, %d",
|
||||
blen, result, *pnread, *peos));
|
||||
blen, result, *pnread, *peos));
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
@ -700,7 +700,7 @@ static CURLcode smtp_perform_upgrade_tls(struct Curl_easy *data,
|
|||
DEBUGASSERT(!smtpc->ssldone);
|
||||
result = Curl_conn_connect(data, FIRSTSOCKET, FALSE, &ssldone);
|
||||
DEBUGF(infof(data, "smtp_perform_upgrade_tls, connect -> %d, %d",
|
||||
result, ssldone));
|
||||
result, ssldone));
|
||||
if(!result && ssldone) {
|
||||
smtpc->ssldone = ssldone;
|
||||
/* perform EHLO now, changes smtp->state out of SMTP_UPGRADETLS */
|
||||
|
|
@ -849,9 +849,10 @@ static CURLcode smtp_perform_command(struct Curl_easy *data,
|
|||
|
||||
/* Establish whether we should report SMTPUTF8 to the server for this
|
||||
mailbox as per RFC-6531 sect. 3.1 point 6 */
|
||||
utf8 = (smtpc->utf8_supported) &&
|
||||
((host.encalloc) || (!Curl_is_ASCII_name(address)) ||
|
||||
(!Curl_is_ASCII_name(host.name)));
|
||||
utf8 = smtpc->utf8_supported &&
|
||||
(host.encalloc ||
|
||||
!Curl_is_ASCII_name(address) ||
|
||||
!Curl_is_ASCII_name(host.name));
|
||||
|
||||
/* Send the VRFY command (Note: The hostname part may be absent when the
|
||||
host is a local system) */
|
||||
|
|
@ -924,9 +925,10 @@ static CURLcode smtp_perform_mail(struct Curl_easy *data,
|
|||
|
||||
/* Establish whether we should report SMTPUTF8 to the server for this
|
||||
mailbox as per RFC-6531 sect. 3.1 point 4 and sect. 3.4 */
|
||||
utf8 = (smtpc->utf8_supported) &&
|
||||
((host.encalloc) || (!Curl_is_ASCII_name(address)) ||
|
||||
(!Curl_is_ASCII_name(host.name)));
|
||||
utf8 = smtpc->utf8_supported &&
|
||||
(host.encalloc ||
|
||||
!Curl_is_ASCII_name(address) ||
|
||||
!Curl_is_ASCII_name(host.name));
|
||||
|
||||
if(host.name) {
|
||||
from = curl_maprintf("<%s@%s>%s", address, host.name, suffix);
|
||||
|
|
@ -965,9 +967,10 @@ static CURLcode smtp_perform_mail(struct Curl_easy *data,
|
|||
|
||||
/* Establish whether we should report SMTPUTF8 to the server for this
|
||||
mailbox as per RFC-6531 sect. 3.1 point 4 and sect. 3.4 */
|
||||
if((!utf8) && (smtpc->utf8_supported) &&
|
||||
((host.encalloc) || (!Curl_is_ASCII_name(address)) ||
|
||||
(!Curl_is_ASCII_name(host.name))))
|
||||
if(!utf8 && smtpc->utf8_supported &&
|
||||
(host.encalloc ||
|
||||
!Curl_is_ASCII_name(address) ||
|
||||
!Curl_is_ASCII_name(host.name)))
|
||||
utf8 = TRUE;
|
||||
|
||||
if(host.name) {
|
||||
|
|
|
|||
|
|
@ -254,8 +254,9 @@ static CURLcode sendrecv_dl(struct Curl_easy *data,
|
|||
if(bytestoread && Curl_rlimit_active(&data->progress.dl.rlimit)) {
|
||||
curl_off_t dl_avail = Curl_rlimit_avail(&data->progress.dl.rlimit,
|
||||
Curl_pgrs_now(data));
|
||||
/* DEBUGF(infof(data, "dl_rlimit, available=%" FMT_OFF_T, dl_avail));
|
||||
*/
|
||||
#if 0
|
||||
DEBUGF(infof(data, "dl_rlimit, available=%" FMT_OFF_T, dl_avail));
|
||||
#endif
|
||||
/* In case of rate limited downloads: if this loop already got
|
||||
* data and less than 16k is left in the limit, break out.
|
||||
* We want to stutter a bit to keep in the limit, but too small
|
||||
|
|
@ -278,7 +279,7 @@ static CURLcode sendrecv_dl(struct Curl_easy *data,
|
|||
if(data->req.download_done && data->req.no_body &&
|
||||
!data->req.resp_trailer) {
|
||||
DEBUGF(infof(data, "EAGAIN, download done, no trailer announced, "
|
||||
"not waiting for EOS"));
|
||||
"not waiting for EOS"));
|
||||
blen = 0;
|
||||
/* continue as if we received the EOS */
|
||||
}
|
||||
|
|
|
|||
19
lib/url.c
19
lib/url.c
|
|
@ -752,8 +752,8 @@ static bool ssh_config_matches(struct connectdata *one,
|
|||
|
||||
sshc1 = Curl_conn_meta_get(one, CURL_META_SSH_CONN);
|
||||
sshc2 = Curl_conn_meta_get(two, CURL_META_SSH_CONN);
|
||||
return (sshc1 && sshc2 && Curl_safecmp(sshc1->rsa, sshc2->rsa) &&
|
||||
Curl_safecmp(sshc1->rsa_pub, sshc2->rsa_pub));
|
||||
return sshc1 && sshc2 && Curl_safecmp(sshc1->rsa, sshc2->rsa) &&
|
||||
Curl_safecmp(sshc1->rsa_pub, sshc2->rsa_pub);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -990,21 +990,21 @@ static bool url_match_http_version(struct connectdata *conn,
|
|||
case 30:
|
||||
if(!(m->data->state.http_neg.allowed & CURL_HTTP_V3x)) {
|
||||
DEBUGF(infof(m->data, "not reusing conn #%" CURL_FORMAT_CURL_OFF_T
|
||||
", we do not want h3", conn->connection_id));
|
||||
", we do not want h3", conn->connection_id));
|
||||
return FALSE;
|
||||
}
|
||||
break;
|
||||
case 20:
|
||||
if(!(m->data->state.http_neg.allowed & CURL_HTTP_V2x)) {
|
||||
DEBUGF(infof(m->data, "not reusing conn #%" CURL_FORMAT_CURL_OFF_T
|
||||
", we do not want h2", conn->connection_id));
|
||||
", we do not want h2", conn->connection_id));
|
||||
return FALSE;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
if(!(m->data->state.http_neg.allowed & CURL_HTTP_V1x)) {
|
||||
DEBUGF(infof(m->data, "not reusing conn #%" CURL_FORMAT_CURL_OFF_T
|
||||
", we do not want h1", conn->connection_id));
|
||||
", we do not want h1", conn->connection_id));
|
||||
return FALSE;
|
||||
}
|
||||
break;
|
||||
|
|
@ -1081,9 +1081,9 @@ static bool url_match_destination(struct connectdata *conn,
|
|||
}
|
||||
/* We are in an IMAPS vs IMAP like case. We expect `conn` to have SSL */
|
||||
if(!Curl_conn_is_ssl(conn, FIRSTSOCKET)) {
|
||||
DEBUGF(infof(m->data,
|
||||
"Connection #%" FMT_OFF_T " has compatible protocol family, "
|
||||
"but no SSL, no match", conn->connection_id));
|
||||
DEBUGF(infof(m->data, "Connection #%" FMT_OFF_T
|
||||
" has compatible protocol family, but no SSL, no match",
|
||||
conn->connection_id));
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
|
@ -1109,8 +1109,7 @@ static bool url_match_ssl_config(struct connectdata *conn,
|
|||
/* If talking TLS, conn needs to use the same SSL options. */
|
||||
if((m->needle->scheme->flags & PROTOPT_SSL) &&
|
||||
!Curl_ssl_conn_config_match(m->data, conn, FALSE)) {
|
||||
DEBUGF(infof(m->data,
|
||||
"Connection #%" FMT_OFF_T
|
||||
DEBUGF(infof(m->data, "Connection #%" FMT_OFF_T
|
||||
" has different SSL parameters, cannot reuse",
|
||||
conn->connection_id));
|
||||
return FALSE;
|
||||
|
|
|
|||
|
|
@ -1607,7 +1607,6 @@ static CURLcode h3_stream_open(struct Curl_cfilter *cf,
|
|||
0, pnwritten);
|
||||
if(result)
|
||||
goto out;
|
||||
|
||||
if(!stream->h1.done) {
|
||||
/* need more data */
|
||||
goto out;
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
#include "../vtls/vtls.h"
|
||||
|
||||
/* HTTP/3 error values defined in RFC 9114, ch. 8.1 */
|
||||
#define CURL_H3_NO_ERROR (0x0100)
|
||||
#define CURL_H3_NO_ERROR 0x0100
|
||||
|
||||
#define QUIC_MAX_STREAMS (100)
|
||||
|
||||
|
|
|
|||
30
lib/ws.c
30
lib/ws.c
|
|
@ -58,18 +58,18 @@
|
|||
|N|V|V|V| |
|
||||
| |1|2|3| |
|
||||
*/
|
||||
#define WSBIT_FIN (0x80)
|
||||
#define WSBIT_RSV1 (0x40)
|
||||
#define WSBIT_RSV2 (0x20)
|
||||
#define WSBIT_RSV3 (0x10)
|
||||
#define WSBIT_FIN 0x80
|
||||
#define WSBIT_RSV1 0x40
|
||||
#define WSBIT_RSV2 0x20
|
||||
#define WSBIT_RSV3 0x10
|
||||
#define WSBIT_RSV_MASK (WSBIT_RSV1 | WSBIT_RSV2 | WSBIT_RSV3)
|
||||
#define WSBIT_OPCODE_CONT (0x0)
|
||||
#define WSBIT_OPCODE_TEXT (0x1)
|
||||
#define WSBIT_OPCODE_BIN (0x2)
|
||||
#define WSBIT_OPCODE_CLOSE (0x8)
|
||||
#define WSBIT_OPCODE_PING (0x9)
|
||||
#define WSBIT_OPCODE_PONG (0xa)
|
||||
#define WSBIT_OPCODE_MASK (0xf)
|
||||
#define WSBIT_OPCODE_CONT 0x0
|
||||
#define WSBIT_OPCODE_TEXT 0x1
|
||||
#define WSBIT_OPCODE_BIN 0x2
|
||||
#define WSBIT_OPCODE_CLOSE 0x8
|
||||
#define WSBIT_OPCODE_PING 0x9
|
||||
#define WSBIT_OPCODE_PONG 0xa
|
||||
#define WSBIT_OPCODE_MASK 0xf
|
||||
|
||||
#define WSBIT_MASK 0x80
|
||||
|
||||
|
|
@ -387,7 +387,9 @@ static CURLcode ws_dec_read_head(struct ws_decoder *dec,
|
|||
}
|
||||
|
||||
dec->head_len = 1;
|
||||
/* ws_dec_info(dec, data, "seeing opcode"); */
|
||||
#if 0
|
||||
ws_dec_info(dec, data, "seeing opcode");
|
||||
#endif
|
||||
continue;
|
||||
}
|
||||
else if(dec->head_len == 1) {
|
||||
|
|
@ -439,7 +441,9 @@ static CURLcode ws_dec_read_head(struct ws_decoder *dec,
|
|||
Curl_bufq_skip(inraw, 1);
|
||||
++dec->head_len;
|
||||
if(dec->head_len < dec->head_total) {
|
||||
/* ws_dec_info(dec, data, "decoding head"); */
|
||||
#if 0
|
||||
ws_dec_info(dec, data, "decoding head");
|
||||
#endif
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue