| gnutls.h (3.3.0) | | gnutls.h (3.3.1) | |
|---|
| | | | |
| skipping to change at line 56 | | skipping to change at line 56 | |
|---|
| #endif | | #endif | |
| /* Get time_t. */ | | /* Get time_t. */ | |
| #include <time.h> | | #include <time.h> | |
| | | | |
| /* *INDENT-OFF* */ | | /* *INDENT-OFF* */ | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" { | | extern "C" { | |
| #endif | | #endif | |
| /* *INDENT-ON* */ | | /* *INDENT-ON* */ | |
| | | | |
|
| #define GNUTLS_VERSION "3.3.0" | | #define GNUTLS_VERSION "3.3.1" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 3 | | #define GNUTLS_VERSION_MINOR 3 | |
|
| #define GNUTLS_VERSION_PATCH 0 | | #define GNUTLS_VERSION_PATCH 1 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030300 | | #define GNUTLS_VERSION_NUMBER 0x030301 | |
| | | | |
| #define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC | | #define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC | |
| #define GNUTLS_CIPHER_RIJNDAEL_256_CBC GNUTLS_CIPHER_AES_256_CBC | | #define GNUTLS_CIPHER_RIJNDAEL_256_CBC GNUTLS_CIPHER_AES_256_CBC | |
| #define GNUTLS_CIPHER_RIJNDAEL_CBC GNUTLS_CIPHER_AES_128_CBC | | #define GNUTLS_CIPHER_RIJNDAEL_CBC GNUTLS_CIPHER_AES_128_CBC | |
| #define GNUTLS_CIPHER_ARCFOUR GNUTLS_CIPHER_ARCFOUR_128 | | #define GNUTLS_CIPHER_ARCFOUR GNUTLS_CIPHER_ARCFOUR_128 | |
| | | | |
| /** | | /** | |
| * gnutls_cipher_algorithm_t: | | * gnutls_cipher_algorithm_t: | |
| * @GNUTLS_CIPHER_UNKNOWN: Unknown algorithm. | | * @GNUTLS_CIPHER_UNKNOWN: Unknown algorithm. | |
| * @GNUTLS_CIPHER_NULL: NULL algorithm. | | * @GNUTLS_CIPHER_NULL: NULL algorithm. | |
| | | | |
| skipping to change at line 1463 | | skipping to change at line 1463 | |
|---|
| typedef void *(*gnutls_alloc_function) (size_t); | | typedef void *(*gnutls_alloc_function) (size_t); | |
| typedef void *(*gnutls_calloc_function) (size_t, size_t); | | typedef void *(*gnutls_calloc_function) (size_t, size_t); | |
| typedef int (*gnutls_is_secure_function) (const void *); | | typedef int (*gnutls_is_secure_function) (const void *); | |
| typedef void (*gnutls_free_function) (void *); | | typedef void (*gnutls_free_function) (void *); | |
| typedef void *(*gnutls_realloc_function) (void *, size_t); | | typedef void *(*gnutls_realloc_function) (void *, size_t); | |
| | | | |
| void gnutls_global_set_time_function(gnutls_time_func time_func); | | void gnutls_global_set_time_function(gnutls_time_func time_func); | |
| | | | |
| /* For use in callbacks */ | | /* For use in callbacks */ | |
| extern gnutls_alloc_function gnutls_malloc; | | extern gnutls_alloc_function gnutls_malloc; | |
|
| extern gnutls_alloc_function gnutls_secure_malloc; | | | |
| extern gnutls_realloc_function gnutls_realloc; | | extern gnutls_realloc_function gnutls_realloc; | |
| extern gnutls_calloc_function gnutls_calloc; | | extern gnutls_calloc_function gnutls_calloc; | |
| extern gnutls_free_function gnutls_free; | | extern gnutls_free_function gnutls_free; | |
| | | | |
| extern char *(*gnutls_strdup) (const char *); | | extern char *(*gnutls_strdup) (const char *); | |
| | | | |
| typedef void (*gnutls_log_func) (int, const char *); | | typedef void (*gnutls_log_func) (int, const char *); | |
| typedef void (*gnutls_audit_log_func) (gnutls_session_t, const char *); | | typedef void (*gnutls_audit_log_func) (gnutls_session_t, const char *); | |
| void gnutls_global_set_log_function(gnutls_log_func log_func); | | void gnutls_global_set_log_function(gnutls_log_func log_func); | |
| void gnutls_global_set_audit_log_function(gnutls_audit_log_func log_func); | | void gnutls_global_set_audit_log_function(gnutls_audit_log_func log_func); | |
| | | | |
| skipping to change at line 2116 | | skipping to change at line 2115 | |
|---|
| typedef int (*gnutls_pin_callback_t) (void *userdata, int attempt, | | typedef int (*gnutls_pin_callback_t) (void *userdata, int attempt, | |
| const char *token_url, | | const char *token_url, | |
| const char *token_label, | | const char *token_label, | |
| unsigned int flags, | | unsigned int flags, | |
| char *pin, size_t pin_max); | | char *pin, size_t pin_max); | |
| | | | |
| void gnutls_certificate_set_pin_function(gnutls_certificate_credentials_t, | | void gnutls_certificate_set_pin_function(gnutls_certificate_credentials_t, | |
| gnutls_pin_callback_t fn, | | gnutls_pin_callback_t fn, | |
| void *userdata); | | void *userdata); | |
| | | | |
|
| /* Self checking functions */ | | | |
| int gnutls_cipher_self_test(unsigned all, gnutls_cipher_algorithm_t cipher) | | | |
| ; | | | |
| int gnutls_mac_self_test(unsigned all, gnutls_mac_algorithm_t mac); | | | |
| int gnutls_digest_self_test(unsigned all, gnutls_digest_algorithm_t digest) | | | |
| ; | | | |
| int gnutls_pk_self_test(unsigned all, gnutls_pk_algorithm_t pk); | | | |
| | | | |
| /* FIPS140-2 related functions */ | | /* FIPS140-2 related functions */ | |
| int gnutls_fips140_mode_enabled(void); | | int gnutls_fips140_mode_enabled(void); | |
| | | | |
| /* Gnutls error codes. The mapping to a TLS alert is also shown in | | /* Gnutls error codes. The mapping to a TLS alert is also shown in | |
| * comments. | | * comments. | |
| */ | | */ | |
| | | | |
| #define GNUTLS_E_SUCCESS 0 | | #define GNUTLS_E_SUCCESS 0 | |
| #define GNUTLS_E_UNKNOWN_COMPRESSION_ALGORITHM -3 | | #define GNUTLS_E_UNKNOWN_COMPRESSION_ALGORITHM -3 | |
| #define GNUTLS_E_UNKNOWN_CIPHER_TYPE -6 | | #define GNUTLS_E_UNKNOWN_CIPHER_TYPE -6 | |
| | | | |
| End of changes. 5 change blocks. |
|---|
| 12 lines changed or deleted | | 3 lines changed or added | |
|---|
|