sasl.h   sasl.h 
skipping to change at line 124 skipping to change at line 124
* *
* 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 9 #define SASL_VERSION_STEP 11
#include "prop.h" #include "prop.h"
#define LIBSASL_API
/* The following ifdef block is the standard way of creating macros
* which make exporting from a DLL simpler. All files within this DLL
* are compiled with the LIBSASL_EXPORTS symbol defined on the command
* line. this symbol should not be defined on any project that uses
* this DLL. This way any other project whose source files include
* this file see LIBSASL_API functions as being imported from a DLL,
* wheras this DLL sees symbols defined with this macro as being
* exported. */
/* Under Unix, life is simpler: we just need to mark library functions
* as extern. (Technically, we don't even have to do that.) */
#ifdef WIN32
# ifdef LIBSASL_EXPORTS
# define LIBSASL_API __declspec(dllexport)
# else /* LIBSASL_EXPORTS */
# define LIBSASL_API __declspec(dllimport)
# endif /* LIBSASL_EXPORTS */
#else /* WIN32 */
# define LIBSASL_API extern
#endif /* WIN32 */
/* Same as above, but used during a variable declaration. Only Unix definit
ion
* is different, as we can't assign an initial value to an extern variable
*/
#ifdef WIN32
# ifdef LIBSASL_EXPORTS
# define LIBSASL_VAR __declspec(dllexport)
# else /* LIBSASL_EXPORTS */
# define LIBSASL_VAR __declspec(dllimport)
# endif /* LIBSASL_EXPORTS */
#else /* WIN32 */
# define LIBSASL_VAR
#endif /* WIN32 */
/************* /*************
* 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 */
#define SASL_FAIL -1 /* generic failure */ #define SASL_FAIL -1 /* generic failure */
#define SASL_NOMEM -2 /* memory shortage failure */ #define SASL_NOMEM -2 /* memory shortage failure */
 End of changes. 2 change blocks. 
2 lines changed or deleted 35 lines changed or added


 saslutil.h   saslutil.h 
skipping to change at line 76 skipping to change at line 76
/* 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
LIBSASL_API int getopt(int argc, char **argv, char *optstring);
LIBSASL_API char * getpass(const char *prompt);
#endif /* WIN32 */
#endif /* SASLUTIL_H */ #endif /* SASLUTIL_H */
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 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/