Commit 8d78848a authored by Marc Hoersken's avatar Marc Hoersken Committed by Daniel Stenberg
Browse files

schannel: Moved interal struct types to urldata.h 

Moved type definitions in order to avoid inclusion loop
parent 90412c86

lib/curl_schannel.c

+0 −1
Original line number Diff line number Diff line
@@ -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"

lib/curl_schannel.h

+1 −9
Original line number Diff line number Diff line
@@ -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);

lib/urldata.h

+15 −1
Original line number Diff line number Diff line
@@ -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,