| gnutls.h (3.0.7) | | gnutls.h (3.0.8) | |
| | | | |
| skipping to change at line 52 | | skipping to change at line 52 | |
| #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 "3.0.7" | | #define GNUTLS_VERSION "3.0.8" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 0 | | #define GNUTLS_VERSION_MINOR 0 | |
|
| #define GNUTLS_VERSION_PATCH 7 | | #define GNUTLS_VERSION_PATCH 8 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030007 | | #define GNUTLS_VERSION_NUMBER 0x030008 | |
| | | | |
| #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 1785 | | skipping to change at line 1785 | |
| #define GNUTLS_E_PKCS11_TOKEN_ERROR -316 | | #define GNUTLS_E_PKCS11_TOKEN_ERROR -316 | |
| #define GNUTLS_E_PKCS11_USER_ERROR -317 | | #define GNUTLS_E_PKCS11_USER_ERROR -317 | |
| | | | |
| #define GNUTLS_E_CRYPTO_INIT_FAILED -318 | | #define GNUTLS_E_CRYPTO_INIT_FAILED -318 | |
| #define GNUTLS_E_TIMEDOUT -319 | | #define GNUTLS_E_TIMEDOUT -319 | |
| #define GNUTLS_E_USER_ERROR -320 | | #define GNUTLS_E_USER_ERROR -320 | |
| #define GNUTLS_E_ECC_NO_SUPPORTED_CURVES -321 | | #define GNUTLS_E_ECC_NO_SUPPORTED_CURVES -321 | |
| #define GNUTLS_E_ECC_UNSUPPORTED_CURVE -322 | | #define GNUTLS_E_ECC_UNSUPPORTED_CURVE -322 | |
| #define GNUTLS_E_PKCS11_REQUESTED_OBJECT_NOT_AVAILBLE -323 | | #define GNUTLS_E_PKCS11_REQUESTED_OBJECT_NOT_AVAILBLE -323 | |
| #define GNUTLS_E_CERTIFICATE_LIST_UNSORTED -324 | | #define GNUTLS_E_CERTIFICATE_LIST_UNSORTED -324 | |
|
| | | #define GNUTLS_E_ILLEGAL_PARAMETER -325 | |
| | | | |
| #define GNUTLS_E_UNIMPLEMENTED_FEATURE -1250 | | #define GNUTLS_E_UNIMPLEMENTED_FEATURE -1250 | |
| | | | |
| #define GNUTLS_E_APPLICATION_ERROR_MAX -65000 | | #define GNUTLS_E_APPLICATION_ERROR_MAX -65000 | |
| #define GNUTLS_E_APPLICATION_ERROR_MIN -65500 | | #define GNUTLS_E_APPLICATION_ERROR_MIN -65500 | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } | | } | |
| #endif | | #endif | |
| | | | |
| | | | |
End of changes. 4 change blocks. |
| 3 lines changed or deleted | | 4 lines changed or added | |
|
| pkcs11.h (3.0.7) | | pkcs11.h (3.0.8) | |
| | | | |
| skipping to change at line 52 | | skipping to change at line 52 | |
| * if the token is not detected and the retry counter will be | | * if the token is not detected and the retry counter will be | |
| * increased. | | * increased. | |
| * | | * | |
| * Returns: %GNUTLS_E_SUCCESS (0) on success or a negative error code | | * Returns: %GNUTLS_E_SUCCESS (0) on success or a negative error code | |
| * on error. | | * on error. | |
| * | | * | |
| * Since: 2.12.0 | | * Since: 2.12.0 | |
| **/ | | **/ | |
| typedef int (*gnutls_pkcs11_token_callback_t) (void *const userdata, | | typedef int (*gnutls_pkcs11_token_callback_t) (void *const userdata, | |
| const char *const label, | | const char *const label, | |
|
| const unsigned retry); | | unsigned retry); | |
| | | | |
| /** | | /** | |
| * gnutls_pkcs11_pin_flag_t: | | * gnutls_pkcs11_pin_flag_t: | |
| * @GNUTLS_PKCS11_PIN_USER: The PIN for the user. | | * @GNUTLS_PKCS11_PIN_USER: The PIN for the user. | |
| * @GNUTLS_PKCS11_PIN_SO: The PIN for the security officer. | | * @GNUTLS_PKCS11_PIN_SO: The PIN for the security officer. | |
| * @GNUTLS_PKCS11_PIN_CONTEXT_SPECIFIC: The PIN is for a specific action an
d key like signing. | | * @GNUTLS_PKCS11_PIN_CONTEXT_SPECIFIC: The PIN is for a specific action an
d key like signing. | |
| * @GNUTLS_PKCS11_PIN_FINAL_TRY: This is the final try before blocking. | | * @GNUTLS_PKCS11_PIN_FINAL_TRY: This is the final try before blocking. | |
| * @GNUTLS_PKCS11_PIN_COUNT_LOW: Few tries remain before token blocks. | | * @GNUTLS_PKCS11_PIN_COUNT_LOW: Few tries remain before token blocks. | |
| * @GNUTLS_PKCS11_PIN_WRONG: Last given PIN was not correct. | | * @GNUTLS_PKCS11_PIN_WRONG: Last given PIN was not correct. | |
| * | | * | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|
| x509.h (3.0.7) | | x509.h (3.0.8) | |
| | | | |
| skipping to change at line 736 | | skipping to change at line 736 | |
| | | | |
| int gnutls_x509_privkey_get_pk_algorithm (gnutls_x509_privkey_t key); | | int gnutls_x509_privkey_get_pk_algorithm (gnutls_x509_privkey_t key); | |
| int gnutls_x509_privkey_get_key_id (gnutls_x509_privkey_t key, | | int gnutls_x509_privkey_get_key_id (gnutls_x509_privkey_t key, | |
| unsigned int flags, | | unsigned int flags, | |
| unsigned char *output_data, | | unsigned char *output_data, | |
| size_t * output_data_size); | | size_t * output_data_size); | |
| | | | |
| int gnutls_x509_privkey_generate (gnutls_x509_privkey_t key, | | int gnutls_x509_privkey_generate (gnutls_x509_privkey_t key, | |
| gnutls_pk_algorithm_t algo, | | gnutls_pk_algorithm_t algo, | |
| unsigned int bits, unsigned int flags); | | unsigned int bits, unsigned int flags); | |
|
| | | int gnutls_x509_privkey_verify_params (gnutls_x509_privkey_t key); | |
| | | | |
| int gnutls_x509_privkey_export (gnutls_x509_privkey_t key, | | int gnutls_x509_privkey_export (gnutls_x509_privkey_t key, | |
| gnutls_x509_crt_fmt_t format, | | gnutls_x509_crt_fmt_t format, | |
| void *output_data, | | void *output_data, | |
| size_t * output_data_size); | | size_t * output_data_size); | |
| int gnutls_x509_privkey_export_pkcs8 (gnutls_x509_privkey_t key, | | int gnutls_x509_privkey_export_pkcs8 (gnutls_x509_privkey_t key, | |
| gnutls_x509_crt_fmt_t format, | | gnutls_x509_crt_fmt_t format, | |
| const char *password, | | const char *password, | |
| unsigned int flags, | | unsigned int flags, | |
| void *output_data, | | void *output_data, | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 1 lines changed or added | |
|