sasl.h   sasl.h 
skipping to change at line 125 skipping to change at line 125
* *
* If the server forbids the use of "@" in user names for other * If the server forbids the use of "@" in user names for other
* purposes, this simplifies security validation. * purposes, this simplifies security validation.
*/ */
#ifndef SASL_H #ifndef SASL_H
#define SASL_H 1 #define SASL_H 1
#define SASL_VERSION_MAJOR 2 #define SASL_VERSION_MAJOR 2
#define SASL_VERSION_MINOR 1 #define SASL_VERSION_MINOR 1
#define SASL_VERSION_STEP 17 #define SASL_VERSION_STEP 18
#include "prop.h" #include "prop.h"
/************* /*************
* Basic API * * Basic API *
*************/ *************/
/* SASL result codes: */ /* SASL result codes: */
#define SASL_CONTINUE 1 /* another step is needed in authentication */ #define SASL_CONTINUE 1 /* another step is needed in authentication */
#define SASL_OK 0 /* successful result */ #define SASL_OK 0 /* successful result */
skipping to change at line 619 skipping to change at line 619
unsigned out_max, unsigned *out_len); unsigned out_max, unsigned *out_len);
#define SASL_CB_CANON_USER (0x8007) #define SASL_CB_CANON_USER (0x8007)
/********************************** /**********************************
* Common Client/server functions * * Common Client/server functions *
**********************************/ **********************************/
/* get sasl library version information /* get sasl library version information
* implementation is a vendor-defined string * implementation is a vendor-defined string
* version is a vender-defined representation of the version # */ * version is a vender-defined representation of the version #
*
* this function is being deprecated in favor of sasl_version_info */
LIBSASL_API void sasl_version(const char **implementation, LIBSASL_API void sasl_version(const char **implementation,
int *version); int *version);
/* Extended version of sasl_version().
*
* This function is to be used
* for library version display and logging
* for bug workarounds in old library versions
*
* The sasl_version_info is not to be used for API feature detection.
*
* All parameters are optional. If NULL is specified, the value is not retu
rned.
*/
LIBSASL_API void sasl_version_info (const char **implementation,
const char **version_string,
int *version_major,
int *version_minor,
int *version_step,
int *version_patch);
/* dispose of all SASL plugins. Connection /* dispose of all SASL plugins. Connection
* states have to be disposed of before calling this. * states have to be disposed of before calling this.
*/ */
LIBSASL_API void sasl_done(void); LIBSASL_API void sasl_done(void);
/* dispose connection state, sets it to NULL /* dispose connection state, sets it to NULL
* checks for pointer to NULL * checks for pointer to NULL
*/ */
LIBSASL_API void sasl_dispose(sasl_conn_t **pconn); LIBSASL_API void sasl_dispose(sasl_conn_t **pconn);
 End of changes. 3 change blocks. 
2 lines changed or deleted 22 lines changed or added


 saslplug.h   saslplug.h 
skipping to change at line 693 skipping to change at line 693
* If this routine sets conn_context to a non-NULL value, then the cal l * If this routine sets conn_context to a non-NULL value, then the cal l
* to mech_new will be skipped. This should not be done unless * to mech_new will be skipped. This should not be done unless
* there's a significant performance benefit, since it can cause * there's a significant performance benefit, since it can cause
* additional memory allocation in SASL core code to keep track of * additional memory allocation in SASL core code to keep track of
* contexts potentially for multiple mechanisms. * contexts potentially for multiple mechanisms.
* *
* This is called by the first call to sasl_listmech() for a * This is called by the first call to sasl_listmech() for a
* given connection context, thus for a given protocol it may * given connection context, thus for a given protocol it may
* never be called. Note that if mech_avail returns SASL_NOMECH, * never be called. Note that if mech_avail returns SASL_NOMECH,
* then that mechanism is considered disabled for the remainder * then that mechanism is considered disabled for the remainder
* of the session. * of the session. If mech_avail returns SASL_NOTDONE, then a
* future call to mech_avail may still return either SASL_OK
* or SASL_NOMECH.
* *
* returns SASL_OK on success, * returns SASL_OK on success,
* SASL_NOTDONE if mech is not available now, but may be later
* (e.g. EXTERNAL w/o auth_id)
* SASL_NOMECH if mech disabled * SASL_NOMECH if mech disabled
*/ */
int (*mech_avail)(void *glob_context, int (*mech_avail)(void *glob_context,
sasl_server_params_t *sparams, sasl_server_params_t *sparams,
void **conn_context); void **conn_context);
/* for additions which don't require a version upgrade; set to 0 */ /* for additions which don't require a version upgrade; set to 0 */
int (*spare_fptr2)(); int (*spare_fptr2)();
} sasl_server_plug_t; } sasl_server_plug_t;
 End of changes. 2 change blocks. 
1 lines changed or deleted 5 lines changed or added


 saslutil.h   saslutil.h 
skipping to change at line 81 skipping to change at line 81
/* churn data into random number generator */ /* churn data into random number generator */
LIBSASL_API void sasl_churn(sasl_rand_t *rpool, const char *data, LIBSASL_API void sasl_churn(sasl_rand_t *rpool, const char *data,
unsigned len); unsigned len);
/* erase a security sensitive buffer or password. /* erase a security sensitive buffer or password.
* Implementation may use recovery-resistant erase logic. * Implementation may use recovery-resistant erase logic.
*/ */
LIBSASL_API void sasl_erasebuffer(char *pass, unsigned len); LIBSASL_API void sasl_erasebuffer(char *pass, unsigned len);
#ifdef WIN32 #ifdef WIN32
/* Just in case a different DLL defines this as well */
#if defined(NEED_GETOPT)
LIBSASL_API int getopt(int argc, char **argv, char *optstring); LIBSASL_API int getopt(int argc, char **argv, char *optstring);
#endif
LIBSASL_API char * getpass(const char *prompt); LIBSASL_API char * getpass(const char *prompt);
#endif /* WIN32 */ #endif /* WIN32 */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* SASLUTIL_H */ #endif /* SASLUTIL_H */
 End of changes. 2 change blocks. 
0 lines changed or deleted 3 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/