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

nss: fix build after e60fe20fdf

Browse Source 
Curl_llist_alloc is now Curl_llist_init.

Closes https://github.com/curl/curl/pull/1391
This commit is contained in:
Marcel Raad 2017-04-05 23:25:28 +02:00
parent 1526912b98
commit c59fcdac90
No known key found for this signature in database
GPG Key ID: B7F13D981BBF1607
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/urldata.h
View File

@ -316,7 +316,7 @@ struct ssl_connect_data {
PRFileDesc *handle; PRFileDesc *handle;
char *client_nickname; char *client_nickname;
struct Curl_easy *data; struct Curl_easy *data;
struct curl_llist *obj_list; struct curl_llist obj_list;
PK11GenericObject *obj_clicert; PK11GenericObject *obj_clicert;
#elif defined(USE_GSKIT) #elif defined(USE_GSKIT)
gsk_handle handle; gsk_handle handle;

23
lib/vtls/nss.c
View File

@ -81,7 +81,7 @@ PRFileDesc *PR_ImportTCPSocket(PRInt32 osfd);
static PRLock *nss_initlock = NULL; static PRLock *nss_initlock = NULL;
static PRLock *nss_crllock = NULL; static PRLock *nss_crllock = NULL;
static PRLock *nss_findslot_lock = NULL; static PRLock *nss_findslot_lock = NULL;
static struct curl_llist *nss_crl_list = NULL; static struct curl_llist nss_crl_list;
static NSSInitContext *nss_context = NULL; static NSSInitContext *nss_context = NULL;
static volatile int initialized = 0; static volatile int initialized = 0;
@ -413,7 +413,7 @@ static CURLcode nss_create_object(struct ssl_connect_data *ssl,
if(!obj) if(!obj)
return result; return result;
if(!Curl_llist_insert_next(ssl->obj_list, ssl->obj_list->tail, obj)) { if(!Curl_llist_insert_next(&ssl->obj_list, ssl->obj_list.tail, obj)) {
PK11_DestroyGenericObject(obj); PK11_DestroyGenericObject(obj);
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
} }
@ -496,7 +496,7 @@ static CURLcode nss_cache_crl(SECItem *crl_der)
PR_Lock(nss_crllock); PR_Lock(nss_crllock);
/* 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 Curl_nss_cleanup() */
if(!Curl_llist_insert_next(nss_crl_list, nss_crl_list->tail, crl_der)) { if(!Curl_llist_insert_next(&nss_crl_list, nss_crl_list.tail, crl_der)) {
SECITEM_FreeItem(crl_der, PR_TRUE); SECITEM_FreeItem(crl_der, PR_TRUE);
PR_Unlock(nss_crllock); PR_Unlock(nss_crllock);
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
@ -1227,9 +1227,7 @@ static CURLcode nss_init(struct Curl_easy *data)
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 Curl_nss_cleanup() */
nss_crl_list = Curl_llist_alloc(nss_destroy_crl_item); Curl_llist_init(&nss_crl_list, nss_destroy_crl_item);
if(!nss_crl_list)
return CURLE_OUT_OF_MEMORY;
/* First we check if $SSL_DIR points to a valid dir */ /* First we check if $SSL_DIR points to a valid dir */
cert_dir = getenv("SSL_DIR"); cert_dir = getenv("SSL_DIR");
@ -1336,8 +1334,7 @@ void Curl_nss_cleanup(void)
} }
/* destroy all CRL items */ /* destroy all CRL items */
Curl_llist_destroy(nss_crl_list, NULL); Curl_llist_destroy(&nss_crl_list, NULL);
nss_crl_list = NULL;
PR_Unlock(nss_initlock); PR_Unlock(nss_initlock);
@ -1385,8 +1382,7 @@ static void nss_close(struct ssl_connect_data *connssl)
connssl->client_nickname = NULL; connssl->client_nickname = NULL;
/* destroy all NSS objects in order to avoid failure of NSS shutdown */ /* destroy all NSS objects in order to avoid failure of NSS shutdown */
Curl_llist_destroy(connssl->obj_list, NULL); Curl_llist_destroy(&connssl->obj_list, NULL);
connssl->obj_list = NULL;
connssl->obj_clicert = NULL; connssl->obj_clicert = NULL;
if(connssl->handle) { if(connssl->handle) {
@ -1636,8 +1632,7 @@ static CURLcode nss_fail_connect(struct ssl_connect_data *connssl,
} }
/* cleanup on connection failure */ /* cleanup on connection failure */
Curl_llist_destroy(connssl->obj_list, NULL); Curl_llist_destroy(&connssl->obj_list, NULL);
connssl->obj_list = NULL;
return curlerr; return curlerr;
} }
@ -1678,9 +1673,7 @@ static CURLcode nss_setup_connect(struct connectdata *conn, int sockindex)
connssl->data = data; connssl->data = data;
/* list of all NSS objects we need to destroy in Curl_nss_close() */ /* list of all NSS objects we need to destroy in Curl_nss_close() */
connssl->obj_list = Curl_llist_alloc(nss_destroy_object); Curl_llist_init(&connssl->obj_list, nss_destroy_object);
if(!connssl->obj_list)
return CURLE_OUT_OF_MEMORY;
/* FIXME. NSS doesn't support multiple databases open at the same time. */ /* FIXME. NSS doesn't support multiple databases open at the same time. */
PR_Lock(nss_initlock); PR_Lock(nss_initlock);