| gnutls.h (3.2.3) | | gnutls.h (3.2.4) | |
|---|
| | | | |
| 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.3" | | #define GNUTLS_VERSION "3.2.4" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 2 | | #define GNUTLS_VERSION_MINOR 2 | |
|
| #define GNUTLS_VERSION_PATCH 3 | | #define GNUTLS_VERSION_PATCH 4 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030203 | | #define GNUTLS_VERSION_NUMBER 0x030204 | |
| | | | |
| #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 146 | | skipping to change at line 146 | |
|---|
| * @GNUTLS_KX_ECDHE_ECDSA: ECDHE-ECDSA key-exchange algorithm. | | * @GNUTLS_KX_ECDHE_ECDSA: ECDHE-ECDSA key-exchange algorithm. | |
| * @GNUTLS_KX_ANON_DH: Anon-DH key-exchange algorithm. | | * @GNUTLS_KX_ANON_DH: Anon-DH key-exchange algorithm. | |
| * @GNUTLS_KX_ANON_ECDH: Anon-ECDH key-exchange algorithm. | | * @GNUTLS_KX_ANON_ECDH: Anon-ECDH key-exchange algorithm. | |
| * @GNUTLS_KX_SRP: SRP key-exchange algorithm. | | * @GNUTLS_KX_SRP: SRP key-exchange algorithm. | |
| * @GNUTLS_KX_RSA_EXPORT: RSA-EXPORT key-exchange algorithm (defunc). | | * @GNUTLS_KX_RSA_EXPORT: RSA-EXPORT key-exchange algorithm (defunc). | |
| * @GNUTLS_KX_SRP_RSA: SRP-RSA key-exchange algorithm. | | * @GNUTLS_KX_SRP_RSA: SRP-RSA key-exchange algorithm. | |
| * @GNUTLS_KX_SRP_DSS: SRP-DSS key-exchange algorithm. | | * @GNUTLS_KX_SRP_DSS: SRP-DSS key-exchange algorithm. | |
| * @GNUTLS_KX_PSK: PSK key-exchange algorithm. | | * @GNUTLS_KX_PSK: PSK key-exchange algorithm. | |
| * @GNUTLS_KX_DHE_PSK: DHE-PSK key-exchange algorithm. | | * @GNUTLS_KX_DHE_PSK: DHE-PSK key-exchange algorithm. | |
| * @GNUTLS_KX_ECDHE_PSK: ECDHE-PSK key-exchange algorithm. | | * @GNUTLS_KX_ECDHE_PSK: ECDHE-PSK key-exchange algorithm. | |
|
| | | * @GNUTLS_KX_RSA_PSK: RSA-PSK key-exchange algorithm. | |
| * | | * | |
| * Enumeration of different key exchange algorithms. | | * Enumeration of different key exchange algorithms. | |
| */ | | */ | |
| typedef enum | | typedef enum | |
| { | | { | |
| GNUTLS_KX_UNKNOWN = 0, | | GNUTLS_KX_UNKNOWN = 0, | |
| GNUTLS_KX_RSA = 1, | | GNUTLS_KX_RSA = 1, | |
| GNUTLS_KX_DHE_DSS = 2, | | GNUTLS_KX_DHE_DSS = 2, | |
| GNUTLS_KX_DHE_RSA = 3, | | GNUTLS_KX_DHE_RSA = 3, | |
| GNUTLS_KX_ANON_DH = 4, | | GNUTLS_KX_ANON_DH = 4, | |
| GNUTLS_KX_SRP = 5, | | GNUTLS_KX_SRP = 5, | |
| GNUTLS_KX_RSA_EXPORT = 6, | | GNUTLS_KX_RSA_EXPORT = 6, | |
| GNUTLS_KX_SRP_RSA = 7, | | GNUTLS_KX_SRP_RSA = 7, | |
| GNUTLS_KX_SRP_DSS = 8, | | GNUTLS_KX_SRP_DSS = 8, | |
| GNUTLS_KX_PSK = 9, | | GNUTLS_KX_PSK = 9, | |
| GNUTLS_KX_DHE_PSK = 10, | | GNUTLS_KX_DHE_PSK = 10, | |
| GNUTLS_KX_ANON_ECDH = 11, | | GNUTLS_KX_ANON_ECDH = 11, | |
| GNUTLS_KX_ECDHE_RSA = 12, | | GNUTLS_KX_ECDHE_RSA = 12, | |
| GNUTLS_KX_ECDHE_ECDSA = 13, | | GNUTLS_KX_ECDHE_ECDSA = 13, | |
| GNUTLS_KX_ECDHE_PSK = 14, | | GNUTLS_KX_ECDHE_PSK = 14, | |
|
| | | GNUTLS_KX_RSA_PSK = 15, | |
| } gnutls_kx_algorithm_t; | | } gnutls_kx_algorithm_t; | |
| | | | |
| /** | | /** | |
| * gnutls_params_type_t: | | * gnutls_params_type_t: | |
| * @GNUTLS_PARAMS_RSA_EXPORT: Session RSA-EXPORT parameters (defunc). | | * @GNUTLS_PARAMS_RSA_EXPORT: Session RSA-EXPORT parameters (defunc). | |
| * @GNUTLS_PARAMS_DH: Session Diffie-Hellman parameters. | | * @GNUTLS_PARAMS_DH: Session Diffie-Hellman parameters. | |
| * @GNUTLS_PARAMS_ECDH: Session Elliptic-Curve Diffie-Hellman parameters. | | * @GNUTLS_PARAMS_ECDH: Session Elliptic-Curve Diffie-Hellman parameters. | |
| * | | * | |
| * Enumeration of different TLS session parameter types. | | * Enumeration of different TLS session parameter types. | |
| */ | | */ | |
| | | | |
| End of changes. 5 change blocks. |
|---|
| 3 lines changed or deleted | | 5 lines changed or added | |
|---|
|