| gnutls.h (3.2.5) | | gnutls.h (3.2.6) | |
|---|
| | | | |
| 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.5" | | #define GNUTLS_VERSION "3.2.6" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 2 | | #define GNUTLS_VERSION_MINOR 2 | |
|
| #define GNUTLS_VERSION_PATCH 5 | | #define GNUTLS_VERSION_PATCH 6 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030205 | | #define GNUTLS_VERSION_NUMBER 0x030206 | |
| | | | |
| #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. | |
| | | | |
| End of changes. 3 change blocks. |
|---|
| 3 lines changed or deleted | | 3 lines changed or added | |
|---|
|
| pkcs11.h (3.2.5) | | pkcs11.h (3.2.6) | |
|---|
| | | | |
| skipping to change at line 318 | | skipping to change at line 318 | |
|---|
| unsigned int bits, | | unsigned int bits, | |
| const char* label, unsigned int flags); | | const char* label, unsigned int flags); | |
| | | | |
| int | | int | |
| gnutls_pkcs11_privkey_generate2 (const char* url, gnutls_pk_algorithm_t pk, | | gnutls_pkcs11_privkey_generate2 (const char* url, gnutls_pk_algorithm_t pk, | |
| unsigned int bits, const char* label, | | unsigned int bits, const char* label, | |
| gnutls_x509_crt_fmt_t fmt, | | gnutls_x509_crt_fmt_t fmt, | |
| gnutls_datum_t * pubkey, | | gnutls_datum_t * pubkey, | |
| unsigned int flags); | | unsigned int flags); | |
| | | | |
|
| | | int | |
| | | gnutls_pkcs11_token_get_random (const char* token_url, | |
| | | void* data, | |
| | | size_t len); | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } | | } | |
| #endif | | #endif | |
| | | | |
| #endif | | #endif | |
| | | | |
| End of changes. 1 change blocks. |
|---|
| 0 lines changed or deleted | | 5 lines changed or added | |
|---|
|