| gnutls.h (3.3.11) | | gnutls.h (3.3.12) | |
| | | | |
| 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.11" | | #define GNUTLS_VERSION "3.3.12" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 3 | | #define GNUTLS_VERSION_MINOR 3 | |
|
| #define GNUTLS_VERSION_PATCH 11 | | #define GNUTLS_VERSION_PATCH 12 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x03030b | | #define GNUTLS_VERSION_NUMBER 0x03030c | |
| | | | |
| #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.3.11) | | pkcs11.h (3.3.12) | |
| | | | |
| skipping to change at line 128 | | skipping to change at line 128 | |
| GNUTLS_PKCS11_OBJ_FLAG_MARK_NOT_PRIVATE = (1<<5), | | GNUTLS_PKCS11_OBJ_FLAG_MARK_NOT_PRIVATE = (1<<5), | |
| GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_ANY = (1<<6), | | GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_ANY = (1<<6), | |
| GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_TRUSTED = (1<<7), | | GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_TRUSTED = (1<<7), | |
| GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_DISTRUSTED = (1<<8), | | GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_DISTRUSTED = (1<<8), | |
| GNUTLS_PKCS11_OBJ_FLAG_COMPARE = (1<<9), | | GNUTLS_PKCS11_OBJ_FLAG_COMPARE = (1<<9), | |
| GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE = (1<<10), | | GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE = (1<<10), | |
| GNUTLS_PKCS11_OBJ_FLAG_MARK_CA = (1<<11), | | GNUTLS_PKCS11_OBJ_FLAG_MARK_CA = (1<<11), | |
| GNUTLS_PKCS11_OBJ_FLAG_MARK_KEY_WRAP = (1<<12), | | GNUTLS_PKCS11_OBJ_FLAG_MARK_KEY_WRAP = (1<<12), | |
| GNUTLS_PKCS11_OBJ_FLAG_COMPARE_KEY = (1<<13), | | GNUTLS_PKCS11_OBJ_FLAG_COMPARE_KEY = (1<<13), | |
| GNUTLS_PKCS11_OBJ_FLAG_OVERWRITE_TRUSTMOD_EXT = (1<<14) | | GNUTLS_PKCS11_OBJ_FLAG_OVERWRITE_TRUSTMOD_EXT = (1<<14) | |
|
| | | /* flags 1<<29 and later are reserved - see pkcs11_int.h */ | |
| } gnutls_pkcs11_obj_flags; | | } gnutls_pkcs11_obj_flags; | |
| | | | |
| /** | | /** | |
| * 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. | |
| */ | | */ | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 1 lines changed or added | |
|