| gnutls.h (3.4.9) | | gnutls.h (3.4.10) | |
|---|
| | | | |
| 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.9" | | #define GNUTLS_VERSION "3.4.10" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 4 | | #define GNUTLS_VERSION_MINOR 4 | |
|
| #define GNUTLS_VERSION_PATCH 9 | | #define GNUTLS_VERSION_PATCH 10 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030409 | | #define GNUTLS_VERSION_NUMBER 0x03040a | |
| | | | |
| #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 727 | | skipping to change at line 727 | |
|---|
| GNUTLS_ECC_CURVE_INVALID = 0, | | GNUTLS_ECC_CURVE_INVALID = 0, | |
| GNUTLS_ECC_CURVE_SECP224R1, | | GNUTLS_ECC_CURVE_SECP224R1, | |
| GNUTLS_ECC_CURVE_SECP256R1, | | GNUTLS_ECC_CURVE_SECP256R1, | |
| GNUTLS_ECC_CURVE_SECP384R1, | | GNUTLS_ECC_CURVE_SECP384R1, | |
| GNUTLS_ECC_CURVE_SECP521R1, | | GNUTLS_ECC_CURVE_SECP521R1, | |
| GNUTLS_ECC_CURVE_SECP192R1 | | GNUTLS_ECC_CURVE_SECP192R1 | |
| } gnutls_ecc_curve_t; | | } gnutls_ecc_curve_t; | |
| | | | |
| /* macros to allow specifying a specific curve in gnutls_privkey_generate() | | /* macros to allow specifying a specific curve in gnutls_privkey_generate() | |
| * and gnutls_x509_privkey_generate() */ | | * and gnutls_x509_privkey_generate() */ | |
|
| #define GNUTLS_CURVE_TO_BITS(curve) (unsigned int)((1<<31)|((unsigned int)(
curve))) | | #define GNUTLS_CURVE_TO_BITS(curve) (unsigned int)(((unsigned int)1<<31)|((
unsigned int)(curve))) | |
| #define GNUTLS_BITS_TO_CURVE(bits) (((unsigned int)(bits)) & 0x7FFFFFFF) | | #define GNUTLS_BITS_TO_CURVE(bits) (((unsigned int)(bits)) & 0x7FFFFFFF) | |
| #define GNUTLS_BITS_ARE_CURVE(bits) (((unsigned int)(bits)) & 0x80000000) | | #define GNUTLS_BITS_ARE_CURVE(bits) (((unsigned int)(bits)) & 0x80000000) | |
| | | | |
| /** | | /** | |
| * gnutls_sec_param_t: | | * gnutls_sec_param_t: | |
| * @GNUTLS_SEC_PARAM_UNKNOWN: Cannot be known | | * @GNUTLS_SEC_PARAM_UNKNOWN: Cannot be known | |
| * @GNUTLS_SEC_PARAM_INSECURE: Less than 42 bits of security | | * @GNUTLS_SEC_PARAM_INSECURE: Less than 42 bits of security | |
| * @GNUTLS_SEC_PARAM_EXPORT: 42 bits of security | | * @GNUTLS_SEC_PARAM_EXPORT: 42 bits of security | |
| * @GNUTLS_SEC_PARAM_VERY_WEAK: 64 bits of security | | * @GNUTLS_SEC_PARAM_VERY_WEAK: 64 bits of security | |
| * @GNUTLS_SEC_PARAM_WEAK: 72 bits of security | | * @GNUTLS_SEC_PARAM_WEAK: 72 bits of security | |
| | | | |
| End of changes. 4 change blocks. |
|---|
| 4 lines changed or deleted | | 4 lines changed or added | |
|---|
|