| gnutls.h (3.3.4) | | gnutls.h (3.3.5) | |
| | | | |
| 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.4" | | #define GNUTLS_VERSION "3.3.5" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 3 | | #define GNUTLS_VERSION_MINOR 3 | |
|
| #define GNUTLS_VERSION_PATCH 4 | | #define GNUTLS_VERSION_PATCH 5 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030304 | | #define GNUTLS_VERSION_NUMBER 0x030305 | |
| | | | |
| #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 933 | | skipping to change at line 933 | |
| gnutls_range_st * small_range, | | gnutls_range_st * small_range, | |
| gnutls_range_st * rem_range); | | gnutls_range_st * rem_range); | |
| | | | |
| ssize_t gnutls_record_send(gnutls_session_t session, const void *data, | | ssize_t gnutls_record_send(gnutls_session_t session, const void *data, | |
| size_t data_size); | | size_t data_size); | |
| ssize_t gnutls_record_send_range(gnutls_session_t session, | | ssize_t gnutls_record_send_range(gnutls_session_t session, | |
| const void *data, size_t data_size, | | const void *data, size_t data_size, | |
| const gnutls_range_st * range); | | const gnutls_range_st * range); | |
| ssize_t gnutls_record_recv(gnutls_session_t session, void *data, | | ssize_t gnutls_record_recv(gnutls_session_t session, void *data, | |
| size_t data_size); | | size_t data_size); | |
|
| | | | |
| | | typedef struct mbuffer_st *gnutls_packet_t; | |
| | | | |
| | | ssize_t | |
| | | gnutls_record_recv_packet(gnutls_session_t session, | |
| | | gnutls_packet_t *packet); | |
| | | | |
| | | void gnutls_packet_get(gnutls_packet_t packet, gnutls_datum_t *data, unsign | |
| | | ed char *sequence); | |
| | | void gnutls_packet_deinit(gnutls_packet_t packet); | |
| | | | |
| #define gnutls_read gnutls_record_recv | | #define gnutls_read gnutls_record_recv | |
| #define gnutls_write gnutls_record_send | | #define gnutls_write gnutls_record_send | |
| ssize_t gnutls_record_recv_seq(gnutls_session_t session, void *data, | | ssize_t gnutls_record_recv_seq(gnutls_session_t session, void *data, | |
| size_t data_size, unsigned char *seq); | | size_t data_size, unsigned char *seq); | |
| | | | |
| size_t gnutls_record_overhead_size(gnutls_session_t session); | | size_t gnutls_record_overhead_size(gnutls_session_t session); | |
| | | | |
| size_t gnutls_est_record_overhead_size(gnutls_protocol_t version, | | size_t gnutls_est_record_overhead_size(gnutls_protocol_t version, | |
| gnutls_cipher_algorithm_t cipher, | | gnutls_cipher_algorithm_t cipher, | |
| gnutls_mac_algorithm_t mac, | | gnutls_mac_algorithm_t mac, | |
| | | | |
End of changes. 4 change blocks. |
| 3 lines changed or deleted | | 14 lines changed or added | |
|
| pkcs11.h (3.3.4) | | pkcs11.h (3.3.5) | |
| | | | |
| skipping to change at line 103 | | skipping to change at line 103 | |
| #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 objec
t to be a trusted one */ | | #define GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_ANY (1<<6) /* No need for the objec
t to be a trusted one */ | |
| #define GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_TRUSTED (1<<7) /* The object must b
e marked as trusted | | #define GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_TRUSTED (1<<7) /* The object must b
e marked as trusted | |
| * in gnutls_pkcs11_crt_is_known() it implies GNUTLS_PKCS11_OBJ_FLAG_
RETRIEVE_COMPARE */ | | * in gnutls_pkcs11_crt_is_known() it implies GNUTLS_PKCS11_OBJ_FLAG_
RETRIEVE_COMPARE */ | |
| #define GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_DISTRUSTED (1<<8) /* The object mus
t be marked as distrusted */ | | #define GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_DISTRUSTED (1<<8) /* The object mus
t be marked as distrusted */ | |
| #define GNUTLS_PKCS11_OBJ_FLAG_COMPARE (1<<9) /* The object must be fully c
ompared */ | | #define GNUTLS_PKCS11_OBJ_FLAG_COMPARE (1<<9) /* The object must be fully c
ompared */ | |
| #define GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE (1<<10) /* The obj
ect must be present in a marked as trusted module */ | | #define GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE (1<<10) /* The obj
ect must be present in a marked as trusted module */ | |
|
| | | #define GNUTLS_PKCS11_OBJ_FLAG_MARK_CA (1<<11) /* object marked as CA */ | |
| | | | |
| /** | | /** | |
| * 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 | | 1 lines changed or added | |
|
| x509.h (3.3.4) | | x509.h (3.3.5) | |
| | | | |
| skipping to change at line 649 | | skipping to change at line 649 | |
| char *sig, size_t * sizeof_sig); | | char *sig, size_t * sizeof_sig); | |
| int gnutls_x509_crl_get_version(gnutls_x509_crl_t crl); | | int gnutls_x509_crl_get_version(gnutls_x509_crl_t crl); | |
| | | | |
| time_t gnutls_x509_crl_get_this_update(gnutls_x509_crl_t crl); | | time_t gnutls_x509_crl_get_this_update(gnutls_x509_crl_t crl); | |
| time_t gnutls_x509_crl_get_next_update(gnutls_x509_crl_t crl); | | time_t gnutls_x509_crl_get_next_update(gnutls_x509_crl_t crl); | |
| | | | |
| int gnutls_x509_crl_get_crt_count(gnutls_x509_crl_t crl); | | int gnutls_x509_crl_get_crt_count(gnutls_x509_crl_t crl); | |
| int gnutls_x509_crl_get_crt_serial(gnutls_x509_crl_t crl, int indx, | | int gnutls_x509_crl_get_crt_serial(gnutls_x509_crl_t crl, int indx, | |
| unsigned char *serial, | | unsigned char *serial, | |
| size_t * serial_size, time_t * t); | | size_t * serial_size, time_t * t); | |
|
| | | | |
| | | typedef struct gnutls_x509_crl_iter * gnutls_x509_crl_iter_t; | |
| | | | |
| | | int gnutls_x509_crl_iter_crt_serial(gnutls_x509_crl_t crl, | |
| | | gnutls_x509_crl_iter_t *, | |
| | | unsigned char *serial, | |
| | | size_t * serial_size, time_t * t); | |
| | | | |
| | | void gnutls_x509_crl_iter_deinit(gnutls_x509_crl_iter_t); | |
| | | | |
| #define gnutls_x509_crl_get_certificate_count gnutls_x509_crl_get_crt_count | | #define gnutls_x509_crl_get_certificate_count gnutls_x509_crl_get_crt_count | |
| #define gnutls_x509_crl_get_certificate gnutls_x509_crl_get_crt_serial | | #define gnutls_x509_crl_get_certificate gnutls_x509_crl_get_crt_serial | |
| | | | |
| int gnutls_x509_crl_check_issuer(gnutls_x509_crl_t crl, | | int gnutls_x509_crl_check_issuer(gnutls_x509_crl_t crl, | |
| gnutls_x509_crt_t issuer); | | gnutls_x509_crt_t issuer); | |
| | | | |
| int gnutls_x509_crl_list_import2(gnutls_x509_crl_t ** crls, | | int gnutls_x509_crl_list_import2(gnutls_x509_crl_t ** crls, | |
| unsigned int *size, | | unsigned int *size, | |
| const gnutls_datum_t * data, | | const gnutls_datum_t * data, | |
| gnutls_x509_crt_fmt_t format, | | gnutls_x509_crt_fmt_t format, | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 10 lines changed or added | |
|