generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

schannel: Moved interal struct types to urldata.h

Browse Source 
Moved type definitions in order to avoid inclusion loop
This commit is contained in:
Marc Hoersken 2012-04-13 13:04:53 +02:00 committed by Daniel Stenberg
parent 90412c8613
commit 8d78848a39
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/curl_schannel.c
View File

@ -56,7 +56,6 @@
#ifdef USE_WINDOWS_SSPI
#ifdef USE_SCHANNEL
#include "urldata.h"
#include "curl_sspi.h"
#include "curl_schannel.h"
#include "sslgen.h"

10
lib/curl_schannel.h
View File

@ -26,21 +26,13 @@
#ifdef USE_WINDOWS_SSPI
#ifdef USE_SCHANNEL
#include <schnlsp.h>
#include "urldata.h"
#ifndef UNISP_NAME_A
#define UNISP_NAME_A "Microsoft Unified Security Protocol Provider"
#endif
typedef struct curl_schannel_cred {
CredHandle cred_handle;
TimeStamp time_stamp;
} curl_schannel_cred;
typedef struct curl_schannel_ctxt {
CtxtHandle ctxt_handle;
TimeStamp time_stamp;
} curl_schannel_ctxt;
CURLcode Curl_schannel_connect(struct connectdata *conn, int sockindex);

16
lib/urldata.h
View File

@ -133,7 +133,8 @@
#ifdef USE_SCHANNEL
#include "curl_sspi.h"
#include "curl_schannel.h"
#include <schnlsp.h>
#include <schannel.h>
#endif
#ifdef HAVE_NETINET_IN_H
@ -219,6 +220,19 @@ enum protection_level {
};
#endif
#ifdef USE_SCHANNEL
/* Structs to store Schannel handles */
typedef struct curl_schannel_cred {
CredHandle cred_handle;
TimeStamp time_stamp;
} curl_schannel_cred;
typedef struct curl_schannel_ctxt {
CtxtHandle ctxt_handle;
TimeStamp time_stamp;
} curl_schannel_ctxt;
#endif
/* enum for the nonblocking SSL connection state machine */
typedef enum {
ssl_connect_1,