gsasl.h | gsasl.h | |||
---|---|---|---|---|
skipping to change at line 54 | skipping to change at line 54 | |||
{ | { | |||
# 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.2" | # define GSASL_VERSION "1.3" | |||
/** | /** | |||
* 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 | |||
*/ | */ | |||
skipping to change at line 76 | skipping to change at line 76 | |||
/** | /** | |||
* 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 2 | # define GSASL_VERSION_MINOR 3 | |||
/** | /** | |||
* 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 | |||
*/ | */ | |||
skipping to change at line 98 | skipping to change at line 98 | |||
/** | /** | |||
* 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 0x010200 | # define GSASL_VERSION_NUMBER 0x010300 | |||
/* 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 201 | skipping to change at line 201 | |||
GSASL_SERVICE = 5, | GSASL_SERVICE = 5, | |||
GSASL_HOSTNAME = 6, | GSASL_HOSTNAME = 6, | |||
GSASL_GSSAPI_DISPLAY_NAME = 7, | GSASL_GSSAPI_DISPLAY_NAME = 7, | |||
GSASL_PASSCODE = 8, | GSASL_PASSCODE = 8, | |||
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_SALT = 16, | ||||
GSASL_SCRAM_SALTED_PASSWORD = 17, | ||||
/* 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_property; | } Gsasl_property; | |||
/** | /** | |||
* Gsasl_callback_function: | * Gsasl_callback_function: | |||
skipping to change at line 321 | skipping to change at line 324 | |||
char **out, size_t * outlen); | char **out, size_t * outlen); | |||
extern GSASL_API int gsasl_base64_from (const char *in, size_t inlen, | extern GSASL_API int gsasl_base64_from (const char *in, size_t inlen, | |||
char **out, size_t * outlen); | char **out, size_t * outlen); | |||
extern GSASL_API int gsasl_nonce (char *data, size_t datalen); | extern GSASL_API int gsasl_nonce (char *data, size_t datalen); | |||
extern GSASL_API int gsasl_random (char *data, size_t datalen); | extern GSASL_API int gsasl_random (char *data, size_t datalen); | |||
extern GSASL_API int gsasl_md5 (const char *in, size_t inlen, | extern GSASL_API int gsasl_md5 (const char *in, size_t inlen, | |||
char *out[16]); | char *out[16]); | |||
extern GSASL_API int gsasl_hmac_md5 (const char *key, size_t keylen, | extern GSASL_API int gsasl_hmac_md5 (const char *key, size_t keylen, | |||
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, | ||||
char *out[20]); | ||||
extern GSASL_API int gsasl_hmac_sha1 (const char *key, size_t keylen, | ||||
const char *in, size_t inlen, | ||||
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 | |||
End of changes. 5 change blocks. | ||||
3 lines changed or deleted | 11 lines changed or added | |||