| gnutls.h (3.3.16) | | gnutls.h (3.3.17) | |
|---|
| | | | |
| 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.16" | | #define GNUTLS_VERSION "3.3.17" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 3 | | #define GNUTLS_VERSION_MINOR 3 | |
|
| #define GNUTLS_VERSION_PATCH 16 | | #define GNUTLS_VERSION_PATCH 17 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030310 | | #define GNUTLS_VERSION_NUMBER 0x030311 | |
| | | | |
| #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.16) | | pkcs11.h (3.3.17) | |
|---|
| | | | |
| skipping to change at line 109 | | skipping to change at line 109 | |
|---|
| * @GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_ANY: When retrieving an object, do not
set any requirements. | | * @GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_ANY: When retrieving an object, do not
set any requirements. | |
| * @GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_TRUSTED: When retrieving an object, onl
y retrieve the marked as trusted. | | * @GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_TRUSTED: When retrieving an object, onl
y retrieve the marked as trusted. | |
| * In gnutls_pkcs11_crt_is_known() it implies %GNUTLS_PKCS11_OBJ_FLAG_RET
RIEVE_COMPARE if %GNUTLS_PKCS11_OBJ_FLAG_COMPARE_KEY is not given. | | * In gnutls_pkcs11_crt_is_known() it implies %GNUTLS_PKCS11_OBJ_FLAG_RET
RIEVE_COMPARE if %GNUTLS_PKCS11_OBJ_FLAG_COMPARE_KEY is not given. | |
| * @GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_DISTRUSTED: When retrieving an object,
only retrieve the marked as distrusted. | | * @GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_DISTRUSTED: When retrieving an object,
only retrieve the marked as distrusted. | |
| * @GNUTLS_PKCS11_OBJ_FLAG_COMPARE: When checking an object's presence, ful
ly compare it before returning any result. | | * @GNUTLS_PKCS11_OBJ_FLAG_COMPARE: When checking an object's presence, ful
ly compare it before returning any result. | |
| * @GNUTLS_PKCS11_OBJ_FLAG_COMPARE_KEY: When checking an object's presence,
compare the key before returning any result. | | * @GNUTLS_PKCS11_OBJ_FLAG_COMPARE_KEY: When checking an object's presence,
compare the key before returning any result. | |
| * @GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE: The object must be pr
esent in a marked as trusted module. | | * @GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE: The object must be pr
esent in a marked as trusted module. | |
| * @GNUTLS_PKCS11_OBJ_FLAG_MARK_CA: Mark the object as a CA. | | * @GNUTLS_PKCS11_OBJ_FLAG_MARK_CA: Mark the object as a CA. | |
| * @GNUTLS_PKCS11_OBJ_FLAG_MARK_KEY_WRAP: Mark the generated key pair as wr
apping and unwrapping keys. | | * @GNUTLS_PKCS11_OBJ_FLAG_MARK_KEY_WRAP: Mark the generated key pair as wr
apping and unwrapping keys. | |
| * @GNUTLS_PKCS11_OBJ_FLAG_OVERWRITE_TRUSTMOD_EXT: When an issuer is reques
ted, override its extensions with the ones present in the trust module. | | * @GNUTLS_PKCS11_OBJ_FLAG_OVERWRITE_TRUSTMOD_EXT: When an issuer is reques
ted, override its extensions with the ones present in the trust module. | |
|
| | | * @GNUTLS_PKCS11_OBJ_FLAG_NO_STORE_PUBKEY: When generating a keypair don't
store the public key (store). | |
| * | | * | |
| * Enumeration of different PKCS #11 object flags. | | * Enumeration of different PKCS #11 object flags. | |
| */ | | */ | |
| typedef enum gnutls_pkcs11_obj_flags { | | typedef enum gnutls_pkcs11_obj_flags { | |
| GNUTLS_PKCS11_OBJ_FLAG_LOGIN = (1<<0), | | GNUTLS_PKCS11_OBJ_FLAG_LOGIN = (1<<0), | |
| GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED = (1<<1), | | GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED = (1<<1), | |
| GNUTLS_PKCS11_OBJ_FLAG_MARK_SENSITIVE = (1<<2), | | GNUTLS_PKCS11_OBJ_FLAG_MARK_SENSITIVE = (1<<2), | |
| GNUTLS_PKCS11_OBJ_FLAG_LOGIN_SO = (1<<3), | | GNUTLS_PKCS11_OBJ_FLAG_LOGIN_SO = (1<<3), | |
| GNUTLS_PKCS11_OBJ_FLAG_MARK_PRIVATE = (1<<4), | | GNUTLS_PKCS11_OBJ_FLAG_MARK_PRIVATE = (1<<4), | |
| 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), | |
| | | GNUTLS_PKCS11_OBJ_FLAG_NO_STORE_PUBKEY = (1<<20) | |
| /* flags 1<<29 and later are reserved - see pkcs11_int.h */ | | /* 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. 2 change blocks. |
|---|
| 1 lines changed or deleted | | 3 lines changed or added | |
|---|
|