diff options
| -rw-r--r-- | lib/curl_sspi.h | 9 | ||||
| -rw-r--r-- | lib/socks_sspi.c | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/lib/curl_sspi.h b/lib/curl_sspi.h index 812d7a849..5ab17d5fd 100644 --- a/lib/curl_sspi.h +++ b/lib/curl_sspi.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2014, 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 @@ -304,5 +304,12 @@ extern PSecurityFunctionTable s_pSecFn; (unsigned long)SEC_WINNT_AUTH_IDENTITY_ANSI #endif +/* + * Definitions required from ntsecapi.h are directly provided below this point + * to avoid including ntsecapi.h due to a conflict with OpenSSL's safestack.h + */ +#define KERB_WRAP_NO_ENCRYPT 0x80000001 + #endif /* USE_WINDOWS_SSPI */ + #endif /* HEADER_CURL_SSPI_H */ diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c index ed005b6f5..82684e0a3 100644 --- a/lib/socks_sspi.c +++ b/lib/socks_sspi.c @@ -6,7 +6,7 @@ * \___|\___/|_| \_\_____| * * Copyright (C) 2009, 2011, Markus Moeller, <markus_moeller@compuserve.com> - * Copyright (C) 2012 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2012 - 2014, 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 @@ -43,12 +43,6 @@ #include "memdebug.h" /* - * Definitions required from ntsecapi.h are directly provided below this point - * to avoid including ntsecapi.h due to a conflict with OpenSSL's safestack.h - */ -#define KERB_WRAP_NO_ENCRYPT 0x80000001 - -/* * Helper sspi error functions. */ static int check_sspi_err(struct connectdata *conn, |