moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-24 00:58:48 -05:00
Code Issues Releases Wiki Activity

nss: remove Curl_ prefix from static functions

Browse Source
This commit is contained in:
Daniel Stenberg 2021-01-13 08:36:10 +01:00
parent a3e1e6b3b4
commit 39df93a875
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
lib/vtls/nss.c
View File

@ -587,7 +587,7 @@ static CURLcode nss_cache_crl(SECItem *crl_der)
return CURLE_SSL_CRL_BADFILE; return CURLE_SSL_CRL_BADFILE;
} }
/* store the CRL item so that we can free it in Curl_nss_cleanup() */ /* store the CRL item so that we can free it in nss_cleanup() */
if(insert_wrapped_ptr(&nss_crl_list, crl_der) != CURLE_OK) { if(insert_wrapped_ptr(&nss_crl_list, crl_der) != CURLE_OK) {
if(SECSuccess == CERT_UncacheCRL(db, crl_der)) if(SECSuccess == CERT_UncacheCRL(db, crl_der))
SECITEM_FreeItem(crl_der, PR_TRUE); SECITEM_FreeItem(crl_der, PR_TRUE);
@ -1335,7 +1335,7 @@ static CURLcode nss_init_core(struct Curl_easy *data, const char *cert_dir)
infof(data, "Initializing NSS with certpath: %s\n", certpath); infof(data, "Initializing NSS with certpath: %s\n", certpath);
nss_context = NSS_InitContext(certpath, "", "", "", &initparams, nss_context = NSS_InitContext(certpath, "", "", "", &initparams,
NSS_INIT_READONLY | NSS_INIT_PK11RELOAD); NSS_INIT_READONLY | NSS_INIT_PK11RELOAD);
free(certpath); free(certpath);
if(nss_context != NULL) if(nss_context != NULL)
@ -1360,7 +1360,7 @@ static CURLcode nss_init_core(struct Curl_easy *data, const char *cert_dir)
} }
/* data might be NULL */ /* data might be NULL */
static CURLcode nss_init(struct Curl_easy *data) static CURLcode nss_setup(struct Curl_easy *data)
{ {
char *cert_dir; char *cert_dir;
struct_stat st; struct_stat st;
@ -1369,7 +1369,7 @@ static CURLcode nss_init(struct Curl_easy *data)
if(initialized) if(initialized)
return CURLE_OK; return CURLE_OK;
/* list of all CRL items we need to destroy in Curl_nss_cleanup() */ /* list of all CRL items we need to destroy in nss_cleanup() */
Curl_llist_init(&nss_crl_list, nss_destroy_crl_item); Curl_llist_init(&nss_crl_list, nss_destroy_crl_item);
/* First we check if $SSL_DIR points to a valid dir */ /* First we check if $SSL_DIR points to a valid dir */
@ -1423,7 +1423,7 @@ static CURLcode nss_init(struct Curl_easy *data)
* @retval 0 error initializing SSL * @retval 0 error initializing SSL
* @retval 1 SSL initialized successfully * @retval 1 SSL initialized successfully
*/ */
static int Curl_nss_init(void) static int nss_init(void)
{ {
/* curl_global_init() is not thread-safe so this test is ok */ /* curl_global_init() is not thread-safe so this test is ok */
if(nss_initlock == NULL) { if(nss_initlock == NULL) {
@ -1451,14 +1451,14 @@ CURLcode Curl_nss_force_init(struct Curl_easy *data)
} }
PR_Lock(nss_initlock); PR_Lock(nss_initlock);
result = nss_init(data); result = nss_setup(data);
PR_Unlock(nss_initlock); PR_Unlock(nss_initlock);
return result; return result;
} }
/* Global cleanup */ /* Global cleanup */
static void Curl_nss_cleanup(void) static void nss_cleanup(void)
{ {
/* This function isn't required to be threadsafe and this is only done /* This function isn't required to be threadsafe and this is only done
* as a safety feature. * as a safety feature.
@ -1498,7 +1498,7 @@ static void Curl_nss_cleanup(void)
* 0 means the connection has been closed * 0 means the connection has been closed
* -1 means the connection status is unknown * -1 means the connection status is unknown
*/ */
static int Curl_nss_check_cxn(struct connectdata *conn) static int nss_check_cxn(struct connectdata *conn)
{ {
struct ssl_connect_data *connssl = &conn->ssl[FIRSTSOCKET]; struct ssl_connect_data *connssl = &conn->ssl[FIRSTSOCKET];
struct ssl_backend_data *backend = connssl->backend; struct ssl_backend_data *backend = connssl->backend;
@ -1517,7 +1517,7 @@ static int Curl_nss_check_cxn(struct connectdata *conn)
return -1; /* connection status unknown */ return -1; /* connection status unknown */
} }
static void nss_close(struct ssl_connect_data *connssl) static void close_one(struct ssl_connect_data *connssl)
{ {
/* before the cleanup, check whether we are using a client certificate */ /* before the cleanup, check whether we are using a client certificate */
struct ssl_backend_data *backend = connssl->backend; struct ssl_backend_data *backend = connssl->backend;
@ -1547,7 +1547,7 @@ static void nss_close(struct ssl_connect_data *connssl)
/* /*
* This function is called when an SSL connection is closed. * This function is called when an SSL connection is closed.
*/ */
static void Curl_nss_close(struct connectdata *conn, int sockindex) static void nss_close(struct connectdata *conn, int sockindex)
{ {
struct ssl_connect_data *connssl = &conn->ssl[sockindex]; struct ssl_connect_data *connssl = &conn->ssl[sockindex];
#ifndef CURL_DISABLE_PROXY #ifndef CURL_DISABLE_PROXY
@ -1573,9 +1573,9 @@ static void Curl_nss_close(struct connectdata *conn, int sockindex)
a double close leading to crash. */ a double close leading to crash. */
connssl_proxy->backend->handle = NULL; connssl_proxy->backend->handle = NULL;
nss_close(connssl_proxy); close_one(connssl_proxy);
#endif #endif
nss_close(connssl); close_one(connssl);
} }
/* return true if NSS can provide error code (and possibly msg) for the /* return true if NSS can provide error code (and possibly msg) for the
@ -1853,7 +1853,7 @@ static CURLcode nss_setup_connect(struct connectdata *conn, int sockindex)
Curl_llist_init(&backend->obj_list, nss_destroy_object); Curl_llist_init(&backend->obj_list, nss_destroy_object);
PR_Lock(nss_initlock); PR_Lock(nss_initlock);
result = nss_init(conn->data); result = nss_setup(conn->data);
if(result) { if(result) {
PR_Unlock(nss_initlock); PR_Unlock(nss_initlock);
goto error; goto error;
@ -2249,13 +2249,13 @@ static CURLcode nss_connect_common(struct connectdata *conn, int sockindex,
return CURLE_OK; return CURLE_OK;
} }
static CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex) static CURLcode nss_connect(struct connectdata *conn, int sockindex)
{ {
return nss_connect_common(conn, sockindex, /* blocking */ NULL); return nss_connect_common(conn, sockindex, /* blocking */ NULL);
} }
static CURLcode Curl_nss_connect_nonblocking(struct connectdata *conn, static CURLcode nss_connect_nonblocking(struct connectdata *conn,
int sockindex, bool *done) int sockindex, bool *done)
{ {
return nss_connect_common(conn, sockindex, done); return nss_connect_common(conn, sockindex, done);
} }
@ -2339,7 +2339,7 @@ static ssize_t nss_recv(struct connectdata *conn, /* connection data */
return nread; return nread;
} }
static size_t Curl_nss_version(char *buffer, size_t size) static size_t nss_version(char *buffer, size_t size)
{ {
return msnprintf(buffer, size, "NSS/%s", NSS_GetVersion()); return msnprintf(buffer, size, "NSS/%s", NSS_GetVersion());
} }
@ -2352,9 +2352,9 @@ static int Curl_nss_seed(struct Curl_easy *data)
} }
/* data might be NULL */ /* data might be NULL */
static CURLcode Curl_nss_random(struct Curl_easy *data, static CURLcode nss_random(struct Curl_easy *data,
unsigned char *entropy, unsigned char *entropy,
size_t length) size_t length)
{ {
Curl_nss_seed(data); /* Initiate the seed if not already done */ Curl_nss_seed(data); /* Initiate the seed if not already done */
@ -2365,10 +2365,10 @@ static CURLcode Curl_nss_random(struct Curl_easy *data,
return CURLE_OK; return CURLE_OK;
} }
static CURLcode Curl_nss_md5sum(unsigned char *tmp, /* input */ static CURLcode nss_md5sum(unsigned char *tmp, /* input */
size_t tmplen, size_t tmplen,
unsigned char *md5sum, /* output */ unsigned char *md5sum, /* output */
size_t md5len) size_t md5len)
{ {
PK11Context *MD5pw = PK11_CreateDigestContext(SEC_OID_MD5); PK11Context *MD5pw = PK11_CreateDigestContext(SEC_OID_MD5);
unsigned int MD5out; unsigned int MD5out;
@ -2383,10 +2383,10 @@ static CURLcode Curl_nss_md5sum(unsigned char *tmp, /* input */
return CURLE_OK; return CURLE_OK;
} }
static CURLcode Curl_nss_sha256sum(const unsigned char *tmp, /* input */ static CURLcode nss_sha256sum(const unsigned char *tmp, /* input */
size_t tmplen, size_t tmplen,
unsigned char *sha256sum, /* output */ unsigned char *sha256sum, /* output */
size_t sha256len) size_t sha256len)
{ {
PK11Context *SHA256pw = PK11_CreateDigestContext(SEC_OID_SHA256); PK11Context *SHA256pw = PK11_CreateDigestContext(SEC_OID_SHA256);
unsigned int SHA256out; unsigned int SHA256out;
@ -2401,7 +2401,7 @@ static CURLcode Curl_nss_sha256sum(const unsigned char *tmp, /* input */
return CURLE_OK; return CURLE_OK;
} }
static bool Curl_nss_cert_status_request(void) static bool nss_cert_status_request(void)
{ {
#ifdef SSL_ENABLE_OCSP_STAPLING #ifdef SSL_ENABLE_OCSP_STAPLING
return TRUE; return TRUE;
@ -2410,7 +2410,7 @@ static bool Curl_nss_cert_status_request(void)
#endif #endif
} }
static bool Curl_nss_false_start(void) static bool nss_false_start(void)
{ {
#if NSSVERNUM >= 0x030f04 /* 3.15.4 */ #if NSSVERNUM >= 0x030f04 /* 3.15.4 */
return TRUE; return TRUE;
@ -2419,7 +2419,7 @@ static bool Curl_nss_false_start(void)
#endif #endif
} }
static void *Curl_nss_get_internals(struct ssl_connect_data *connssl, static void *nss_get_internals(struct ssl_connect_data *connssl,
CURLINFO info UNUSED_PARAM) CURLINFO info UNUSED_PARAM)
{ {
struct ssl_backend_data *backend = connssl->backend; struct ssl_backend_data *backend = connssl->backend;
@ -2437,28 +2437,28 @@ const struct Curl_ssl Curl_ssl_nss = {
sizeof(struct ssl_backend_data), sizeof(struct ssl_backend_data),
Curl_nss_init, /* init */ nss_init, /* init */
Curl_nss_cleanup, /* cleanup */ nss_cleanup, /* cleanup */
Curl_nss_version, /* version */ nss_version, /* version */
Curl_nss_check_cxn, /* check_cxn */ nss_check_cxn, /* check_cxn */
/* NSS has no shutdown function provided and thus always fail */ /* NSS has no shutdown function provided and thus always fail */
Curl_none_shutdown, /* shutdown */ Curl_none_shutdown, /* shutdown */
Curl_none_data_pending, /* data_pending */ Curl_none_data_pending, /* data_pending */
Curl_nss_random, /* random */ nss_random, /* random */
Curl_nss_cert_status_request, /* cert_status_request */ nss_cert_status_request, /* cert_status_request */
Curl_nss_connect, /* connect */ nss_connect, /* connect */
Curl_nss_connect_nonblocking, /* connect_nonblocking */ nss_connect_nonblocking, /* connect_nonblocking */
Curl_nss_get_internals, /* get_internals */ nss_get_internals, /* get_internals */
Curl_nss_close, /* close_one */ nss_close, /* close_one */
Curl_none_close_all, /* close_all */ Curl_none_close_all, /* close_all */
/* NSS has its own session ID cache */ /* NSS has its own session ID cache */
Curl_none_session_free, /* session_free */ Curl_none_session_free, /* session_free */
Curl_none_set_engine, /* set_engine */ Curl_none_set_engine, /* set_engine */
Curl_none_set_engine_default, /* set_engine_default */ Curl_none_set_engine_default, /* set_engine_default */
Curl_none_engines_list, /* engines_list */ Curl_none_engines_list, /* engines_list */
Curl_nss_false_start, /* false_start */ nss_false_start, /* false_start */
Curl_nss_md5sum, /* md5sum */ nss_md5sum, /* md5sum */
Curl_nss_sha256sum /* sha256sum */ nss_sha256sum /* sha256sum */
}; };
#endif /* USE_NSS */ #endif /* USE_NSS */