| gnutls.h (3.1.8) | | gnutls.h (3.1.9) | |
| | | | |
| 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.1.8" | | #define GNUTLS_VERSION "3.1.9" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 1 | | #define GNUTLS_VERSION_MINOR 1 | |
|
| #define GNUTLS_VERSION_PATCH 8 | | #define GNUTLS_VERSION_PATCH 9 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030108 | | #define GNUTLS_VERSION_NUMBER 0x030109 | |
| | | | |
| #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 877 | | skipping to change at line 877 | |
| int gnutls_error_to_alert (int err, int *level); | | int gnutls_error_to_alert (int err, int *level); | |
| | | | |
| void gnutls_perror (int error); | | void gnutls_perror (int error); | |
| const char *gnutls_strerror (int error); | | const char *gnutls_strerror (int error); | |
| const char *gnutls_strerror_name (int error); | | const char *gnutls_strerror_name (int error); | |
| | | | |
| /* Semi-internal functions. | | /* Semi-internal functions. | |
| */ | | */ | |
| void gnutls_handshake_set_private_extensions (gnutls_session_t session, | | void gnutls_handshake_set_private_extensions (gnutls_session_t session, | |
| int allow); | | int allow); | |
|
| | | int gnutls_handshake_set_random (gnutls_session_t session, const gnutls_d | |
| | | atum_t* random); | |
| | | | |
| gnutls_handshake_description_t | | gnutls_handshake_description_t | |
| gnutls_handshake_get_last_out (gnutls_session_t session); | | gnutls_handshake_get_last_out (gnutls_session_t session); | |
| gnutls_handshake_description_t | | gnutls_handshake_description_t | |
| gnutls_handshake_get_last_in (gnutls_session_t session); | | gnutls_handshake_get_last_in (gnutls_session_t session); | |
| | | | |
| /* Record layer functions. | | /* Record layer functions. | |
| */ | | */ | |
| #define GNUTLS_HEARTBEAT_WAIT 1 | | #define GNUTLS_HEARTBEAT_WAIT 1 | |
| int gnutls_heartbeat_ping (gnutls_session_t session, size_t data_size, | | int gnutls_heartbeat_ping (gnutls_session_t session, size_t data_size, | |
| unsigned int max_tries, unsigned int flags); | | unsigned int max_tries, unsigned int flags); | |
| | | | |
| skipping to change at line 1404 | | skipping to change at line 1406 | |
| typedef ssize_t (*gnutls_push_func) (gnutls_transport_ptr_t, const void *
, | | typedef ssize_t (*gnutls_push_func) (gnutls_transport_ptr_t, const void *
, | |
| size_t); | | size_t); | |
| | | | |
| typedef int (*gnutls_pull_timeout_func) (gnutls_transport_ptr_t, unsigned
int ms); | | typedef int (*gnutls_pull_timeout_func) (gnutls_transport_ptr_t, unsigned
int ms); | |
| | | | |
| typedef ssize_t (*gnutls_vec_push_func) (gnutls_transport_ptr_t, | | typedef ssize_t (*gnutls_vec_push_func) (gnutls_transport_ptr_t, | |
| const giovec_t * iov, int iovcnt
); | | const giovec_t * iov, int iovcnt
); | |
| | | | |
| typedef int (*gnutls_errno_func) (gnutls_transport_ptr_t); | | typedef int (*gnutls_errno_func) (gnutls_transport_ptr_t); | |
| | | | |
|
| | | /* This will be defined as macro. | |
| | | void gnutls_transport_set_int (gnutls_session_t session, int r); | |
| | | */ | |
| | | void gnutls_transport_set_int2 (gnutls_session_t session, int r, int s); | |
| | | #define gnutls_transport_set_int(s, i) gnutls_transport_set_int2(s, i, i) | |
| | | | |
| | | void gnutls_transport_get_int2 (gnutls_session_t session, int * r, int *s | |
| | | ); | |
| | | int gnutls_transport_get_int (gnutls_session_t session); | |
| | | | |
| void gnutls_transport_set_ptr (gnutls_session_t session, | | void gnutls_transport_set_ptr (gnutls_session_t session, | |
| gnutls_transport_ptr_t ptr); | | gnutls_transport_ptr_t ptr); | |
| void gnutls_transport_set_ptr2 (gnutls_session_t session, | | void gnutls_transport_set_ptr2 (gnutls_session_t session, | |
| gnutls_transport_ptr_t recv_ptr, | | gnutls_transport_ptr_t recv_ptr, | |
| gnutls_transport_ptr_t send_ptr); | | gnutls_transport_ptr_t send_ptr); | |
| | | | |
| gnutls_transport_ptr_t gnutls_transport_get_ptr (gnutls_session_t session
); | | gnutls_transport_ptr_t gnutls_transport_get_ptr (gnutls_session_t session
); | |
| void gnutls_transport_get_ptr2 (gnutls_session_t session, | | void gnutls_transport_get_ptr2 (gnutls_session_t session, | |
| gnutls_transport_ptr_t * recv_ptr, | | gnutls_transport_ptr_t * recv_ptr, | |
| gnutls_transport_ptr_t * send_ptr); | | gnutls_transport_ptr_t * send_ptr); | |
| | | | |
End of changes. 5 change blocks. |
| 3 lines changed or deleted | | 16 lines changed or added | |
|
| pkcs11.h (3.1.8) | | pkcs11.h (3.1.9) | |
| | | | |
| skipping to change at line 304 | | skipping to change at line 304 | |
| int gnutls_pkcs11_privkey_get_info (gnutls_pkcs11_privkey_t pkey, | | int gnutls_pkcs11_privkey_get_info (gnutls_pkcs11_privkey_t pkey, | |
| gnutls_pkcs11_obj_info_t itype, | | gnutls_pkcs11_obj_info_t itype, | |
| void *output, size_t * output_size); | | void *output, size_t * output_size); | |
| | | | |
| int gnutls_pkcs11_privkey_import_url (gnutls_pkcs11_privkey_t pkey, | | int gnutls_pkcs11_privkey_import_url (gnutls_pkcs11_privkey_t pkey, | |
| const char *url, unsigned int flags); | | const char *url, unsigned int flags); | |
| | | | |
| int gnutls_pkcs11_privkey_export_url (gnutls_pkcs11_privkey_t key, | | int gnutls_pkcs11_privkey_export_url (gnutls_pkcs11_privkey_t key, | |
| gnutls_pkcs11_url_type_t detailed, | | gnutls_pkcs11_url_type_t detailed, | |
| char **url); | | char **url); | |
|
| | | int gnutls_pkcs11_privkey_status (gnutls_pkcs11_privkey_t key); | |
| | | | |
| int gnutls_pkcs11_privkey_generate (const char* url, | | int gnutls_pkcs11_privkey_generate (const char* url, | |
| gnutls_pk_algorithm_t pk, | | gnutls_pk_algorithm_t pk, | |
| unsigned int bits, | | unsigned int bits, | |
| const char* label, unsigned int flags); | | const char* label, unsigned int flags); | |
| | | | |
| int | | int | |
| gnutls_pkcs11_privkey_generate2 (const char* url, gnutls_pk_algorithm_t pk, | | gnutls_pkcs11_privkey_generate2 (const char* url, gnutls_pk_algorithm_t pk, | |
| unsigned int bits, const char* label, | | unsigned int bits, const char* label, | |
| gnutls_x509_crt_fmt_t fmt, | | gnutls_x509_crt_fmt_t fmt, | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 1 lines changed or added | |
|