moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-01-10 21:48:10 -05:00
Code Issues Releases Wiki Activity

schannel: make it 'struct Curl_schannel*'

Browse Source 
As internal global names should use captical C.

Closes #5906
This commit is contained in:
Daniel Stenberg 2020-09-02 12:11:01 +02:00
parent 9e90ff0839
commit add7022666
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/vtls/schannel.c
View File

@ -420,7 +420,7 @@ schannel_connect_step1(struct connectdata *conn, int sockindex)
SCHANNEL_CRED schannel_cred; SCHANNEL_CRED schannel_cred;
PCCERT_CONTEXT client_certs[1] = { NULL }; PCCERT_CONTEXT client_certs[1] = { NULL };
SECURITY_STATUS sspi_status = SEC_E_OK; SECURITY_STATUS sspi_status = SEC_E_OK;
struct curl_schannel_cred *old_cred = NULL; struct Curl_schannel_cred *old_cred = NULL;
struct in_addr addr; struct in_addr addr;
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
struct in6_addr addr6; struct in6_addr addr6;
@ -780,8 +780,8 @@ schannel_connect_step1(struct connectdata *conn, int sockindex)
#endif #endif
/* allocate memory for the re-usable credential handle */ /* allocate memory for the re-usable credential handle */
BACKEND->cred = (struct curl_schannel_cred *) BACKEND->cred = (struct Curl_schannel_cred *)
calloc(1, sizeof(struct curl_schannel_cred)); calloc(1, sizeof(struct Curl_schannel_cred));
if(!BACKEND->cred) { if(!BACKEND->cred) {
failf(data, "schannel: unable to allocate memory"); failf(data, "schannel: unable to allocate memory");
@ -895,8 +895,8 @@ schannel_connect_step1(struct connectdata *conn, int sockindex)
ISC_REQ_STREAM; ISC_REQ_STREAM;
/* allocate memory for the security context handle */ /* allocate memory for the security context handle */
BACKEND->ctxt = (struct curl_schannel_ctxt *) BACKEND->ctxt = (struct Curl_schannel_ctxt *)
calloc(1, sizeof(struct curl_schannel_ctxt)); calloc(1, sizeof(struct Curl_schannel_ctxt));
if(!BACKEND->ctxt) { if(!BACKEND->ctxt) {
failf(data, "schannel: unable to allocate memory"); failf(data, "schannel: unable to allocate memory");
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
@ -1403,7 +1403,7 @@ schannel_connect_step3(struct connectdata *conn, int sockindex)
/* save the current session data for possible re-use */ /* save the current session data for possible re-use */
if(SSL_SET_OPTION(primary.sessionid)) { if(SSL_SET_OPTION(primary.sessionid)) {
bool incache; bool incache;
struct curl_schannel_cred *old_cred = NULL; struct Curl_schannel_cred *old_cred = NULL;
Curl_ssl_sessionid_lock(conn); Curl_ssl_sessionid_lock(conn);
incache = !(Curl_ssl_getsessionid(conn, (void **)&old_cred, NULL, incache = !(Curl_ssl_getsessionid(conn, (void **)&old_cred, NULL,
@ -1419,7 +1419,7 @@ schannel_connect_step3(struct connectdata *conn, int sockindex)
} }
if(!incache) { if(!incache) {
result = Curl_ssl_addsessionid(conn, (void *)BACKEND->cred, result = Curl_ssl_addsessionid(conn, (void *)BACKEND->cred,
sizeof(struct curl_schannel_cred), sizeof(struct Curl_schannel_cred),
sockindex); sockindex);
if(result) { if(result) {
Curl_ssl_sessionid_unlock(conn); Curl_ssl_sessionid_unlock(conn);
@ -2101,7 +2101,7 @@ static void Curl_schannel_close(struct connectdata *conn, int sockindex)
static void Curl_schannel_session_free(void *ptr) static void Curl_schannel_session_free(void *ptr)
{ {
/* this is expected to be called under sessionid lock */ /* this is expected to be called under sessionid lock */
struct curl_schannel_cred *cred = ptr; struct Curl_schannel_cred *cred = ptr;
cred->refcount--; cred->refcount--;
if(cred->refcount == 0) { if(cred->refcount == 0) {

10
lib/vtls/schannel.h
View File

@ -8,7 +8,7 @@
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 2012, Marc Hoersken, <info@marc-hoersken.de>, et al. * Copyright (C) 2012, Marc Hoersken, <info@marc-hoersken.de>, et al.
* Copyright (C) 2012 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2012 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -70,20 +70,20 @@ CURLcode Curl_verify_certificate(struct connectdata *conn, int sockindex);
#endif #endif
#endif #endif
struct curl_schannel_cred { struct Curl_schannel_cred {
CredHandle cred_handle; CredHandle cred_handle;
TimeStamp time_stamp; TimeStamp time_stamp;
int refcount; int refcount;
}; };
struct curl_schannel_ctxt { struct Curl_schannel_ctxt {
CtxtHandle ctxt_handle; CtxtHandle ctxt_handle;
TimeStamp time_stamp; TimeStamp time_stamp;
}; };
struct ssl_backend_data { struct ssl_backend_data {
struct curl_schannel_cred *cred; struct Curl_schannel_cred *cred;
struct curl_schannel_ctxt *ctxt; struct Curl_schannel_ctxt *ctxt;
SecPkgContext_StreamSizes stream_sizes; SecPkgContext_StreamSizes stream_sizes;
size_t encdata_length, decdata_length; size_t encdata_length, decdata_length;
size_t encdata_offset, decdata_offset; size_t encdata_offset, decdata_offset;