diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2014-08-13 22:59:28 +0100 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2014-08-14 01:05:52 +0100 |
| commit | 215f932e4925a402df10f8a3de469079cf9b617f (patch) | |
| tree | fbd6613e5b0df30ee84796810fae984811e73aae /lib/curl_sspi.h | |
| parent | 076c0ab68368d267713a0079b9509253715201da (diff) | |
sspi: Moved KERB_WRAP_NO_ENCRYPT from socks_sspi module
In preparation for the upcoming SSPI implementation of GSSAPI
authentication, moved the definition of KERB_WRAP_NO_ENCRYPT from
socks_sspi.c to curl_sspi.h allowing it to be shared amongst other
SSPI based code.
Diffstat (limited to 'lib/curl_sspi.h')
| -rw-r--r-- | lib/curl_sspi.h | 9 |
1 files changed, 8 insertions, 1 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 */ |