gsasl-compat.h   gsasl-compat.h 
/* gsasl-compat.h --- Header file for obsoleted features in GNU SASL Librar y. /* gsasl-compat.h --- Header file for obsoleted features in GNU SASL Librar y.
* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Jose fsson * Copyright (C) 2002-2012 Simon Josefsson
* *
* This file is part of GNU SASL Library. * This file is part of GNU SASL Library.
* *
* GNU SASL Library is free software; you can redistribute it and/or * GNU SASL Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1 of * as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version. * the License, or (at your option) any later version.
* *
* GNU SASL Library is distributed in the hope that it will be useful, * GNU SASL Library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
skipping to change at line 24 skipping to change at line 24
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License License along with GNU SASL Library; if not, write to the * License License along with GNU SASL Library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
* *
*/ */
#ifndef GSASL_COMPAT_H #ifndef GSASL_COMPAT_H
# define GSASL_COMPAT_H #define GSASL_COMPAT_H
#ifndef __attribute__ #ifndef __attribute__
/* This feature is available in gcc versions 2.5 and later. */ /* This feature is available in gcc versions 2.5 and later. */
# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
# define __attribute__(Spec) /* empty */ #define __attribute__(Spec) /* empty */
# endif #endif
#endif #endif
/* Old error codes */ /* Old error codes */
enum enum
{ {
GSASL_TOO_SMALL_BUFFER = 4, GSASL_TOO_SMALL_BUFFER = 4,
GSASL_FOPEN_ERROR = 5, GSASL_FOPEN_ERROR = 5,
GSASL_FCLOSE_ERROR = 6, GSASL_FCLOSE_ERROR = 6,
GSASL_GCRYPT_ERROR = GSASL_CRYPTO_ERROR, GSASL_GCRYPT_ERROR = GSASL_CRYPTO_ERROR,
GSASL_CANNOT_GET_CTX = 32, GSASL_CANNOT_GET_CTX = 32,
skipping to change at line 290 skipping to change at line 290
extern GSASL_API Gsasl_client_callback_qop extern GSASL_API Gsasl_client_callback_qop
gsasl_client_callback_qop_get (Gsasl * ctx) __attribute__ ((deprecated)); gsasl_client_callback_qop_get (Gsasl * ctx) __attribute__ ((deprecated));
extern GSASL_API void extern GSASL_API void
gsasl_client_callback_maxbuf_set (Gsasl * ctx, gsasl_client_callback_maxbuf_set (Gsasl * ctx,
Gsasl_client_callback_maxbuf cb) Gsasl_client_callback_maxbuf cb)
__attribute__ ((deprecated)); __attribute__ ((deprecated));
extern GSASL_API Gsasl_client_callback_maxbuf extern GSASL_API Gsasl_client_callback_maxbuf
gsasl_client_callback_maxbuf_get (Gsasl * ctx) __attribute__ ((deprecated)) ; gsasl_client_callback_maxbuf_get (Gsasl * ctx) __attribute__ ((deprecated)) ;
extern GSASL_API extern GSASL_API
void gsasl_client_callback_realm_set (Gsasl * ctx, void gsasl_client_callback_realm_set (Gsasl * ctx,
Gsasl_client_callback_realm cb) Gsasl_client_callback_realm cb)
__attribute__ ((deprecated)); __attribute__ ((deprecated));
extern GSASL_API Gsasl_client_callback_realm extern GSASL_API Gsasl_client_callback_realm
gsasl_client_callback_realm_get (Gsasl * ctx) __attribute__ ((deprecated)); gsasl_client_callback_realm_get (Gsasl * ctx) __attribute__ ((deprecated));
/* Obsolete server callbacks: callback-s.c */ /* Obsolete server callbacks: callback-s.c */
extern GSASL_API void extern GSASL_API void
gsasl_server_callback_validate_set (Gsasl * ctx, gsasl_server_callback_validate_set (Gsasl * ctx,
Gsasl_server_callback_validate cb) Gsasl_server_callback_validate cb)
__attribute__ ((deprecated)); __attribute__ ((deprecated));
extern GSASL_API Gsasl_server_callback_validate extern GSASL_API Gsasl_server_callback_validate
 End of changes. 4 change blocks. 
7 lines changed or deleted 7 lines changed or added


 gsasl-mech.h   gsasl-mech.h 
/* gsasl-mech.h --- Header file for mechanism handling in GNU SASL Library. /* gsasl-mech.h --- Header file for mechanism handling in GNU SASL Library.
* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Jose fsson * Copyright (C) 2002-2012 Simon Josefsson
* *
* This file is part of GNU SASL Library. * This file is part of GNU SASL Library.
* *
* GNU SASL Library is free software; you can redistribute it and/or * GNU SASL Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1 of * as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version. * the License, or (at your option) any later version.
* *
* GNU SASL Library is distributed in the hope that it will be useful, * GNU SASL Library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
skipping to change at line 24 skipping to change at line 24
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License License along with GNU SASL Library; if not, write to the * License License along with GNU SASL Library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
* *
*/ */
#ifndef GSASL_MECH_H #ifndef GSASL_MECH_H
# define GSASL_MECH_H #define GSASL_MECH_H
/* Mechanism function prototypes. */ /* Mechanism function prototypes. */
typedef int (*Gsasl_init_function) (Gsasl * ctx); typedef int (*Gsasl_init_function) (Gsasl * ctx);
typedef void (*Gsasl_done_function) (Gsasl * ctx); typedef void (*Gsasl_done_function) (Gsasl * ctx);
typedef int (*Gsasl_start_function) (Gsasl_session * sctx, void **mech_data ); typedef int (*Gsasl_start_function) (Gsasl_session * sctx, void **mech_data );
typedef int (*Gsasl_step_function) (Gsasl_session * sctx, void *mech_data, typedef int (*Gsasl_step_function) (Gsasl_session * sctx, void *mech_data,
const char *input, size_t input_len, const char *input, size_t input_len,
char **output, size_t * output_len); char **output, size_t * output_len);
typedef void (*Gsasl_finish_function) (Gsasl_session * sctx, void *mech_dat a); typedef void (*Gsasl_finish_function) (Gsasl_session * sctx, void *mech_dat a);
typedef int (*Gsasl_code_function) (Gsasl_session * sctx, void *mech_data, typedef int (*Gsasl_code_function) (Gsasl_session * sctx, void *mech_data,
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 gsasl.h   gsasl.h 
/* gsasl.h --- Header file for GNU SASL Library. /* gsasl.h --- Header file for GNU SASL Library.
* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Simo n Josefsson * Copyright (C) 2002-2012 Simon Josefsson
* *
* This file is part of GNU SASL Library. * This file is part of GNU SASL Library.
* *
* GNU SASL Library is free software; you can redistribute it and/or * GNU SASL Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1 of * as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version. * the License, or (at your option) any later version.
* *
* GNU SASL Library is distributed in the hope that it will be useful, * GNU SASL Library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
skipping to change at line 24 skipping to change at line 24
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License License along with GNU SASL Library; if not, write to the * License License along with GNU SASL Library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
* *
*/ */
#ifndef GSASL_H #ifndef GSASL_H
# define GSASL_H #define GSASL_H
# include <stdio.h> /* FILE */ #include <stdio.h> /* FILE */
# include <stddef.h> /* size_t */ #include <stddef.h> /* size_t */
# include <unistd.h> /* ssize_t */ #include <unistd.h> /* ssize_t */
# ifndef GSASL_API #ifndef GSASL_API
# if defined GSASL_BUILDING && defined HAVE_VISIBILITY && HAVE_VISIBILITY #if defined GSASL_BUILDING && defined HAVE_VISIBILITY && HAVE_VISIBILITY
# define GSASL_API __attribute__((__visibility__("default"))) #define GSASL_API __attribute__((__visibility__("default")))
# elif defined GSASL_BUILDING && defined _MSC_VER && ! defined GSASL_STATI #elif defined GSASL_BUILDING && defined _MSC_VER && ! defined GSASL_STATIC
C #define GSASL_API __declspec(dllexport)
# define GSASL_API __declspec(dllexport) #elif defined _MSC_VER && ! defined GSASL_STATIC
# elif defined _MSC_VER && ! defined GSASL_STATIC #define GSASL_API __declspec(dllimport)
# define GSASL_API __declspec(dllimport) #else
# else #define GSASL_API
# define GSASL_API #endif
# endif #endif
# endif
# ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
{ {
# endif #endif
/** /**
* GSASL_VERSION * GSASL_VERSION
* *
* Pre-processor symbol with a string that describe the header file * Pre-processor symbol with a string that describe the header file
* version number. Used together with gsasl_check_version() to * version number. Used together with gsasl_check_version() to
* verify header file and run-time library consistency. * verify header file and run-time library consistency.
*/ */
# define GSASL_VERSION "1.6.1" #define GSASL_VERSION "1.8.0"
/** /**
* GSASL_VERSION_MAJOR * GSASL_VERSION_MAJOR
* *
* Pre-processor symbol with a decimal value that describe the major * Pre-processor symbol with a decimal value that describe the major
* level of the header file version number. For example, when the * level of the header file version number. For example, when the
* header version is 1.2.3 this symbol will be 1. * header version is 1.2.3 this symbol will be 1.
* *
* Since: 1.1 * Since: 1.1
*/ */
# define GSASL_VERSION_MAJOR 1 #define GSASL_VERSION_MAJOR 1
/** /**
* GSASL_VERSION_MINOR * GSASL_VERSION_MINOR
* *
* Pre-processor symbol with a decimal value that describe the minor * Pre-processor symbol with a decimal value that describe the minor
* level of the header file version number. For example, when the * level of the header file version number. For example, when the
* header version is 1.2.3 this symbol will be 2. * header version is 1.2.3 this symbol will be 2.
* *
* Since: 1.1 * Since: 1.1
*/ */
# define GSASL_VERSION_MINOR 6 #define GSASL_VERSION_MINOR 8
/** /**
* GSASL_VERSION_PATCH * GSASL_VERSION_PATCH
* *
* Pre-processor symbol with a decimal value that describe the patch * Pre-processor symbol with a decimal value that describe the patch
* level of the header file version number. For example, when the * level of the header file version number. For example, when the
* header version is 1.2.3 this symbol will be 3. * header version is 1.2.3 this symbol will be 3.
* *
* Since: 1.1 * Since: 1.1
*/ */
# define GSASL_VERSION_PATCH 1 #define GSASL_VERSION_PATCH 0
/** /**
* GSASL_VERSION_NUMBER * GSASL_VERSION_NUMBER
* *
* Pre-processor symbol with a hexadecimal value describing the * Pre-processor symbol with a hexadecimal value describing the
* header file version number. For example, when the header version * header file version number. For example, when the header version
* is 1.2.3 this symbol will have the value 0x010203. * is 1.2.3 this symbol will have the value 0x010203.
* *
* Since: 1.1 * Since: 1.1
*/ */
# define GSASL_VERSION_NUMBER 0x010601 #define GSASL_VERSION_NUMBER 0x010800
/* RFC 2222: SASL mechanisms are named by strings, from 1 to 20 /* RFC 2222: SASL mechanisms are named by strings, from 1 to 20
* characters in length, consisting of upper-case letters, digits, * characters in length, consisting of upper-case letters, digits,
* hyphens, and/or underscores. SASL mechanism names must be * hyphens, and/or underscores. SASL mechanism names must be
* registered with the IANA. * registered with the IANA.
*/ */
enum enum
{ {
GSASL_MIN_MECHANISM_SIZE = 1, GSASL_MIN_MECHANISM_SIZE = 1,
GSASL_MAX_MECHANISM_SIZE = 20 GSASL_MAX_MECHANISM_SIZE = 20
skipping to change at line 139 skipping to change at line 139
* @GSASL_NO_ANONYMOUS_TOKEN: Could not get required anonymous token. * @GSASL_NO_ANONYMOUS_TOKEN: Could not get required anonymous token.
* @GSASL_NO_AUTHID: Could not get required authentication * @GSASL_NO_AUTHID: Could not get required authentication
* identity (username). * identity (username).
* @GSASL_NO_AUTHZID: Could not get required authorization identity. * @GSASL_NO_AUTHZID: Could not get required authorization identity.
* @GSASL_NO_PASSWORD: Could not get required password. * @GSASL_NO_PASSWORD: Could not get required password.
* @GSASL_NO_PASSCODE: Could not get required SecurID PIN. * @GSASL_NO_PASSCODE: Could not get required SecurID PIN.
* @GSASL_NO_PIN: Could not get required SecurID PIN. * @GSASL_NO_PIN: Could not get required SecurID PIN.
* @GSASL_NO_SERVICE: Could not get required service name. * @GSASL_NO_SERVICE: Could not get required service name.
* @GSASL_NO_HOSTNAME: Could not get required hostname. * @GSASL_NO_HOSTNAME: Could not get required hostname.
* @GSASL_NO_CB_TLS_UNIQUE: Could not get required tls-unique CB. * @GSASL_NO_CB_TLS_UNIQUE: Could not get required tls-unique CB.
* @GSASL_NO_SAML20_IDP_IDENTIFIER: Could not get required SAML IdP.
* @GSASL_NO_SAML20_REDIRECT_URL: Could not get required SAML
* redirect URL.
* @GSASL_NO_OPENID20_REDIRECT_URL: Could not get required OpenID
* redirect URL.
* @GSASL_GSSAPI_RELEASE_BUFFER_ERROR: GSS-API library call error. * @GSASL_GSSAPI_RELEASE_BUFFER_ERROR: GSS-API library call error.
* @GSASL_GSSAPI_IMPORT_NAME_ERROR: GSS-API library call error. * @GSASL_GSSAPI_IMPORT_NAME_ERROR: GSS-API library call error.
* @GSASL_GSSAPI_INIT_SEC_CONTEXT_ERROR: GSS-API library call error. * @GSASL_GSSAPI_INIT_SEC_CONTEXT_ERROR: GSS-API library call error.
* @GSASL_GSSAPI_ACCEPT_SEC_CONTEXT_ERROR: GSS-API library call error. * @GSASL_GSSAPI_ACCEPT_SEC_CONTEXT_ERROR: GSS-API library call error.
* @GSASL_GSSAPI_UNWRAP_ERROR: GSS-API library call error. * @GSASL_GSSAPI_UNWRAP_ERROR: GSS-API library call error.
* @GSASL_GSSAPI_WRAP_ERROR: GSS-API library call error. * @GSASL_GSSAPI_WRAP_ERROR: GSS-API library call error.
* @GSASL_GSSAPI_ACQUIRE_CRED_ERROR: GSS-API library call error. * @GSASL_GSSAPI_ACQUIRE_CRED_ERROR: GSS-API library call error.
* @GSASL_GSSAPI_DISPLAY_NAME_ERROR: GSS-API library call error. * @GSASL_GSSAPI_DISPLAY_NAME_ERROR: GSS-API library call error.
* @GSASL_GSSAPI_UNSUPPORTED_PROTECTION_ERROR: An unsupported * @GSASL_GSSAPI_UNSUPPORTED_PROTECTION_ERROR: An unsupported
* quality-of-protection layer was requeted. * quality-of-protection layer was requeted.
skipping to change at line 189 skipping to change at line 194
GSASL_NO_CALLBACK = 51, GSASL_NO_CALLBACK = 51,
GSASL_NO_ANONYMOUS_TOKEN = 52, GSASL_NO_ANONYMOUS_TOKEN = 52,
GSASL_NO_AUTHID = 53, GSASL_NO_AUTHID = 53,
GSASL_NO_AUTHZID = 54, GSASL_NO_AUTHZID = 54,
GSASL_NO_PASSWORD = 55, GSASL_NO_PASSWORD = 55,
GSASL_NO_PASSCODE = 56, GSASL_NO_PASSCODE = 56,
GSASL_NO_PIN = 57, GSASL_NO_PIN = 57,
GSASL_NO_SERVICE = 58, GSASL_NO_SERVICE = 58,
GSASL_NO_HOSTNAME = 59, GSASL_NO_HOSTNAME = 59,
GSASL_NO_CB_TLS_UNIQUE = 65, GSASL_NO_CB_TLS_UNIQUE = 65,
GSASL_NO_SAML20_IDP_IDENTIFIER = 66,
GSASL_NO_SAML20_REDIRECT_URL = 67,
GSASL_NO_OPENID20_REDIRECT_URL = 68,
/* Mechanism specific errors. */ /* Mechanism specific errors. */
GSASL_GSSAPI_RELEASE_BUFFER_ERROR = 37, GSASL_GSSAPI_RELEASE_BUFFER_ERROR = 37,
GSASL_GSSAPI_IMPORT_NAME_ERROR = 38, GSASL_GSSAPI_IMPORT_NAME_ERROR = 38,
GSASL_GSSAPI_INIT_SEC_CONTEXT_ERROR = 39, GSASL_GSSAPI_INIT_SEC_CONTEXT_ERROR = 39,
GSASL_GSSAPI_ACCEPT_SEC_CONTEXT_ERROR = 40, GSASL_GSSAPI_ACCEPT_SEC_CONTEXT_ERROR = 40,
GSASL_GSSAPI_UNWRAP_ERROR = 41, GSASL_GSSAPI_UNWRAP_ERROR = 41,
GSASL_GSSAPI_WRAP_ERROR = 42, GSASL_GSSAPI_WRAP_ERROR = 42,
GSASL_GSSAPI_ACQUIRE_CRED_ERROR = 43, GSASL_GSSAPI_ACQUIRE_CRED_ERROR = 43,
GSASL_GSSAPI_DISPLAY_NAME_ERROR = 44, GSASL_GSSAPI_DISPLAY_NAME_ERROR = 44,
GSASL_GSSAPI_UNSUPPORTED_PROTECTION_ERROR = 45, GSASL_GSSAPI_UNSUPPORTED_PROTECTION_ERROR = 45,
GSASL_KERBEROS_V5_INIT_ERROR = 46, GSASL_KERBEROS_V5_INIT_ERROR = 46,
GSASL_KERBEROS_V5_INTERNAL_ERROR = 47, GSASL_KERBEROS_V5_INTERNAL_ERROR = 47,
GSASL_SHISHI_ERROR = GSASL_KERBEROS_V5_INTERNAL_ERROR, GSASL_SHISHI_ERROR = GSASL_KERBEROS_V5_INTERNAL_ERROR,
GSASL_SECURID_SERVER_NEED_ADDITIONAL_PASSCODE = 48, GSASL_SECURID_SERVER_NEED_ADDITIONAL_PASSCODE = 48,
GSASL_SECURID_SERVER_NEED_NEW_PIN = 49, GSASL_SECURID_SERVER_NEED_NEW_PIN = 49,
GSASL_GSSAPI_ENCAPSULATE_TOKEN_ERROR = 60, GSASL_GSSAPI_ENCAPSULATE_TOKEN_ERROR = 60,
GSASL_GSSAPI_DECAPSULATE_TOKEN_ERROR = 61, GSASL_GSSAPI_DECAPSULATE_TOKEN_ERROR = 61,
GSASL_GSSAPI_INQUIRE_MECH_FOR_SASLNAME_ERROR = 62, GSASL_GSSAPI_INQUIRE_MECH_FOR_SASLNAME_ERROR = 62,
GSASL_GSSAPI_TEST_OID_SET_MEMBER_ERROR = 63, GSASL_GSSAPI_TEST_OID_SET_MEMBER_ERROR = 63,
GSASL_GSSAPI_RELEASE_OID_SET_ERROR = 64 GSASL_GSSAPI_RELEASE_OID_SET_ERROR = 64
/* When adding new values, note that integers are not necessarily /* When adding new values, note that integers are not necessarily
assigned monotonously increasingly. */ assigned monotonously increasingly. */
} Gsasl_rc; } Gsasl_rc;
/** /**
* Gsasl_qop: * Gsasl_qop:
* @GSASL_QOP_AUTH: Authentication only. * @GSASL_QOP_AUTH: Authentication only.
* @GSASL_QOP_AUTH_INT: Authentication and integrity. * @GSASL_QOP_AUTH_INT: Authentication and integrity.
* @GSASL_QOP_AUTH_CONF: Authentication, integrity and confidentiality. * @GSASL_QOP_AUTH_CONF: Authentication, integrity and confidentiality.
* *
* Quality of Protection types (DIGEST-MD5 and GSSAPI). The * Quality of Protection types (DIGEST-MD5 and GSSAPI). The
* integrity and confidentiality values is about application data * integrity and confidentiality values is about application data
skipping to change at line 303 skipping to change at line 311
* @GSASL_REALM: User realm. * @GSASL_REALM: User realm.
* @GSASL_DIGEST_MD5_HASHED_PASSWORD: Pre-computed hashed DIGEST-MD5 * @GSASL_DIGEST_MD5_HASHED_PASSWORD: Pre-computed hashed DIGEST-MD5
* password, to avoid storing passwords in the clear. * password, to avoid storing passwords in the clear.
* @GSASL_QOPS: Set of quality-of-protection values. * @GSASL_QOPS: Set of quality-of-protection values.
* @GSASL_QOP: Quality-of-protection value. * @GSASL_QOP: Quality-of-protection value.
* @GSASL_SCRAM_ITER: Number of iterations in password-to-key hashing. * @GSASL_SCRAM_ITER: Number of iterations in password-to-key hashing.
* @GSASL_SCRAM_SALT: Salt for password-to-key hashing. * @GSASL_SCRAM_SALT: Salt for password-to-key hashing.
* @GSASL_SCRAM_SALTED_PASSWORD: Pre-computed salted SCRAM key, * @GSASL_SCRAM_SALTED_PASSWORD: Pre-computed salted SCRAM key,
* to avoid re-computation and storing passwords in the clear. * to avoid re-computation and storing passwords in the clear.
* @GSASL_CB_TLS_UNIQUE: Base64 encoded tls-unique channel binding. * @GSASL_CB_TLS_UNIQUE: Base64 encoded tls-unique channel binding.
* @GSASL_SAML20_IDP_IDENTIFIER: SAML20 user IdP URL.
* @GSASL_SAML20_REDIRECT_URL: SAML 2.0 URL to access in browser.
* @GSASL_OPENID20_REDIRECT_URL: OpenID 2.0 URL to access in browser.
* @GSASL_OPENID20_OUTCOME_DATA: OpenID 2.0 authentication outcome data.
* @GSASL_SAML20_AUTHENTICATE_IN_BROWSER: Request to perform SAML 2.0
* authentication in browser.
* @GSASL_OPENID20_AUTHENTICATE_IN_BROWSER: Request to perform OpenID 2.0
* authentication in browser.
* @GSASL_VALIDATE_SIMPLE: Request for simple validation. * @GSASL_VALIDATE_SIMPLE: Request for simple validation.
* @GSASL_VALIDATE_EXTERNAL: Request for validation of EXTERNAL. * @GSASL_VALIDATE_EXTERNAL: Request for validation of EXTERNAL.
* @GSASL_VALIDATE_ANONYMOUS: Request for validation of ANONYMOUS. * @GSASL_VALIDATE_ANONYMOUS: Request for validation of ANONYMOUS.
* @GSASL_VALIDATE_GSSAPI: Request for validation of GSSAPI/GS2. * @GSASL_VALIDATE_GSSAPI: Request for validation of GSSAPI/GS2.
* @GSASL_VALIDATE_SECURID: Reqest for validation of SecurID. * @GSASL_VALIDATE_SECURID: Reqest for validation of SecurID.
* @GSASL_VALIDATE_SAML20: Reqest for validation of SAML20.
* @GSASL_VALIDATE_OPENID20: Reqest for validation of OpenID 2.0 login.
* *
* Callback/property types. * Callback/property types.
*/ */
typedef enum typedef enum
{ {
/* Information properties, e.g., username. */ /* Information properties, e.g., username. */
GSASL_AUTHID = 1, GSASL_AUTHID = 1,
GSASL_AUTHZID = 2, GSASL_AUTHZID = 2,
GSASL_PASSWORD = 3, GSASL_PASSWORD = 3,
GSASL_ANONYMOUS_TOKEN = 4, GSASL_ANONYMOUS_TOKEN = 4,
skipping to change at line 332 skipping to change at line 350
GSASL_SUGGESTED_PIN = 9, GSASL_SUGGESTED_PIN = 9,
GSASL_PIN = 10, GSASL_PIN = 10,
GSASL_REALM = 11, GSASL_REALM = 11,
GSASL_DIGEST_MD5_HASHED_PASSWORD = 12, GSASL_DIGEST_MD5_HASHED_PASSWORD = 12,
GSASL_QOPS = 13, GSASL_QOPS = 13,
GSASL_QOP = 14, GSASL_QOP = 14,
GSASL_SCRAM_ITER = 15, GSASL_SCRAM_ITER = 15,
GSASL_SCRAM_SALT = 16, GSASL_SCRAM_SALT = 16,
GSASL_SCRAM_SALTED_PASSWORD = 17, GSASL_SCRAM_SALTED_PASSWORD = 17,
GSASL_CB_TLS_UNIQUE = 18, GSASL_CB_TLS_UNIQUE = 18,
GSASL_SAML20_IDP_IDENTIFIER = 19,
GSASL_SAML20_REDIRECT_URL = 20,
GSASL_OPENID20_REDIRECT_URL = 21,
GSASL_OPENID20_OUTCOME_DATA = 22,
/* Client callbacks. */
GSASL_SAML20_AUTHENTICATE_IN_BROWSER = 250,
GSASL_OPENID20_AUTHENTICATE_IN_BROWSER = 251,
/* Server validation callback properties. */ /* Server validation callback properties. */
GSASL_VALIDATE_SIMPLE = 500, GSASL_VALIDATE_SIMPLE = 500,
GSASL_VALIDATE_EXTERNAL = 501, GSASL_VALIDATE_EXTERNAL = 501,
GSASL_VALIDATE_ANONYMOUS = 502, GSASL_VALIDATE_ANONYMOUS = 502,
GSASL_VALIDATE_GSSAPI = 503, GSASL_VALIDATE_GSSAPI = 503,
GSASL_VALIDATE_SECURID = 504 GSASL_VALIDATE_SECURID = 504,
GSASL_VALIDATE_SAML20 = 505,
GSASL_VALIDATE_OPENID20 = 506
} Gsasl_property; } Gsasl_property;
/** /**
* Gsasl_callback_function: * Gsasl_callback_function:
* @ctx: libgsasl handle. * @ctx: libgsasl handle.
* @sctx: session handle, may be NULL. * @sctx: session handle, may be NULL.
* @prop: enumerated value of Gsasl_property type. * @prop: enumerated value of Gsasl_property type.
* *
* Prototype of function that the application should implement. Use * Prototype of function that the application should implement. Use
* gsasl_callback_set() to inform the library about your callback * gsasl_callback_set() to inform the library about your callback
skipping to change at line 460 skipping to change at line 487
const char *in, size_t inlen, const char *in, size_t inlen,
char *outhash[16]); char *outhash[16]);
extern GSASL_API int gsasl_sha1 (const char *in, size_t inlen, extern GSASL_API int gsasl_sha1 (const char *in, size_t inlen,
char *out[20]); char *out[20]);
extern GSASL_API int gsasl_hmac_sha1 (const char *key, size_t keylen, extern GSASL_API int gsasl_hmac_sha1 (const char *key, size_t keylen,
const char *in, size_t inlen, const char *in, size_t inlen,
char *outhash[20]); char *outhash[20]);
extern GSASL_API void gsasl_free (void *ptr); extern GSASL_API void gsasl_free (void *ptr);
/* Get the mechanism API. */ /* Get the mechanism API. */
# include <gsasl-mech.h> #include <gsasl-mech.h>
#ifndef GSASL_NO_OBSOLETE #ifndef GSASL_NO_OBSOLETE
/* For compatibility with earlier versions. */ /* For compatibility with earlier versions. */
# include <gsasl-compat.h> #include <gsasl-compat.h>
#endif #endif
# ifdef __cplusplus #ifdef __cplusplus
} }
# endif #endif
#endif /* GSASL_H */ #endif /* GSASL_H */
 End of changes. 22 change blocks. 
31 lines changed or deleted 57 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/