| gnutls.h (2.12.16) | | gnutls.h (2.12.17) | |
|---|
| | | | |
| skipping to change at line 55 | | skipping to change at line 55 | |
|---|
| #include <sys/types.h> | | #include <sys/types.h> | |
| /* *INDENT-ON* */ | | /* *INDENT-ON* */ | |
| #endif | | #endif | |
| /* Get time_t. */ | | /* Get time_t. */ | |
| #include <time.h> | | #include <time.h> | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" | | extern "C" | |
| { | | { | |
| #endif | | #endif | |
| | | | |
|
| #define GNUTLS_VERSION "2.12.16" | | #define GNUTLS_VERSION "2.12.17" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 2 | | #define GNUTLS_VERSION_MAJOR 2 | |
| #define GNUTLS_VERSION_MINOR 12 | | #define GNUTLS_VERSION_MINOR 12 | |
|
| #define GNUTLS_VERSION_PATCH 16 | | #define GNUTLS_VERSION_PATCH 17 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x020c10 | | #define GNUTLS_VERSION_NUMBER 0x020c11 | |
| | | | |
| #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. | |
| | | | |
| End of changes. 3 change blocks. |
|---|
| 3 lines changed or deleted | | 3 lines changed or added | |
|---|
|
| pkcs11.h (2.12.16) | | pkcs11.h (2.12.17) | |
|---|
| | | | |
| skipping to change at line 94 | | skipping to change at line 94 | |
|---|
| | | | |
| #define GNUTLS_PKCS11_FLAG_MANUAL 0 /* Manual loading of libraries */ | | #define GNUTLS_PKCS11_FLAG_MANUAL 0 /* Manual loading of libraries */ | |
| #define GNUTLS_PKCS11_FLAG_AUTO 1 /* Automatically load libraries by
reading /etc/gnutls/pkcs11.conf */ | | #define GNUTLS_PKCS11_FLAG_AUTO 1 /* Automatically load libraries by
reading /etc/gnutls/pkcs11.conf */ | |
| | | | |
| /* pkcs11.conf format: | | /* pkcs11.conf format: | |
| * load = /lib/xxx-pkcs11.so | | * load = /lib/xxx-pkcs11.so | |
| * load = /lib/yyy-pkcs11.so | | * load = /lib/yyy-pkcs11.so | |
| */ | | */ | |
| | | | |
| int gnutls_pkcs11_init (unsigned int flags, const char *deprecated_config_f
ile); | | int gnutls_pkcs11_init (unsigned int flags, const char *deprecated_config_f
ile); | |
|
| | | int gnutls_pkcs11_reinit (void); | |
| void gnutls_pkcs11_deinit (void); | | void gnutls_pkcs11_deinit (void); | |
| void gnutls_pkcs11_set_token_function (gnutls_pkcs11_token_callback_t fn, | | void gnutls_pkcs11_set_token_function (gnutls_pkcs11_token_callback_t fn, | |
| void *userdata); | | void *userdata); | |
| | | | |
| void gnutls_pkcs11_set_pin_function (gnutls_pkcs11_pin_callback_t fn, | | void gnutls_pkcs11_set_pin_function (gnutls_pkcs11_pin_callback_t fn, | |
| void *userdata); | | void *userdata); | |
| int gnutls_pkcs11_add_provider (const char *name, const char *params); | | int gnutls_pkcs11_add_provider (const char *name, const char *params); | |
| int gnutls_pkcs11_obj_init (gnutls_pkcs11_obj_t * obj); | | int gnutls_pkcs11_obj_init (gnutls_pkcs11_obj_t * obj); | |
| | | | |
| #define GNUTLS_PKCS11_OBJ_FLAG_LOGIN (1<<0) /* force login in the token
for the operation */ | | #define GNUTLS_PKCS11_OBJ_FLAG_LOGIN (1<<0) /* force login in the token
for the operation */ | |
| | | | |
| End of changes. 1 change blocks. |
|---|
| 0 lines changed or deleted | | 1 lines changed or added | |
|---|
|