Merge branch 'master' into lukeh/moonshot

This commit is contained in:
Luke Howard
2011-04-03 18:08:23 +10:00
6 changed files with 36 additions and 18 deletions

View File

@@ -895,13 +895,13 @@ GSSAPI_DEPRECATED GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_unseal
*/
GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
gss_encapsulate_token(const gss_buffer_t /* input_token */,
const gss_OID /* oid */,
gss_encapsulate_token(gss_const_buffer_t /* input_token */,
gss_const_OID /* oid */,
gss_buffer_t /* output_token */);
GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
gss_decapsulate_token(const gss_buffer_t /* input_token */,
const gss_OID /* oid */,
gss_decapsulate_token(gss_const_buffer_t /* input_token */,
gss_const_OID /* oid */,
gss_buffer_t /* output_token */);