Commit 215f932e authored by Steve Holme's avatar Steve Holme
Browse files

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.
parent 076c0ab6

lib/curl_sspi.h

+8 −1
Original line number Diff line number Diff line
@@ -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 */

lib/socks_sspi.c

+1 −7
Original line number Diff line number Diff line
@@ -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
@@ -42,12 +42,6 @@ 
/* The last #include file should be: */

#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.

 */