| gnutls.h (3.3.5) | | gnutls.h (3.3.6) | |
|---|
| | | | |
| 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.5" | | #define GNUTLS_VERSION "3.3.6" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 3 | | #define GNUTLS_VERSION_MINOR 3 | |
|
| #define GNUTLS_VERSION_PATCH 5 | | #define GNUTLS_VERSION_PATCH 6 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030305 | | #define GNUTLS_VERSION_NUMBER 0x030306 | |
| | | | |
| #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 1349 | | skipping to change at line 1349 | |
|---|
| unsigned int max_depth); | | unsigned int max_depth); | |
| | | | |
| int | | int | |
| gnutls_certificate_set_x509_system_trust(gnutls_certificate_credentials_t | | gnutls_certificate_set_x509_system_trust(gnutls_certificate_credentials_t | |
| cred); | | cred); | |
| | | | |
| int | | int | |
| gnutls_certificate_set_x509_trust_file(gnutls_certificate_credentials_t | | gnutls_certificate_set_x509_trust_file(gnutls_certificate_credentials_t | |
| cred, const char *cafile, | | cred, const char *cafile, | |
| gnutls_x509_crt_fmt_t type); | | gnutls_x509_crt_fmt_t type); | |
|
| | | int | |
| | | gnutls_certificate_set_x509_trust_dir(gnutls_certificate_credentials_t cred | |
| | | , | |
| | | const char *ca_dir, | |
| | | gnutls_x509_crt_fmt_t type); | |
| | | | |
| int gnutls_certificate_set_x509_trust_mem(gnutls_certificate_credentials_t | | int gnutls_certificate_set_x509_trust_mem(gnutls_certificate_credentials_t | |
| res, const gnutls_datum_t * ca, | | res, const gnutls_datum_t * ca, | |
| gnutls_x509_crt_fmt_t type); | | gnutls_x509_crt_fmt_t type); | |
| | | | |
| int | | int | |
| gnutls_certificate_set_x509_crl_file(gnutls_certificate_credentials_t | | gnutls_certificate_set_x509_crl_file(gnutls_certificate_credentials_t | |
| res, const char *crlfile, | | res, const char *crlfile, | |
| gnutls_x509_crt_fmt_t type); | | gnutls_x509_crt_fmt_t type); | |
| int gnutls_certificate_set_x509_crl_mem(gnutls_certificate_credentials_t | | int gnutls_certificate_set_x509_crl_mem(gnutls_certificate_credentials_t | |
| res, const gnutls_datum_t * CRL, | | res, const gnutls_datum_t * CRL, | |
| | | | |
| End of changes. 4 change blocks. |
|---|
| 3 lines changed or deleted | | 9 lines changed or added | |
|---|
|
| x509.h (3.3.5) | | x509.h (3.3.6) | |
|---|
| | | | |
| skipping to change at line 1284 | | skipping to change at line 1284 | |
|---|
| | | | |
| int | | int | |
| gnutls_x509_trust_list_add_trust_file(gnutls_x509_trust_list_t | | gnutls_x509_trust_list_add_trust_file(gnutls_x509_trust_list_t | |
| list, const char *ca_file, | | list, const char *ca_file, | |
| const char *crl_file, | | const char *crl_file, | |
| gnutls_x509_crt_fmt_t type, | | gnutls_x509_crt_fmt_t type, | |
| unsigned int tl_flags, | | unsigned int tl_flags, | |
| unsigned int tl_vflags); | | unsigned int tl_vflags); | |
| | | | |
| int | | int | |
|
| | | gnutls_x509_trust_list_add_trust_dir(gnutls_x509_trust_list_t list, | |
| | | const char *ca_dir, | |
| | | const char *crl_dir, | |
| | | gnutls_x509_crt_fmt_t type, | |
| | | unsigned int tl_flags, | |
| | | unsigned int tl_vflags); | |
| | | | |
| | | int | |
| gnutls_x509_trust_list_remove_trust_file(gnutls_x509_trust_list_t | | gnutls_x509_trust_list_remove_trust_file(gnutls_x509_trust_list_t | |
| list, | | list, | |
| const char *ca_file, | | const char *ca_file, | |
| gnutls_x509_crt_fmt_t type); | | gnutls_x509_crt_fmt_t type); | |
| | | | |
| int | | int | |
| gnutls_x509_trust_list_remove_trust_mem(gnutls_x509_trust_list_t | | gnutls_x509_trust_list_remove_trust_mem(gnutls_x509_trust_list_t | |
| list, | | list, | |
| const gnutls_datum_t * | | const gnutls_datum_t * | |
| cas, gnutls_x509_crt_fmt_t type); | | cas, gnutls_x509_crt_fmt_t type); | |
| | | | |
| End of changes. 1 change blocks. |
|---|
| 0 lines changed or deleted | | 8 lines changed or added | |
|---|
|