| gnutls.h (3.2.1) | | gnutls.h (3.2.2) | |
| | | | |
| skipping to change at line 54 | | skipping to change at line 54 | |
| #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.2.1" | | #define GNUTLS_VERSION "3.2.2" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 2 | | #define GNUTLS_VERSION_MINOR 2 | |
|
| #define GNUTLS_VERSION_PATCH 1 | | #define GNUTLS_VERSION_PATCH 2 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030201 | | #define GNUTLS_VERSION_NUMBER 0x030202 | |
| | | | |
| #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 302 | | skipping to change at line 302 | |
| } gnutls_compression_method_t; | | } gnutls_compression_method_t; | |
| | | | |
| /* | | /* | |
| * Flags for gnutls_init() | | * Flags for gnutls_init() | |
| * | | * | |
| * @GNUTLS_SERVER: Connection end is a server. | | * @GNUTLS_SERVER: Connection end is a server. | |
| * @GNUTLS_CLIENT: Connection end is a client. | | * @GNUTLS_CLIENT: Connection end is a client. | |
| * @GNUTLS_DATAGRAM: Connection is datagram oriented (DTLS). | | * @GNUTLS_DATAGRAM: Connection is datagram oriented (DTLS). | |
| * @GNUTLS_NONBLOCK: Connection should not block (DTLS). | | * @GNUTLS_NONBLOCK: Connection should not block (DTLS). | |
| * @GNUTLS_NO_EXTENSIONS: Do not enable any TLS extensions by default. | | * @GNUTLS_NO_EXTENSIONS: Do not enable any TLS extensions by default. | |
|
| | | * @GNUTLS_NO_REPLAY_PROTECTION: Disable any replay protection in DTLS. | |
| * | | * | |
| */ | | */ | |
| #define GNUTLS_SERVER 1 | | #define GNUTLS_SERVER 1 | |
| #define GNUTLS_CLIENT (1<<1) | | #define GNUTLS_CLIENT (1<<1) | |
| #define GNUTLS_DATAGRAM (1<<2) | | #define GNUTLS_DATAGRAM (1<<2) | |
| #define GNUTLS_NONBLOCK (1<<3) | | #define GNUTLS_NONBLOCK (1<<3) | |
| #define GNUTLS_NO_EXTENSIONS (1<<4) | | #define GNUTLS_NO_EXTENSIONS (1<<4) | |
|
| | | #define GNUTLS_NO_REPLAY_PROTECTION (1<<5) | |
| | | | |
| /** | | /** | |
| * gnutls_alert_level_t: | | * gnutls_alert_level_t: | |
| * @GNUTLS_AL_WARNING: Alert of warning severity. | | * @GNUTLS_AL_WARNING: Alert of warning severity. | |
| * @GNUTLS_AL_FATAL: Alert of fatal severity. | | * @GNUTLS_AL_FATAL: Alert of fatal severity. | |
| * | | * | |
| * Enumeration of different TLS alert severities. | | * Enumeration of different TLS alert severities. | |
| */ | | */ | |
| typedef enum | | typedef enum | |
| { | | { | |
| | | | |
| skipping to change at line 434 | | skipping to change at line 436 | |
| GNUTLS_HANDSHAKE_SERVER_HELLO_DONE = 14, | | GNUTLS_HANDSHAKE_SERVER_HELLO_DONE = 14, | |
| GNUTLS_HANDSHAKE_CERTIFICATE_VERIFY = 15, | | GNUTLS_HANDSHAKE_CERTIFICATE_VERIFY = 15, | |
| GNUTLS_HANDSHAKE_CLIENT_KEY_EXCHANGE = 16, | | GNUTLS_HANDSHAKE_CLIENT_KEY_EXCHANGE = 16, | |
| GNUTLS_HANDSHAKE_FINISHED = 20, | | GNUTLS_HANDSHAKE_FINISHED = 20, | |
| GNUTLS_HANDSHAKE_CERTIFICATE_STATUS = 22, | | GNUTLS_HANDSHAKE_CERTIFICATE_STATUS = 22, | |
| GNUTLS_HANDSHAKE_SUPPLEMENTAL = 23, | | GNUTLS_HANDSHAKE_SUPPLEMENTAL = 23, | |
| GNUTLS_HANDSHAKE_CHANGE_CIPHER_SPEC = 254, | | GNUTLS_HANDSHAKE_CHANGE_CIPHER_SPEC = 254, | |
| GNUTLS_HANDSHAKE_CLIENT_HELLO_V2 = 1024, | | GNUTLS_HANDSHAKE_CLIENT_HELLO_V2 = 1024, | |
| } gnutls_handshake_description_t; | | } gnutls_handshake_description_t; | |
| | | | |
|
| | | #define GNUTLS_HANDSHAKE_ANY ((unsigned int)-1) | |
| | | | |
| | | const char * | |
| | | gnutls_handshake_description_get_name (gnutls_handshake_description_t type) | |
| | | ; | |
| | | | |
| /** | | /** | |
| * gnutls_certificate_status_t: | | * gnutls_certificate_status_t: | |
| * @GNUTLS_CERT_INVALID: The certificate is not signed by one of the | | * @GNUTLS_CERT_INVALID: The certificate is not signed by one of the | |
| * known authorities or the signature is invalid (deprecated by the flags | | * known authorities or the signature is invalid (deprecated by the flags | |
| * %GNUTLS_CERT_SIGNATURE_FAILURE and %GNUTLS_CERT_SIGNER_NOT_FOUND). | | * %GNUTLS_CERT_SIGNATURE_FAILURE and %GNUTLS_CERT_SIGNER_NOT_FOUND). | |
| * @GNUTLS_CERT_SIGNATURE_FAILURE: The signature verification failed. | | * @GNUTLS_CERT_SIGNATURE_FAILURE: The signature verification failed. | |
| * @GNUTLS_CERT_REVOKED: Certificate is revoked by its authority. In X.509
this will be | | * @GNUTLS_CERT_REVOKED: Certificate is revoked by its authority. In X.509
this will be | |
| * set only if CRLs are checked. | | * set only if CRLs are checked. | |
| * @GNUTLS_CERT_SIGNER_NOT_FOUND: The certificate's issuer is not known. | | * @GNUTLS_CERT_SIGNER_NOT_FOUND: The certificate's issuer is not known. | |
| * This is the case if the issuer is not included in the trusted certific
ate list. | | * This is the case if the issuer is not included in the trusted certific
ate list. | |
| | | | |
| skipping to change at line 827 | | skipping to change at line 834 | |
| int gnutls_sign_algorithm_get (gnutls_session_t session); | | int gnutls_sign_algorithm_get (gnutls_session_t session); | |
| int gnutls_sign_algorithm_get_client (gnutls_session_t session); | | int gnutls_sign_algorithm_get_client (gnutls_session_t session); | |
| | | | |
| int gnutls_sign_algorithm_get_requested (gnutls_session_t session, | | int gnutls_sign_algorithm_get_requested (gnutls_session_t session, | |
| size_t indx, | | size_t indx, | |
| gnutls_sign_algorithm_t * algo); | | gnutls_sign_algorithm_t * algo); | |
| | | | |
| /* the name of the specified algorithms */ | | /* the name of the specified algorithms */ | |
| const char *gnutls_cipher_get_name (gnutls_cipher_algorithm_t algorithm); | | const char *gnutls_cipher_get_name (gnutls_cipher_algorithm_t algorithm); | |
| const char *gnutls_mac_get_name (gnutls_mac_algorithm_t algorithm); | | const char *gnutls_mac_get_name (gnutls_mac_algorithm_t algorithm); | |
|
| | | const char *gnutls_digest_get_name (gnutls_digest_algorithm_t algorithm); | |
| const char *gnutls_compression_get_name (gnutls_compression_method_t | | const char *gnutls_compression_get_name (gnutls_compression_method_t | |
| algorithm); | | algorithm); | |
| const char *gnutls_kx_get_name (gnutls_kx_algorithm_t algorithm); | | const char *gnutls_kx_get_name (gnutls_kx_algorithm_t algorithm); | |
| const char *gnutls_certificate_type_get_name (gnutls_certificate_type_t | | const char *gnutls_certificate_type_get_name (gnutls_certificate_type_t | |
| type); | | type); | |
| const char *gnutls_pk_get_name (gnutls_pk_algorithm_t algorithm); | | const char *gnutls_pk_get_name (gnutls_pk_algorithm_t algorithm); | |
| const char *gnutls_sign_get_name (gnutls_sign_algorithm_t algorithm); | | const char *gnutls_sign_get_name (gnutls_sign_algorithm_t algorithm); | |
| | | | |
| size_t gnutls_cipher_get_key_size (gnutls_cipher_algorithm_t algorithm); | | size_t gnutls_cipher_get_key_size (gnutls_cipher_algorithm_t algorithm); | |
| size_t gnutls_mac_get_key_size (gnutls_mac_algorithm_t algorithm); | | size_t gnutls_mac_get_key_size (gnutls_mac_algorithm_t algorithm); | |
| | | | |
| skipping to change at line 850 | | skipping to change at line 858 | |
| gnutls_sign_get_hash_algorithm (gnutls_sign_algorithm_t sign); | | gnutls_sign_get_hash_algorithm (gnutls_sign_algorithm_t sign); | |
| gnutls_pk_algorithm_t | | gnutls_pk_algorithm_t | |
| gnutls_sign_get_pk_algorithm (gnutls_sign_algorithm_t sign); | | gnutls_sign_get_pk_algorithm (gnutls_sign_algorithm_t sign); | |
| gnutls_sign_algorithm_t | | gnutls_sign_algorithm_t | |
| gnutls_pk_to_sign (gnutls_pk_algorithm_t pk, | | gnutls_pk_to_sign (gnutls_pk_algorithm_t pk, | |
| gnutls_digest_algorithm_t hash); | | gnutls_digest_algorithm_t hash); | |
| | | | |
| #define gnutls_sign_algorithm_get_name gnutls_sign_get_name | | #define gnutls_sign_algorithm_get_name gnutls_sign_get_name | |
| | | | |
| gnutls_mac_algorithm_t gnutls_mac_get_id (const char *name); | | gnutls_mac_algorithm_t gnutls_mac_get_id (const char *name); | |
|
| | | gnutls_digest_algorithm_t gnutls_digest_get_id (const char *name); | |
| gnutls_compression_method_t gnutls_compression_get_id (const char *name); | | gnutls_compression_method_t gnutls_compression_get_id (const char *name); | |
| gnutls_cipher_algorithm_t gnutls_cipher_get_id (const char *name); | | gnutls_cipher_algorithm_t gnutls_cipher_get_id (const char *name); | |
| gnutls_kx_algorithm_t gnutls_kx_get_id (const char *name); | | gnutls_kx_algorithm_t gnutls_kx_get_id (const char *name); | |
| gnutls_protocol_t gnutls_protocol_get_id (const char *name); | | gnutls_protocol_t gnutls_protocol_get_id (const char *name); | |
| gnutls_certificate_type_t gnutls_certificate_type_get_id (const char *nam
e); | | gnutls_certificate_type_t gnutls_certificate_type_get_id (const char *nam
e); | |
| gnutls_pk_algorithm_t gnutls_pk_get_id (const char *name); | | gnutls_pk_algorithm_t gnutls_pk_get_id (const char *name); | |
| gnutls_sign_algorithm_t gnutls_sign_get_id (const char *name); | | gnutls_sign_algorithm_t gnutls_sign_get_id (const char *name); | |
| | | | |
| /* list supported algorithms */ | | /* list supported algorithms */ | |
| const gnutls_ecc_curve_t * gnutls_ecc_curve_list (void); | | const gnutls_ecc_curve_t * gnutls_ecc_curve_list (void); | |
| const gnutls_cipher_algorithm_t *gnutls_cipher_list (void); | | const gnutls_cipher_algorithm_t *gnutls_cipher_list (void); | |
| const gnutls_mac_algorithm_t *gnutls_mac_list (void); | | const gnutls_mac_algorithm_t *gnutls_mac_list (void); | |
|
| | | const gnutls_digest_algorithm_t *gnutls_digest_list (void); | |
| const gnutls_compression_method_t *gnutls_compression_list (void); | | const gnutls_compression_method_t *gnutls_compression_list (void); | |
| const gnutls_protocol_t *gnutls_protocol_list (void); | | const gnutls_protocol_t *gnutls_protocol_list (void); | |
| const gnutls_certificate_type_t *gnutls_certificate_type_list (void); | | const gnutls_certificate_type_t *gnutls_certificate_type_list (void); | |
| const gnutls_kx_algorithm_t *gnutls_kx_list (void); | | const gnutls_kx_algorithm_t *gnutls_kx_list (void); | |
| const gnutls_pk_algorithm_t *gnutls_pk_list (void); | | const gnutls_pk_algorithm_t *gnutls_pk_list (void); | |
| const gnutls_sign_algorithm_t *gnutls_sign_list (void); | | const gnutls_sign_algorithm_t *gnutls_sign_list (void); | |
| const char *gnutls_cipher_suite_info (size_t idx, | | const char *gnutls_cipher_suite_info (size_t idx, | |
| unsigned char *cs_id, | | unsigned char *cs_id, | |
| gnutls_kx_algorithm_t * kx, | | gnutls_kx_algorithm_t * kx, | |
| gnutls_cipher_algorithm_t * cipher, | | gnutls_cipher_algorithm_t * cipher, | |
| | | | |
| skipping to change at line 929 | | skipping to change at line 939 | |
| size_t data_size); | | size_t data_size); | |
| ssize_t gnutls_record_send_range (gnutls_session_t session, const void *d
ata, | | ssize_t gnutls_record_send_range (gnutls_session_t session, const void *d
ata, | |
| size_t data_size, const gnutls_range_st
*range); | | size_t data_size, 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); | |
| #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, siz
e_t data_size, | | ssize_t gnutls_record_recv_seq (gnutls_session_t session, void *data, siz
e_t data_size, | |
| unsigned char *seq); | | unsigned char *seq); | |
| | | | |
|
| | | size_t gnutls_record_overhead_size (gnutls_session_t session); | |
| | | | |
| | | size_t gnutls_est_record_overhead_size (gnutls_protocol_t version, | |
| | | gnutls_cipher_algorithm_t cipher, | |
| | | gnutls_mac_algorithm_t mac, | |
| | | gnutls_compression_method_t comp, | |
| | | unsigned int flags); | |
| | | | |
| void gnutls_session_enable_compatibility_mode (gnutls_session_t session); | | void gnutls_session_enable_compatibility_mode (gnutls_session_t session); | |
| void gnutls_record_set_max_empty_records (gnutls_session_t session, const
unsigned int i); | | void gnutls_record_set_max_empty_records (gnutls_session_t session, const
unsigned int i); | |
| | | | |
| int gnutls_record_can_use_length_hiding (gnutls_session_t session); | | int gnutls_record_can_use_length_hiding (gnutls_session_t session); | |
| | | | |
| int gnutls_record_get_direction (gnutls_session_t session); | | int gnutls_record_get_direction (gnutls_session_t session); | |
| | | | |
| size_t gnutls_record_get_max_size (gnutls_session_t session); | | size_t gnutls_record_get_max_size (gnutls_session_t session); | |
| ssize_t gnutls_record_set_max_size (gnutls_session_t session, size_t size
); | | ssize_t gnutls_record_set_max_size (gnutls_session_t session, size_t size
); | |
| | | | |
| | | | |
| skipping to change at line 1156 | | skipping to change at line 1174 | |
| void gnutls_db_set_remove_function (gnutls_session_t session, | | void gnutls_db_set_remove_function (gnutls_session_t session, | |
| gnutls_db_remove_func rem_func); | | gnutls_db_remove_func rem_func); | |
| void gnutls_db_set_store_function (gnutls_session_t session, | | void gnutls_db_set_store_function (gnutls_session_t session, | |
| gnutls_db_store_func store_func); | | gnutls_db_store_func store_func); | |
| void gnutls_db_set_ptr (gnutls_session_t session, void *ptr); | | void gnutls_db_set_ptr (gnutls_session_t session, void *ptr); | |
| void *gnutls_db_get_ptr (gnutls_session_t session); | | void *gnutls_db_get_ptr (gnutls_session_t session); | |
| int gnutls_db_check_entry (gnutls_session_t session, | | int gnutls_db_check_entry (gnutls_session_t session, | |
| gnutls_datum_t session_entry); | | gnutls_datum_t session_entry); | |
| time_t gnutls_db_check_entry_time (gnutls_datum_t *entry); | | time_t gnutls_db_check_entry_time (gnutls_datum_t *entry); | |
| | | | |
|
| | | /** | |
| | | * gnutls_handshake_hook_func: | |
| | | * @session: the current session | |
| | | * @htype: the type of the handshake message (%gnutls_handshake_descripti | |
| | | on_t) | |
| | | * @post: non zero if this is a post-process/generation call and zero oth | |
| | | erwise | |
| | | * @incoming: non zero if this is an incoming message and zero if this is | |
| | | an outgoing message | |
| | | * | |
| | | * Function prototype for handshake hooks. It is set using | |
| | | * gnutls_handshake_set_hook_function(). | |
| | | * | |
| | | * Returns: Non zero on error. | |
| | | */ | |
| | | #define GNUTLS_HOOK_POST (1) | |
| | | #define GNUTLS_HOOK_PRE (0) | |
| | | #define GNUTLS_HOOK_BOTH (-1) | |
| | | | |
| | | typedef int (*gnutls_handshake_hook_func) (gnutls_session_t, unsigned int | |
| | | htype, unsigned post, unsigned int incoming); | |
| | | void gnutls_handshake_set_hook_function (gnutls_session_t session, | |
| | | unsigned int htype, | |
| | | int post, | |
| | | gnutls_handshake_hook_func func); | |
| | | | |
| typedef int (*gnutls_handshake_post_client_hello_func) (gnutls_session_t)
; | | typedef int (*gnutls_handshake_post_client_hello_func) (gnutls_session_t)
; | |
| void | | void | |
| gnutls_handshake_set_post_client_hello_function (gnutls_session_t sessi
on, | | gnutls_handshake_set_post_client_hello_function (gnutls_session_t sessi
on, | |
| gnutls_handshake_post_
client_hello_func | | gnutls_handshake_post_
client_hello_func | |
| func); | | func); | |
| | | | |
| void gnutls_handshake_set_max_packet_length (gnutls_session_t session, | | void gnutls_handshake_set_max_packet_length (gnutls_session_t session, | |
| size_t max); | | size_t max); | |
| | | | |
| /* returns libgnutls version (call it with a NULL argument) | | /* returns libgnutls version (call it with a NULL argument) | |
| | | | |
End of changes. 11 change blocks. |
| 3 lines changed or deleted | | 48 lines changed or added | |
|