mirror of
https://github.com/curl/curl.git
synced 2024-12-21 06:50:10 +08:00
fc8e0dee30
- fix `DEBUGBUILD` guards that should be `UNITTESTS`, in libcurl code used by unit tests. - fix guards for libcurl functions used in unit tests only. - sync `UNITTEST` attribute between declarations and definitions. - drop `DEBUGBUILD` guard from test `unit2600`. - fix guards for libcurl HSTS code used by both a unit test (`unit1660`) and `test0446`. - update an existing AppVeyor CI job to test the issues fixed. This fixes building tests with `CURLDEBUG` enabled but `DEBUGBUILD` disabled. This can happen when building tests with CMake with `ENABLE_DEBUG=ON` in Release config, or with `ENABLE_CURLDEBUG=ON` and _without_ `ENABLE_DEBUG=ON`. Possibly also with autotools when using `--enable-curldebug` without `--enable-debug`. Test results: - before: https://ci.appveyor.com/project/curlorg/curl/builds/49835609 https://ci.appveyor.com/project/curlorg/curl/builds/49898529/job/k8qpbs8idby70smw https://github.com/curl/curl/actions/runs/9259078835/job/25470318167?pr=13798#step:13:821 - after: https://ci.appveyor.com/project/curlorg/curl/builds/49839255 (the two failures are unrelated, subject to PR #13705) Ref: #13592 (issue discovery) Ref: #13689 (CI testing this PR with `DEBUGBUILD`/`CURLDEBUG` combinations) Closes #13694
70 lines
2.4 KiB
C
70 lines
2.4 KiB
C
#ifndef HEADER_CURL_HSTS_H
|
|
#define HEADER_CURL_HSTS_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
#include "curl_setup.h"
|
|
|
|
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_HSTS)
|
|
#include <curl/curl.h>
|
|
#include "llist.h"
|
|
|
|
#if defined(DEBUGBUILD) || defined(UNITTESTS)
|
|
extern time_t deltatime;
|
|
#endif
|
|
|
|
struct stsentry {
|
|
struct Curl_llist_element node;
|
|
const char *host;
|
|
bool includeSubDomains;
|
|
curl_off_t expires; /* the timestamp of this entry's expiry */
|
|
};
|
|
|
|
/* The HSTS cache. Needs to be able to tailmatch host names. */
|
|
struct hsts {
|
|
struct Curl_llist list;
|
|
char *filename;
|
|
unsigned int flags;
|
|
};
|
|
|
|
struct hsts *Curl_hsts_init(void);
|
|
void Curl_hsts_cleanup(struct hsts **hp);
|
|
CURLcode Curl_hsts_parse(struct hsts *h, const char *hostname,
|
|
const char *sts);
|
|
struct stsentry *Curl_hsts(struct hsts *h, const char *hostname,
|
|
bool subdomain);
|
|
CURLcode Curl_hsts_save(struct Curl_easy *data, struct hsts *h,
|
|
const char *file);
|
|
CURLcode Curl_hsts_loadfile(struct Curl_easy *data,
|
|
struct hsts *h, const char *file);
|
|
CURLcode Curl_hsts_loadcb(struct Curl_easy *data,
|
|
struct hsts *h);
|
|
void Curl_hsts_loadfiles(struct Curl_easy *data);
|
|
#else
|
|
#define Curl_hsts_cleanup(x)
|
|
#define Curl_hsts_loadcb(x,y) CURLE_OK
|
|
#define Curl_hsts_save(x,y,z)
|
|
#define Curl_hsts_loadfiles(x)
|
|
#endif /* CURL_DISABLE_HTTP || CURL_DISABLE_HSTS */
|
|
#endif /* HEADER_CURL_HSTS_H */
|