| gnutls.h (3.4.0) | | gnutls.h (3.4.1) | |
|---|
| | | | |
| 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.4.0" | | #define GNUTLS_VERSION "3.4.1" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 4 | | #define GNUTLS_VERSION_MINOR 4 | |
|
| #define GNUTLS_VERSION_PATCH 0 | | #define GNUTLS_VERSION_PATCH 1 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030400 | | #define GNUTLS_VERSION_NUMBER 0x030401 | |
| | | | |
| #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 | |
| | | | |
| #if !defined(GNUTLS_INTERNAL_BUILD) && defined(_WIN32) | | #if !defined(GNUTLS_INTERNAL_BUILD) && defined(_WIN32) | |
| # define _SYM_EXPORT __declspec(dllimport) | | # define _SYM_EXPORT __declspec(dllimport) | |
| #else | | #else | |
| # define _SYM_EXPORT | | # define _SYM_EXPORT | |
| | | | |
| skipping to change at line 322 | | skipping to change at line 322 | |
|---|
| GNUTLS_COMP_DEFLATE = 2, | | GNUTLS_COMP_DEFLATE = 2, | |
| GNUTLS_COMP_ZLIB = GNUTLS_COMP_DEFLATE | | GNUTLS_COMP_ZLIB = GNUTLS_COMP_DEFLATE | |
| } 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. | |
| * @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. | | * @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) | | #define GNUTLS_NO_REPLAY_PROTECTION (1<<5) | |
| | | | |
| End of changes. 4 change blocks. |
|---|
| 4 lines changed or deleted | | 4 lines changed or added | |
|---|
|
| x509.h (3.4.0) | | x509.h (3.4.1) | |
|---|
| | | | |
| skipping to change at line 192 | | skipping to change at line 192 | |
|---|
| int gnutls_x509_crt_check_hostname2(gnutls_x509_crt_t cert, | | int gnutls_x509_crt_check_hostname2(gnutls_x509_crt_t cert, | |
| const char *hostname, unsigned int flags
); | | const char *hostname, unsigned int flags
); | |
| int | | int | |
| gnutls_x509_crt_check_email(gnutls_x509_crt_t cert, | | gnutls_x509_crt_check_email(gnutls_x509_crt_t cert, | |
| const char *email, unsigned int flags); | | const char *email, unsigned int flags); | |
| | | | |
| int gnutls_x509_crt_get_signature_algorithm(gnutls_x509_crt_t cert); | | int gnutls_x509_crt_get_signature_algorithm(gnutls_x509_crt_t cert); | |
| int gnutls_x509_crt_get_signature(gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_signature(gnutls_x509_crt_t cert, | |
| char *sig, size_t * sizeof_sig); | | char *sig, size_t * sizeof_sig); | |
| int gnutls_x509_crt_get_version(gnutls_x509_crt_t cert); | | int gnutls_x509_crt_get_version(gnutls_x509_crt_t cert); | |
|
| | | | |
| | | /** | |
| | | * gnutls_keyid_flags_t: | |
| | | * @GNUTLS_KEYID_USE_SHA1: Use SHA1 as the key ID algorithm (default). | |
| | | * @GNUTLS_KEYID_USE_SHA256: Use SHA256 as the key ID algorithm. | |
| | | * @GNUTLS_KEYID_USE_BEST_KNOWN: Use the best known algorithm to calculate | |
| | | key ID. Using that option will make your program behavior depend on the ver | |
| | | sion of gnutls linked with. That option has a cap of 64-bytes key IDs. | |
| | | * | |
| | | * Enumeration of different flags for the key ID functions. | |
| | | | |
| | | */ | |
| | | typedef enum { | |
| | | GNUTLS_KEYID_USE_SHA1 = 0, | |
| | | GNUTLS_KEYID_USE_SHA256 = (1<<0), | |
| | | GNUTLS_KEYID_USE_BEST_KNOWN = (1<<30) | |
| | | } gnutls_keyid_flags_t; | |
| int gnutls_x509_crt_get_key_id(gnutls_x509_crt_t crt, | | int gnutls_x509_crt_get_key_id(gnutls_x509_crt_t crt, | |
| 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_crt_set_private_key_usage_period(gnutls_x509_crt_t | | int gnutls_x509_crt_set_private_key_usage_period(gnutls_x509_crt_t | |
| crt, | | crt, | |
| time_t activation, | | time_t activation, | |
| time_t expiration); | | time_t expiration); | |
| int gnutls_x509_crt_set_authority_key_id(gnutls_x509_crt_t cert, | | int gnutls_x509_crt_set_authority_key_id(gnutls_x509_crt_t cert, | |
| | | | |
| skipping to change at line 366 | | skipping to change at line 381 | |
|---|
| void *result, size_t * result_size); | | void *result, size_t * result_size); | |
| | | | |
| int gnutls_x509_crt_get_pk_algorithm(gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_pk_algorithm(gnutls_x509_crt_t cert, | |
| unsigned int *bits); | | unsigned int *bits); | |
| int gnutls_x509_crt_get_pk_rsa_raw(gnutls_x509_crt_t crt, | | int gnutls_x509_crt_get_pk_rsa_raw(gnutls_x509_crt_t crt, | |
| gnutls_datum_t * m, gnutls_datum_t * e); | | gnutls_datum_t * m, gnutls_datum_t * e); | |
| int gnutls_x509_crt_get_pk_dsa_raw(gnutls_x509_crt_t crt, | | int gnutls_x509_crt_get_pk_dsa_raw(gnutls_x509_crt_t crt, | |
| gnutls_datum_t * p, | | gnutls_datum_t * p, | |
| gnutls_datum_t * q, | | gnutls_datum_t * q, | |
| gnutls_datum_t * g, gnutls_datum_t * y); | | gnutls_datum_t * g, gnutls_datum_t * y); | |
|
| | | int gnutls_x509_crt_get_pk_ecc_raw(gnutls_x509_crt_t crt, | |
| | | gnutls_ecc_curve_t * curve, | |
| | | gnutls_datum_t * x, | |
| | | gnutls_datum_t * y); | |
| | | | |
| int gnutls_x509_crt_get_subject_alt_name(gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_subject_alt_name(gnutls_x509_crt_t cert, | |
| unsigned int seq, | | unsigned int seq, | |
| void *san, | | void *san, | |
| size_t * san_size, | | size_t * san_size, | |
| unsigned int *critical); | | unsigned int *critical); | |
| int gnutls_x509_crt_get_subject_alt_name2(gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_subject_alt_name2(gnutls_x509_crt_t cert, | |
| unsigned int seq, | | unsigned int seq, | |
| void *san, | | void *san, | |
| size_t * san_size, | | size_t * san_size, | |
| | | | |
| End of changes. 2 change blocks. |
|---|
| 0 lines changed or deleted | | 21 lines changed or added | |
|---|
|