| dtls.h (3.0.20) | | dtls.h (3.0.21) | |
| | | | |
| skipping to change at line 47 | | skipping to change at line 47 | |
| #define GNUTLS_COOKIE_KEY_SIZE 16 | | #define GNUTLS_COOKIE_KEY_SIZE 16 | |
| | | | |
| void gnutls_dtls_set_timeouts (gnutls_session_t session, | | void gnutls_dtls_set_timeouts (gnutls_session_t session, | |
| unsigned int retrans_timeout, | | unsigned int retrans_timeout, | |
| unsigned int total_timeout); | | unsigned int total_timeout); | |
| | | | |
| unsigned int gnutls_dtls_get_mtu (gnutls_session_t session); | | unsigned int gnutls_dtls_get_mtu (gnutls_session_t session); | |
| unsigned int gnutls_dtls_get_data_mtu (gnutls_session_t session); | | unsigned int gnutls_dtls_get_data_mtu (gnutls_session_t session); | |
| | | | |
| void gnutls_dtls_set_mtu (gnutls_session_t session, unsigned int mtu); | | void gnutls_dtls_set_mtu (gnutls_session_t session, unsigned int mtu); | |
|
| | | int gnutls_dtls_set_data_mtu (gnutls_session_t session, unsigned int mtu); | |
| | | | |
| unsigned int gnutls_dtls_get_timeout (gnutls_session_t session); | | unsigned int gnutls_dtls_get_timeout (gnutls_session_t session); | |
| | | | |
| /** | | /** | |
| * gnutls_dtls_prestate_st: | | * gnutls_dtls_prestate_st: | |
| * @record_seq: record sequence number | | * @record_seq: record sequence number | |
| * @hsk_read_seq: handshake read sequence number | | * @hsk_read_seq: handshake read sequence number | |
| * @hsk_write_seq: handshake write sequence number | | * @hsk_write_seq: handshake write sequence number | |
| * | | * | |
| * DTLS cookie prestate struct. This is usually never modified by | | * DTLS cookie prestate struct. This is usually never modified by | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 1 lines changed or added | |
|
| gnutls.h (3.0.20) | | gnutls.h (3.0.21) | |
| | | | |
| 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.0.20" | | #define GNUTLS_VERSION "3.0.21" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 0 | | #define GNUTLS_VERSION_MINOR 0 | |
|
| #define GNUTLS_VERSION_PATCH 20 | | #define GNUTLS_VERSION_PATCH 21 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030014 | | #define GNUTLS_VERSION_NUMBER 0x030015 | |
| | | | |
| #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 432 | | skipping to change at line 432 | |
| } gnutls_handshake_description_t; | | } gnutls_handshake_description_t; | |
| | | | |
| /** | | /** | |
| * 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. | | * known authorities or the signature is invalid. | |
| * @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. | |
|
| * @GNUTLS_CERT_SIGNER_NOT_CA: The certificate’s signer was not a CA. This | | * @GNUTLS_CERT_SIGNER_NOT_CA: The certificate's signer was not a CA. This | |
| * may happen if this was a version 1 certificate, which is common with | | * may happen if this was a version 1 certificate, which is common with | |
| * some CAs, or a version 3 certificate without the basic constrains exte
nsion. | | * some CAs, or a version 3 certificate without the basic constrains exte
nsion. | |
| * @GNUTLS_CERT_INSECURE_ALGORITHM: The certificate was signed using an in
secure | | * @GNUTLS_CERT_INSECURE_ALGORITHM: The certificate was signed using an in
secure | |
| * algorithm such as MD2 or MD5. These algorithms have been broken and | | * algorithm such as MD2 or MD5. These algorithms have been broken and | |
| * should not be trusted. | | * should not be trusted. | |
| * @GNUTLS_CERT_NOT_ACTIVATED: The certificate is not yet activated. | | * @GNUTLS_CERT_NOT_ACTIVATED: The certificate is not yet activated. | |
| * @GNUTLS_CERT_EXPIRED: The certificate has expired. | | * @GNUTLS_CERT_EXPIRED: The certificate has expired. | |
| * | | * | |
| * Enumeration of certificate status codes. Note that the status | | * Enumeration of certificate status codes. Note that the status | |
| * bits have different meanings in OpenPGP keys and X.509 | | * bits have different meanings in OpenPGP keys and X.509 | |
| | | | |
| skipping to change at line 505 | | skipping to change at line 505 | |
| } gnutls_close_request_t; | | } gnutls_close_request_t; | |
| | | | |
| /** | | /** | |
| * gnutls_protocol_t: | | * gnutls_protocol_t: | |
| * @GNUTLS_SSL3: SSL version 3.0. | | * @GNUTLS_SSL3: SSL version 3.0. | |
| * @GNUTLS_TLS1_0: TLS version 1.0. | | * @GNUTLS_TLS1_0: TLS version 1.0. | |
| * @GNUTLS_TLS1: Same as %GNUTLS_TLS1_0. | | * @GNUTLS_TLS1: Same as %GNUTLS_TLS1_0. | |
| * @GNUTLS_TLS1_1: TLS version 1.1. | | * @GNUTLS_TLS1_1: TLS version 1.1. | |
| * @GNUTLS_TLS1_2: TLS version 1.2. | | * @GNUTLS_TLS1_2: TLS version 1.2. | |
| * @GNUTLS_DTLS1_0: DTLS version 1.0. | | * @GNUTLS_DTLS1_0: DTLS version 1.0. | |
|
| | | * @GNUTLS_DTLS0_9: DTLS version 0.9 (Cisco AnyConnect / OpenSSL 0.9.8e). | |
| * @GNUTLS_VERSION_MAX: Maps to the highest supported TLS version. | | * @GNUTLS_VERSION_MAX: Maps to the highest supported TLS version. | |
| * @GNUTLS_VERSION_UNKNOWN: Unknown SSL/TLS version. | | * @GNUTLS_VERSION_UNKNOWN: Unknown SSL/TLS version. | |
| * | | * | |
| * Enumeration of different SSL/TLS protocol versions. | | * Enumeration of different SSL/TLS protocol versions. | |
| */ | | */ | |
| typedef enum | | typedef enum | |
| { | | { | |
| GNUTLS_SSL3 = 1, | | GNUTLS_SSL3 = 1, | |
| GNUTLS_TLS1_0 = 2, | | GNUTLS_TLS1_0 = 2, | |
| GNUTLS_TLS1 = GNUTLS_TLS1_0, | | GNUTLS_TLS1 = GNUTLS_TLS1_0, | |
| GNUTLS_TLS1_1 = 3, | | GNUTLS_TLS1_1 = 3, | |
| GNUTLS_TLS1_2 = 4, | | GNUTLS_TLS1_2 = 4, | |
| GNUTLS_DTLS1_0 = 5, | | GNUTLS_DTLS1_0 = 5, | |
|
| GNUTLS_VERSION_MAX = GNUTLS_DTLS1_0, | | GNUTLS_DTLS0_9 = 6, | |
| | | GNUTLS_VERSION_MAX = GNUTLS_DTLS0_9, | |
| GNUTLS_VERSION_UNKNOWN = 0xff | | GNUTLS_VERSION_UNKNOWN = 0xff | |
| } gnutls_protocol_t; | | } gnutls_protocol_t; | |
| | | | |
| /** | | /** | |
| * gnutls_certificate_type_t: | | * gnutls_certificate_type_t: | |
| * @GNUTLS_CRT_UNKNOWN: Unknown certificate type. | | * @GNUTLS_CRT_UNKNOWN: Unknown certificate type. | |
| * @GNUTLS_CRT_X509: X.509 Certificate. | | * @GNUTLS_CRT_X509: X.509 Certificate. | |
| * @GNUTLS_CRT_OPENPGP: OpenPGP certificate. | | * @GNUTLS_CRT_OPENPGP: OpenPGP certificate. | |
| * @GNUTLS_CRT_RAW: Raw public key (SubjectPublicKey) | | * @GNUTLS_CRT_RAW: Raw public key (SubjectPublicKey) | |
| * | | * | |
| | | | |
| skipping to change at line 965 | | skipping to change at line 967 | |
| int gnutls_session_set_data (gnutls_session_t session, | | int gnutls_session_set_data (gnutls_session_t session, | |
| const void *session_data, | | const void *session_data, | |
| size_t session_data_size); | | size_t session_data_size); | |
| int gnutls_session_get_data (gnutls_session_t session, void *session_data
, | | int gnutls_session_get_data (gnutls_session_t session, void *session_data
, | |
| size_t * session_data_size); | | size_t * session_data_size); | |
| int gnutls_session_get_data2 (gnutls_session_t session, | | int gnutls_session_get_data2 (gnutls_session_t session, | |
| gnutls_datum_t * data); | | gnutls_datum_t * data); | |
| void gnutls_session_get_random (gnutls_session_t session, gnutls_datum_t*
client, | | void gnutls_session_get_random (gnutls_session_t session, gnutls_datum_t*
client, | |
| gnutls_datum_t* server); | | gnutls_datum_t* server); | |
| | | | |
|
| | | int gnutls_session_set_premaster (gnutls_session_t session, unsigned int | |
| | | entity, | |
| | | gnutls_protocol_t version, | |
| | | gnutls_kx_algorithm_t kx, | |
| | | gnutls_cipher_algorithm_t cipher, | |
| | | gnutls_mac_algorithm_t mac, | |
| | | gnutls_compression_method_t comp, | |
| | | const gnutls_datum_t* master, | |
| | | const gnutls_datum_t * session_id); | |
| | | | |
| /* returns the session ID */ | | /* returns the session ID */ | |
| #define GNUTLS_MAX_SESSION_ID 32 | | #define GNUTLS_MAX_SESSION_ID 32 | |
| int gnutls_session_get_id (gnutls_session_t session, void *session_id, | | int gnutls_session_get_id (gnutls_session_t session, void *session_id, | |
| size_t * session_id_size); | | size_t * session_id_size); | |
| | | | |
| int gnutls_session_channel_binding (gnutls_session_t session, | | int gnutls_session_channel_binding (gnutls_session_t session, | |
| gnutls_channel_binding_t cbtype, | | gnutls_channel_binding_t cbtype, | |
| gnutls_datum_t * cb); | | gnutls_datum_t * cb); | |
| | | | |
| /* checks if this session is a resumed one | | /* checks if this session is a resumed one | |
| | | | |
End of changes. 7 change blocks. |
| 5 lines changed or deleted | | 17 lines changed or added | |
|