md5global.h   md5global.h 
/* GLOBAL.H - RSAREF types and constants /* GLOBAL.H - RSAREF types and constants
*/ */
#ifndef MD5GLOBAL_H
#define MD5GLOBAL_H
/* PROTOTYPES should be set to one if and only if the compiler supports /* PROTOTYPES should be set to one if and only if the compiler supports
function argument prototyping. function argument prototyping.
The following makes PROTOTYPES default to 0 if it has not already The following makes PROTOTYPES default to 0 if it has not already
been defined with C compiler flags. been defined with C compiler flags.
*/ */
#ifndef PROTOTYPES #ifndef PROTOTYPES
#define PROTOTYPES 0 #define PROTOTYPES 0
#endif #endif
/* POINTER defines a generic pointer type */ /* POINTER defines a generic pointer type */
typedef unsigned char *POINTER; typedef unsigned char *POINTER;
/* UINT2 defines a two byte word */ typedef signed char INT1; /* 8 bits */
typedef unsigned short int UINT2; typedef short INT2; /* 16 bits */
typedef int INT4; /* 32 bits */
/* UINT4 defines a four byte word */ /* There is no 64 bit type */
typedef unsigned long int UINT4; typedef unsigned char UINT1; /* 8 bits */
typedef unsigned short UINT2; /* 16 bits */
typedef unsigned int UINT4; /* 32 bits */
/* There is no 64 bit type */
/* PROTO_LIST is defined depending on how PROTOTYPES is defined above. /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
returns an empty list. returns an empty list.
*/ */
#if PROTOTYPES #if PROTOTYPES
#define PROTO_LIST(list) list #define PROTO_LIST(list) list
#else #else
#define PROTO_LIST(list) () #define PROTO_LIST(list) ()
#endif #endif
#endif /* MD5GLOBAL_H */
 End of changes. 4 change blocks. 
7 lines changed or deleted 12 lines changed or added


 sasl.h   sasl.h 
skipping to change at line 454 skipping to change at line 454
const char *prompt, const char *defresult, const char *prompt, const char *defresult,
const char **result, unsigned *len); const char **result, unsigned *len);
#define SASL_CB_ECHOPROMPT (0x4005) /* challenge and client-entered resul t */ #define SASL_CB_ECHOPROMPT (0x4005) /* challenge and client-entered resul t */
#define SASL_CB_NOECHOPROMPT (0x4006) /* challenge and client-entered resul t */ #define SASL_CB_NOECHOPROMPT (0x4006) /* challenge and client-entered resul t */
/* prompt (or autoselect) the realm to do authentication in. /* prompt (or autoselect) the realm to do authentication in.
* may get a list of valid realms. * may get a list of valid realms.
* input: * input:
* context -- context from callback structure * context -- context from callback structure
* id -- callback id * id -- callback id
* availrealms -- available realms; NULL terminated * availrealms -- available realms; string list; NULL terminated
* output: * output:
* result -- NUL terminated realm; NULL is equivalent to "" * result -- NUL terminated realm; NULL is equivalent to ""
* returns SASL_OK * returns SASL_OK
*/ */
/* If there is an interaction with SASL_CB_GETREALM the challenge of
* the sasl_interact_t will be of the format: {realm1, realm2,
* ...}. That is a list of possible realms seperated by comma spaces
* enclosed by brackets.
*/
typedef int sasl_getrealm_t(void *context, int id, typedef int sasl_getrealm_t(void *context, int id,
const char **availrealms, const char **availrealms,
const char **result); const char **result);
#define SASL_CB_GETREALM (0x4007) /* realm to attempt authentication in */ #define SASL_CB_GETREALM (0x4007) /* realm to attempt authentication in */
/* server callbacks: /* server callbacks:
*/ */
/* callback to verify authorization /* callback to verify authorization
* requested_user -- the identity/username to authorize * requested_user -- the identity/username to authorize
* auth_identity -- the identity associated with the secret * auth_identity -- the identity associated with the secret
skipping to change at line 587 skipping to change at line 594
LIBSASL_API int sasl_idle(sasl_conn_t *conn); LIBSASL_API int sasl_idle(sasl_conn_t *conn);
/************** /**************
* Client API * * Client API *
**************/ **************/
/* list of client interactions with user for caller to fill in /* list of client interactions with user for caller to fill in
*/ */
typedef struct sasl_interact { typedef struct sasl_interact {
unsigned long id; /* same as client/user callback ID */ unsigned long id; /* same as client/user callback ID */
const char *challenge; const char *challenge; /* may be computer readable */
const char *prompt; const char *prompt; /* always human readable */
const char *defresult; /* default result string */ const char *defresult; /* default result string */
void *result; /* set to point to result -- this will void *result; /* set to point to result -- this will
* be freed by the library iff it * be freed by the library iff it
* would be freed by the library if * would be freed by the library if
* returned from normal callback of * returned from normal callback of
* the same id */ * the same id */
unsigned len; /* set to length of result */ unsigned len; /* set to length of result */
} sasl_interact_t; } sasl_interact_t;
/* initialize the SASL client drivers /* initialize the SASL client drivers
skipping to change at line 734 skipping to change at line 741
* callbacks -- callbacks (e.g., authorization, lang, new getopt cont ext) * callbacks -- callbacks (e.g., authorization, lang, new getopt cont ext)
* secflags -- security flags (see above) * secflags -- security flags (see above)
* returns: * returns:
* pconn -- new connection context * pconn -- new connection context
* *
* returns: * returns:
* SASL_OK -- success * SASL_OK -- success
* SASL_NOMEM -- not enough memory * SASL_NOMEM -- not enough memory
*/ */
LIBSASL_API int sasl_server_new(const char *service, LIBSASL_API int sasl_server_new(const char *service,
const char *serverFQDN, const char *serverFQDN,
const char *user_realm, const char *user_realm,
const sasl_callback_t *callbacks, const sasl_callback_t *callbacks,
int secflags, int secflags,
sasl_conn_t **pconn); sasl_conn_t **pconn);
/* This returns a list of mechanisms in a NUL-terminated string /* This returns a list of mechanisms in a NUL-terminated string
* user -- restricts mechanisms to those available to that user * user -- restricts mechanisms to those available to that user
* (may be NULL) * (may be NULL)
* prefix -- appended to beginning of result * prefix -- appended to beginning of result
* sep -- appended between mechanisms * sep -- appended between mechanisms
* suffix -- appended to end of result * suffix -- appended to end of result
* results: * results:
* result -- NUL terminated allocated result, caller must free * result -- NUL terminated allocated result, caller must free
* plen -- gets length of result (excluding NUL), may be NULL * plen -- gets length of result (excluding NUL), may be NULL
 End of changes. 4 change blocks. 
8 lines changed or deleted 15 lines changed or added


 saslplug.h   saslplug.h 
/* saslplug.h -- API for SASL plug-ins /* saslplug.h -- API for SASL plug-ins
*/ */
#ifndef SASLPLUG_H #ifndef SASLPLUG_H
#define SASLPLUG_H 1 #define SASLPLUG_H 1
#ifndef MD5GLOBAL_H #ifndef MD5GLOBAL_H
#include "md5global.h" #include "md5global.h"
#define MD5GLOBAL_H 1
#endif #endif
#ifndef MD5_H #ifndef MD5_H
#include "md5.h" #include "md5.h"
#endif #endif
#ifndef HMAC_MD5_H #ifndef HMAC_MD5_H
#include "hmac-md5.h" #include "hmac-md5.h"
#endif #endif
/* callback to lookup a property from a SASL connection state /* callback to lookup a property from a SASL connection state
* input: * input:
 End of changes. 1 change blocks. 
1 lines changed or deleted 0 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/