Commit 62970da6 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Removed security.h since it shadows an include file mingw needs when building 

for SSPI support. The contents of the file has been moved into the krb4.h file.
parent 8ed31c48

lib/ftp.c

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ 
#include "ftp.h"



#ifdef HAVE_KRB4

#include "security.h"

#include "krb4.h"

#endif

lib/krb4.c

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ 
#ifndef CURL_DISABLE_FTP

#ifdef HAVE_KRB4



#include "security.h"

#include "base64.h"

#include <stdlib.h>

#ifdef HAVE_NETDB_H

#include <netdb.h>
@@ -57,6 +55,8 @@ 
#include <unistd.h> /* for getpid() */

#endif



#include "urldata.h"

#include "base64.h"

#include "ftp.h"

#include "sendf.h"

#include "krb4.h"

lib/krb4.h

+43 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___ 

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -22,6 +22,48 @@ 
 *

 * $Id$

 ***************************************************************************/



struct Curl_sec_client_mech {

  const char *name;

  size_t size;

  int (*init)(void *);

  int (*auth)(void *, struct connectdata *);

  void (*end)(void *);

  int (*check_prot)(void *, int);

  int (*overhead)(void *, int, int);

  int (*encode)(void *, void*, int, int, void**, struct connectdata *);

  int (*decode)(void *, void*, int, int, struct connectdata *);

};





#define AUTH_OK         0

#define AUTH_CONTINUE   1

#define AUTH_ERROR      2



extern struct Curl_sec_client_mech Curl_krb4_client_mech;



CURLcode Curl_krb_kauth(struct connectdata *conn);

int Curl_sec_fflush_fd(struct connectdata *conn, int fd);

int Curl_sec_fprintf (struct connectdata *, FILE *, const char *, ...);

int Curl_sec_getc (struct connectdata *conn, FILE *);

int Curl_sec_putc (struct connectdata *conn, int, FILE *);

int Curl_sec_read (struct connectdata *conn, int, void *, int);

int Curl_sec_read_msg (struct connectdata *conn, char *, int);



int Curl_sec_vfprintf(struct connectdata *, FILE *, const char *, va_list);

int Curl_sec_fprintf2(struct connectdata *conn, FILE *f, const char *fmt, ...);

int Curl_sec_vfprintf2(struct connectdata *conn, FILE *, const char *, va_list);

int Curl_sec_write (struct connectdata *conn, int, char *, int);



void Curl_sec_end (struct connectdata *);

int Curl_sec_login (struct connectdata *);

void Curl_sec_prot (int, char **);

int Curl_sec_request_prot (struct connectdata *conn, const char *level);

void Curl_sec_set_protection_level(struct connectdata *conn);

void Curl_sec_status (void);



enum protection_level Curl_set_command_prot(struct connectdata *,

                                            enum protection_level);





#endif

lib/security.c

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#define _MPRINTF_REPLACE /* we want curl-functions instead of native ones */

#include <curl/mprintf.h>



#include "security.h"

#include <stdlib.h>

#include <string.h>

#include <netdb.h>
@@ -55,6 +54,8 @@ 
#include <unistd.h>

#endif



#include "urldata.h"

#include "krb4.h"

#include "base64.h"

#include "sendf.h"

#include "ftp.h"

lib/security.h

deleted100644 → 0
+0 −72
Original line number Diff line number Diff line 
#ifndef __SECURITY_H

#define __SECURITY_H

/***************************************************************************

 *                                  _   _ ____  _

 *  Project                     ___| | | |  _ \| |

 *                             / __| | | | |_) | |

 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms

 * are also available at http://curl.haxx.se/docs/copyright.html.

 *

 * You may opt to use, copy, modify, merge, publish, distribute and/or sell

 * copies of the Software, and permit persons to whom the Software is

 * furnished to do so, under the terms of the COPYING file.

 *

 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

 * KIND, either express or implied.

 *

 * $Id$

 ***************************************************************************/



/* this is a re-write */



#include <stdarg.h>

#include "urldata.h"  /* for struct connectdata * */



struct Curl_sec_client_mech {

  const char *name;

  size_t size;

  int (*init)(void *);

  int (*auth)(void *, struct connectdata *);

  void (*end)(void *);

  int (*check_prot)(void *, int);

  int (*overhead)(void *, int, int);

  int (*encode)(void *, void*, int, int, void**, struct connectdata *);

  int (*decode)(void *, void*, int, int, struct connectdata *);

};





#define AUTH_OK         0

#define AUTH_CONTINUE   1

#define AUTH_ERROR      2



extern struct Curl_sec_client_mech Curl_krb4_client_mech;



int Curl_sec_fflush_fd(struct connectdata *conn, int fd);

int Curl_sec_fprintf (struct connectdata *, FILE *, const char *, ...);

int Curl_sec_getc (struct connectdata *conn, FILE *);

int Curl_sec_putc (struct connectdata *conn, int, FILE *);

int Curl_sec_read (struct connectdata *conn, int, void *, int);

int Curl_sec_read_msg (struct connectdata *conn, char *, int);



int Curl_sec_vfprintf(struct connectdata *, FILE *, const char *, va_list);

int Curl_sec_fprintf2(struct connectdata *conn, FILE *f, const char *fmt, ...);

int Curl_sec_vfprintf2(struct connectdata *conn, FILE *, const char *, va_list);

int Curl_sec_write (struct connectdata *conn, int, char *, int);



void Curl_sec_end (struct connectdata *);

int Curl_sec_login (struct connectdata *);

void Curl_sec_prot (int, char **);

int Curl_sec_request_prot (struct connectdata *conn, const char *level);

void Curl_sec_set_protection_level(struct connectdata *conn);

void Curl_sec_status (void);



enum protection_level Curl_set_command_prot(struct connectdata *,

                                            enum protection_level);



#endif