From ff8fb8cdb04d7d18fea9122e1167fd9f1dc472ec Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 8 Jan 2001 22:02:23 +0000 Subject: krb4.c header file, no source header (yet) --- lib/krb4.h | 1 + 1 file changed, 1 insertion(+) create mode 100644 lib/krb4.h (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h new file mode 100644 index 000000000..36f35b4d6 --- /dev/null +++ b/lib/krb4.h @@ -0,0 +1 @@ +void krb_kauth(struct connectdata *conn); -- cgit v1.2.1 From e8b99d21e52fe26c95b11b47d2d0e1f343bdec59 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 9 Jan 2001 07:41:04 +0000 Subject: Added the curl source-header --- lib/krb4.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index 36f35b4d6..405035423 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -1 +1,27 @@ +#ifndef __KRB4_H +#define __KRB4_H +/***************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 2000, Daniel Stenberg, , et al. + * + * In order to be useful for every potential user, curl and libcurl are + * dual-licensed under the MPL and the MIT/X-derivate licenses. + * + * 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 MPL or the MIT/X-derivate + * licenses. You may pick one of these licenses. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + * $Id$ + *****************************************************************************/ void krb_kauth(struct connectdata *conn); + +#endif -- cgit v1.2.1 From ceb8f1cb223b9cec1a07022aba384f730751645e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 17 Aug 2001 10:10:15 +0000 Subject: Curl_ prefix --- lib/krb4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index 405035423..6880486c4 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -22,6 +22,6 @@ * * $Id$ *****************************************************************************/ -void krb_kauth(struct connectdata *conn); +void Curl_krb_kauth(struct connectdata *conn); #endif -- cgit v1.2.1 From 974f314f5785156af6983675aeb28313cc8ba2ea Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 19 Mar 2002 07:54:55 +0000 Subject: copyright string (year) update --- lib/krb4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index 6880486c4..fb65a0bdb 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2000, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2002, Daniel Stenberg, , et al. * * In order to be useful for every potential user, curl and libcurl are * dual-licensed under the MPL and the MIT/X-derivate licenses. -- cgit v1.2.1 From ba4e69bebc8f7f32f3bc7faa1e13e7580754075b Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 3 Sep 2002 11:52:59 +0000 Subject: updated source code boilerplate/header --- lib/krb4.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index fb65a0bdb..80570589c 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -1,6 +1,6 @@ #ifndef __KRB4_H #define __KRB4_H -/***************************************************************************** +/*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | * / __| | | | |_) | | @@ -9,19 +9,19 @@ * * Copyright (C) 1998 - 2002, Daniel Stenberg, , et al. * - * In order to be useful for every potential user, curl and libcurl are - * dual-licensed under the MPL and the MIT/X-derivate licenses. - * + * 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 MPL or the MIT/X-derivate - * licenses. You may pick one of these licenses. + * 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$ - *****************************************************************************/ + ***************************************************************************/ void Curl_krb_kauth(struct connectdata *conn); #endif -- cgit v1.2.1 From 2ad2a4bd9fb4dc5ef25f9291591174c0fccc0938 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 5 Dec 2002 11:26:20 +0000 Subject: changed proto for Curl_krb_kauth() --- lib/krb4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index 80570589c..ad314b5eb 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -22,6 +22,6 @@ * * $Id$ ***************************************************************************/ -void Curl_krb_kauth(struct connectdata *conn); +CURLcode Curl_krb_kauth(struct connectdata *conn); #endif -- cgit v1.2.1 From f26a338a54e04d0a6907f5d2479d8b0fa9daf297 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 16 Jan 2003 21:08:12 +0000 Subject: copyright year update in the source header --- lib/krb4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index ad314b5eb..0428441dc 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2002, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2003, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms -- cgit v1.2.1 From 053f6c85efd0bf698f73343989474d672d0563a8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 7 Jan 2004 09:19:33 +0000 Subject: updated year in the copyright string --- lib/krb4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index 0428441dc..cded35b5d 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2003, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms -- cgit v1.2.1 From 62970da6752495421543bddcefd0b8eedd6cbb13 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 14 Mar 2005 00:00:45 +0000 Subject: 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. --- lib/krb4.h | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index cded35b5d..9780a2bca 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2005, Daniel Stenberg, , 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 -- cgit v1.2.1 From 6e619393824922118317689ef59a73c556b7ef98 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 7 Apr 2005 15:27:13 +0000 Subject: GnuTLS support added. There's now a "generic" SSL layer that we use all over internally, with code provided by sslgen.c. All SSL-layer-specific code is then written in ssluse.c (for OpenSSL) and gtls.c (for GnuTLS). As far as possible, internals should not need to know what SSL layer that is in use. Building with GnuTLS currently makes two test cases fail. TODO.gnutls contains a few known outstanding issues for the GnuTLS support. GnuTLS support is enabled with configure --with-gnutls --- lib/krb4.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index 9780a2bca..c45c7c5f4 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -1,10 +1,10 @@ #ifndef __KRB4_H #define __KRB4_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * * Copyright (C) 1998 - 2005, Daniel Stenberg, , et al. @@ -12,7 +12,7 @@ * 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. -- cgit v1.2.1 From be0d17e812053bddd99e1d330c429399f17aee44 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 11 Nov 2006 21:34:43 +0000 Subject: cleaned up Curl_write() and the sub functions it uses for various protocols. They all now return ssize_t to Curl_write(). Unfortunately, Curl_read() is in a sorrier state but it too would benefit from a similar cleanup. --- lib/krb4.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index c45c7c5f4..f46416e62 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2005, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2006, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -53,7 +53,8 @@ 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); +ssize_t Curl_sec_send(struct connectdata *conn, int, char *, int); +int Curl_sec_write(struct connectdata *conn, int, char *, int); void Curl_sec_end (struct connectdata *); int Curl_sec_login (struct connectdata *); -- cgit v1.2.1 From 54967d2a3ab5559631407f7b7f67ef48c2dda6dd Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 1 Jul 2007 22:01:18 +0000 Subject: Thomas J. Moore provided a patch that introduces Kerberos5 support in libcurl. This also makes the options change name to --krb (from --krb4) and CURLOPT_KRBLEVEL (from CURLOPT_KRB4LEVEL) but the old names are still --- lib/krb4.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index f46416e62..405454ccb 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -40,7 +40,12 @@ struct Curl_sec_client_mech { #define AUTH_CONTINUE 1 #define AUTH_ERROR 2 +#ifdef HAVE_KRB4 extern struct Curl_sec_client_mech Curl_krb4_client_mech; +#endif +#ifdef HAVE_GSSAPI +extern struct Curl_sec_client_mech Curl_krb5_client_mech; +#endif CURLcode Curl_krb_kauth(struct connectdata *conn); int Curl_sec_fflush_fd(struct connectdata *conn, int fd); -- cgit v1.2.1 From e2b82b4325e2726a802b6202f2d011fb4988e41d Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Fri, 9 May 2008 11:27:54 +0000 Subject: - Make Curl_write and it's callees accept a const pointer, in preparation of tetetest's patch for curl_easy_send() --- lib/krb4.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index 405454ccb..43cf78d93 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -31,7 +31,7 @@ struct Curl_sec_client_mech { void (*end)(void *); int (*check_prot)(void *, int); int (*overhead)(void *, int, int); - int (*encode)(void *, void*, int, int, void**, struct connectdata *); + int (*encode)(void *, const void*, int, int, void**, struct connectdata *); int (*decode)(void *, void*, int, int, struct connectdata *); }; @@ -58,8 +58,8 @@ 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); -ssize_t Curl_sec_send(struct connectdata *conn, int, char *, int); -int Curl_sec_write(struct connectdata *conn, int, char *, int); +ssize_t Curl_sec_send(struct connectdata *conn, int, const char *, int); +int Curl_sec_write(struct connectdata *conn, int, const char *, int); void Curl_sec_end (struct connectdata *); int Curl_sec_login (struct connectdata *); -- cgit v1.2.1 From 2309b4e330b96bc2e1f8e36b6184015e59544037 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 24 Mar 2010 11:02:54 +0100 Subject: remove the CVSish $Id$ lines --- lib/krb4.h | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index 43cf78d93..81998b5eb 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -20,7 +20,6 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * - * $Id$ ***************************************************************************/ struct Curl_sec_client_mech { -- cgit v1.2.1 From d64bd82bdcb169d0647a80f00068cedd761f8163 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Fri, 7 May 2010 15:05:34 +0200 Subject: sendrecv: split the I/O handling into private handler Howard Chu brought the bulk work of this patch that properly moves out the sending and recving of data to the parts of the code that are properly responsible for the various ways of doing so. Daniel Stenberg assisted with polishing a few bits and fixed some minor flaws in the original patch. Another upside of this patch is that we now abuse CURLcodes less with the "magic" -1 return codes and instead use CURLE_AGAIN more consistently. --- lib/krb4.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index 81998b5eb..264279378 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2006, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -51,14 +51,11 @@ 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); -ssize_t Curl_sec_send(struct connectdata *conn, int, const char *, int); -int Curl_sec_write(struct connectdata *conn, int, const char *, int); void Curl_sec_end (struct connectdata *); int Curl_sec_login (struct connectdata *); -- cgit v1.2.1 From d23c59ecfc3d5a6b922a8d94a70c783d0fc69c05 Mon Sep 17 00:00:00 2001 From: Julien Chaffraix Date: Sun, 12 Sep 2010 15:41:44 -0700 Subject: security.c: Curl_sec_set_protection_level tweaking - Removed sec_prot_internal as it is now inlined in the function (this removed a redundant check). - Changed the prototype to return an error code. - Updated the method to use the new ftp_send_command function. - Added a level_to_char helper method to avoid relying on the compiler's bound checks. This default to the maximum security we have in case of a wrong input. --- lib/krb4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index 264279378..29a2578e4 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -61,7 +61,7 @@ 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); +int Curl_sec_set_protection_level(struct connectdata *conn); void Curl_sec_status (void); enum protection_level Curl_set_command_prot(struct connectdata *, -- cgit v1.2.1 From fc9f3698291d0ba59494207feed674e8d29d9c77 Mon Sep 17 00:00:00 2001 From: Julien Chaffraix Date: Sun, 26 Sep 2010 19:14:50 -0700 Subject: security.c: Fix Curl_sec_login after rewrite. Curl_sec_login was returning the opposite result that the code in ftp.c was expecting. Simplified the return code (using a CURLcode) so to see more clearly what is going on. --- lib/krb4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index 29a2578e4..5dc3971e4 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -58,7 +58,7 @@ int Curl_sec_fprintf2(struct connectdata *conn, FILE *f, const char *fmt, ...); int Curl_sec_vfprintf2(struct connectdata *conn, FILE *, const char *, va_list); void Curl_sec_end (struct connectdata *); -int Curl_sec_login (struct connectdata *); +CURLcode Curl_sec_login (struct connectdata *); void Curl_sec_prot (int, char **); int Curl_sec_request_prot (struct connectdata *conn, const char *level); int Curl_sec_set_protection_level(struct connectdata *conn); -- cgit v1.2.1 From e3811ed7c34ed1818dc246af54460fea0fc52c02 Mon Sep 17 00:00:00 2001 From: Julien Chaffraix Date: Sun, 26 Sep 2010 22:35:00 -0700 Subject: security.c: Remove Curl_sec_fflush_fd. The current implementation would make us send wrong data on a closed socket. We don't buffer our data so the method can be safely removed. --- lib/krb4.h | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index 5dc3971e4..5da1dc6ef 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -47,7 +47,6 @@ extern struct Curl_sec_client_mech Curl_krb5_client_mech; #endif 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 *); -- cgit v1.2.1 From 0152dbbe237928b9ebab9c47b4bcb17a4ae98190 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 18 Oct 2010 10:00:37 +0200 Subject: krb4: make a few functions static --- lib/krb4.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index 5da1dc6ef..09e7b27a5 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -60,11 +60,6 @@ void Curl_sec_end (struct connectdata *); CURLcode Curl_sec_login (struct connectdata *); void Curl_sec_prot (int, char **); int Curl_sec_request_prot (struct connectdata *conn, const char *level); -int 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 -- cgit v1.2.1 From d09a905751c2024f7dab0d1a9cb90421cf82011a Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 18 Oct 2010 16:20:13 +0200 Subject: krb4.h: removed unused prototypes --- lib/krb4.h | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index 09e7b27a5..537a1e140 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -47,19 +47,9 @@ extern struct Curl_sec_client_mech Curl_krb5_client_mech; #endif CURLcode Curl_krb_kauth(struct connectdata *conn); -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_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); - void Curl_sec_end (struct connectdata *); CURLcode 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_status (void); #endif -- cgit v1.2.1 From 8d59d69449c2a86c478699a50d920541aa106201 Mon Sep 17 00:00:00 2001 From: Julien Chaffraix Date: Sat, 13 Nov 2010 12:01:33 -0800 Subject: security: tighten enum protection_level usage. While changing Curl_sec_read_msg to accept an enum protection_level instead of an int, I went ahead and fixed the usage of the associated fields. Some code was assuming that prot_clear == 0. Fixed those to use the proper value. Added assertions prior to any code that would set the protection level. --- lib/krb4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index 537a1e140..b3b5ea763 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -47,7 +47,7 @@ extern struct Curl_sec_client_mech Curl_krb5_client_mech; #endif CURLcode Curl_krb_kauth(struct connectdata *conn); -int Curl_sec_read_msg (struct connectdata *conn, char *, int); +int Curl_sec_read_msg (struct connectdata *conn, char *, enum protection_level); void Curl_sec_end (struct connectdata *); CURLcode Curl_sec_login (struct connectdata *); int Curl_sec_request_prot (struct connectdata *conn, const char *level); -- cgit v1.2.1 From b903186fa0189ff241d756d25d07fdfe9885ae49 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 20 Apr 2011 15:17:42 +0200 Subject: source cleanup: unify look, style and indent levels By the use of a the new lib/checksrc.pl script that checks that our basic source style rules are followed. --- lib/krb4.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/krb4.h') diff --git a/lib/krb4.h b/lib/krb4.h index b3b5ea763..b0307122c 100644 --- a/lib/krb4.h +++ b/lib/krb4.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -47,7 +47,8 @@ extern struct Curl_sec_client_mech Curl_krb5_client_mech; #endif CURLcode Curl_krb_kauth(struct connectdata *conn); -int Curl_sec_read_msg (struct connectdata *conn, char *, enum protection_level); +int Curl_sec_read_msg (struct connectdata *conn, char *, + enum protection_level); void Curl_sec_end (struct connectdata *); CURLcode Curl_sec_login (struct connectdata *); int Curl_sec_request_prot (struct connectdata *conn, const char *level); -- cgit v1.2.1