| gnutls.h (3.2.8.1) | | gnutls.h (3.2.9) | |
|---|
| | | | |
| 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.2.8" | | #define GNUTLS_VERSION "3.2.9" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 2 | | #define GNUTLS_VERSION_MINOR 2 | |
|
| #define GNUTLS_VERSION_PATCH 8 | | #define GNUTLS_VERSION_PATCH 9 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030208 | | #define GNUTLS_VERSION_NUMBER 0x030209 | |
| | | | |
| #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 (3.2.8.1) | | pkcs11.h (3.2.9) | |
|---|
| | | | |
| skipping to change at line 97 | | skipping to change at line 97 | |
|---|
| void gnutls_pkcs11_obj_set_pin_function(gnutls_pkcs11_obj_t obj, | | void gnutls_pkcs11_obj_set_pin_function(gnutls_pkcs11_obj_t obj, | |
| gnutls_pin_callback_t fn, | | gnutls_pin_callback_t fn, | |
| void *userdata); | | void *userdata); | |
| | | | |
| #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 */ | |
| #define GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED (1<<1) /* object marked as
trusted */ | | #define GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED (1<<1) /* object marked as
trusted */ | |
| #define GNUTLS_PKCS11_OBJ_FLAG_MARK_SENSITIVE (1<<2) /* object marked as
sensitive (unexportable) */ | | #define GNUTLS_PKCS11_OBJ_FLAG_MARK_SENSITIVE (1<<2) /* object marked as
sensitive (unexportable) */ | |
| #define GNUTLS_PKCS11_OBJ_FLAG_LOGIN_SO (1<<3) /* force login as a security
officer in the token for the operation */ | | #define GNUTLS_PKCS11_OBJ_FLAG_LOGIN_SO (1<<3) /* force login as a security
officer in the token for the operation */ | |
| #define GNUTLS_PKCS11_OBJ_FLAG_MARK_PRIVATE (1<<4) /* marked as private
(requires PIN to access) */ | | #define GNUTLS_PKCS11_OBJ_FLAG_MARK_PRIVATE (1<<4) /* marked as private
(requires PIN to access) */ | |
| #define GNUTLS_PKCS11_OBJ_FLAG_MARK_NOT_PRIVATE (1<<5) /* marked as not pri
vate */ | | #define GNUTLS_PKCS11_OBJ_FLAG_MARK_NOT_PRIVATE (1<<5) /* marked as not pri
vate */ | |
|
| | | #define GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_ANY (1<<6) /* No need for the certi | |
| | | ficate to be a trusted one */ | |
| | | #define GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_TRUSTED (1<<7) /* The certificate m | |
| | | ust be marked as trusted | |
| | | * in gnutls_pkcs11_crt_is_known() it implies GNUTLS_PKCS11_OBJ_FLAG_ | |
| | | RETRIEVE_COMPARE */ | |
| | | #define GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_DISTRUSTED (1<<8) /* The certificat | |
| | | e must be marked as distrusted */ | |
| | | #define GNUTLS_PKCS11_OBJ_FLAG_COMPARE (1<<9) /* The certificate must be fu | |
| | | lly compared */ | |
| | | | |
| /** | | /** | |
| * gnutls_pkcs11_url_type_t: | | * gnutls_pkcs11_url_type_t: | |
| * @GNUTLS_PKCS11_URL_GENERIC: A generic-purpose URL. | | * @GNUTLS_PKCS11_URL_GENERIC: A generic-purpose URL. | |
| * @GNUTLS_PKCS11_URL_LIB: A URL that specifies the library used as well. | | * @GNUTLS_PKCS11_URL_LIB: A URL that specifies the library used as well. | |
| * @GNUTLS_PKCS11_URL_LIB_VERSION: A URL that specifies the library and its
version. | | * @GNUTLS_PKCS11_URL_LIB_VERSION: A URL that specifies the library and its
version. | |
| * | | * | |
| * Enumeration of different URL extraction flags. | | * Enumeration of different URL extraction flags. | |
| */ | | */ | |
| typedef enum { | | typedef enum { | |
| | | | |
| End of changes. 1 change blocks. |
|---|
| 0 lines changed or deleted | | 10 lines changed or added | |
|---|
|