md5.h   md5.h 
skipping to change at line 32 skipping to change at line 32
documentation and/or software. documentation and/or software.
*/ */
/* MD5 context. */ /* MD5 context. */
typedef struct { typedef struct {
UINT4 state[4]; /* state (ABCD) */ UINT4 state[4]; /* state (ABCD) */
UINT4 count[2]; /* number of bits, modulo 2^64 (lsb first) */ UINT4 count[2]; /* number of bits, modulo 2^64 (lsb first) */
unsigned char buffer[64]; /* input buffer */ unsigned char buffer[64]; /* input buffer */
} MD5_CTX; } MD5_CTX;
void MD5Init PROTO_LIST ((MD5_CTX *)); #ifndef __APPLE__
void MD5Update PROTO_LIST #define _sasl_MD5Init MD5Init
#define _sasl_MD5Update MD5Update
#define _sasl_MD5Final MD5Final
#endif
void _sasl_MD5Init PROTO_LIST ((MD5_CTX *));
void _sasl_MD5Update PROTO_LIST
((MD5_CTX *, unsigned char *, unsigned int)); ((MD5_CTX *, unsigned char *, unsigned int));
void MD5Final PROTO_LIST ((unsigned char [16], MD5_CTX *)); void _sasl_MD5Final PROTO_LIST ((unsigned char [16], MD5_CTX *));
void hmac_md5 PROTO_LIST ((unsigned char *, int, unsigned char *, int, cadd r_t)); void hmac_md5 PROTO_LIST ((unsigned char *, int, unsigned char *, int, cadd r_t));
 End of changes. 2 change blocks. 
3 lines changed or deleted 9 lines changed or added


 sasl.h   sasl.h 
skipping to change at line 92 skipping to change at line 92
* 7. call sasl_dispose(), may return to step 2 * 7. call sasl_dispose(), may return to step 2
* 8. call sasl_done() when program terminates * 8. call sasl_done() when program terminates
* *
*/ */
#ifndef SASL_H #ifndef SASL_H
#define SASL_H 1 #define SASL_H 1
#define SASL_VERSION_MAJOR 1 #define SASL_VERSION_MAJOR 1
#define SASL_VERSION_MINOR 5 #define SASL_VERSION_MINOR 5
#define SASL_VERSION_STEP 24 #define SASL_VERSION_STEP 28
/* The following ifdef block is the standard way of creating macros /* The following ifdef block is the standard way of creating macros
* which make exporting from a DLL simpler. All files within this DLL * which make exporting from a DLL simpler. All files within this DLL
* are compiled with the LIBSASL_EXPORTS symbol defined on the command * are compiled with the LIBSASL_EXPORTS symbol defined on the command
* line. this symbol should not be defined on any project that uses * line. this symbol should not be defined on any project that uses
* this DLL. This way any other project whose source files include * this DLL. This way any other project whose source files include
* this file see LIBSASL_API functions as being imported from a DLL, * this file see LIBSASL_API functions as being imported from a DLL,
* wheras this DLL sees symbols defined with this macro as being * wheras this DLL sees symbols defined with this macro as being
* exported. */ * exported. */
/* Under Unix, life is simpler: we just need to mark library functions /* Under Unix, life is simpler: we just need to mark library functions
skipping to change at line 373 skipping to change at line 373
#define SASL_CB_LOG (2) #define SASL_CB_LOG (2)
/* getpath callback -- this allows applications to specify the /* getpath callback -- this allows applications to specify the
* colon-separated path to search for plugins (by default, * colon-separated path to search for plugins (by default,
* taken from the SASL_PATH environment variable). * taken from the SASL_PATH environment variable).
* inputs: * inputs:
* context -- getpath context from the callback record * context -- getpath context from the callback record
* outputs: * outputs:
* path -- colon seperated path (allocated on the heap; the * path -- colon seperated path (allocated on the heap; the
* library will free it using the sasl_free_t * * library will free it using the sasl_free_t *
* passed to sasl_set_callback, or the standard free() * passed to sasl_set_alloc(), or the standard free()
* library call). * library call).
* returns: * returns:
* SASL_OK -- no error * SASL_OK -- no error
* SASL_FAIL -- error * SASL_FAIL -- error
*/ */
typedef int sasl_getpath_t(void * context, typedef int sasl_getpath_t(void * context,
char ** path); char ** path);
#define SASL_CB_GETPATH (3) #define SASL_CB_GETPATH (3)
skipping to change at line 642 skipping to change at line 642
* service -- registered name of the service using SASL (e.g. "imap" ) * service -- registered name of the service using SASL (e.g. "imap" )
* serverFQDN -- the fully qualified domain name of the server * serverFQDN -- the fully qualified domain name of the server
* prompt_supp -- list of client interactions supported * prompt_supp -- list of client interactions supported
* may also include sasl_getopt_t context & call * may also include sasl_getopt_t context & call
* NULL prompt_supp = user/pass via SASL_INTERACT only * NULL prompt_supp = user/pass via SASL_INTERACT only
* NULL proc = interaction supported via SASL_INTERACT * NULL proc = interaction supported via SASL_INTERACT
* secflags -- security flags (see above) * secflags -- security flags (see above)
* in/out: * in/out:
* pconn -- connection negotiation structure * pconn -- connection negotiation structure
* pointer to NULL => allocate new * pointer to NULL => allocate new
* non-NULL => recycle storage and go for next available mech
* *
* Returns: * Returns:
* SASL_OK -- success * SASL_OK -- success
* SASL_NOMECH -- no mechanism meets requested properties * SASL_NOMECH -- no mechanism meets requested properties
* SASL_NOMEM -- not enough memory * SASL_NOMEM -- not enough memory
*/ */
LIBSASL_API int sasl_client_new(const char *service, LIBSASL_API int sasl_client_new(const char *service,
const char *serverFQDN, const char *serverFQDN,
const sasl_callback_t *prompt_supp, const sasl_callback_t *prompt_supp,
int secflags, int secflags,
 End of changes. 3 change blocks. 
3 lines changed or deleted 2 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/