| crypto.h (3.2.0) | | crypto.h (3.2.1) | |
| | | | |
| skipping to change at line 33 | | skipping to change at line 33 | |
| #ifndef GNUTLS_CRYPTO_H | | #ifndef GNUTLS_CRYPTO_H | |
| #define GNUTLS_CRYPTO_H | | #define GNUTLS_CRYPTO_H | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" | | extern "C" | |
| { | | { | |
| #endif | | #endif | |
| | | | |
| typedef struct api_cipher_hd_st *gnutls_cipher_hd_t; | | typedef struct api_cipher_hd_st *gnutls_cipher_hd_t; | |
| | | | |
|
| size_t gnutls_cipher_get_key_size (gnutls_cipher_algorithm_t algorithm); | | | |
| int gnutls_cipher_init (gnutls_cipher_hd_t * handle, | | int gnutls_cipher_init (gnutls_cipher_hd_t * handle, | |
| gnutls_cipher_algorithm_t cipher, | | gnutls_cipher_algorithm_t cipher, | |
| const gnutls_datum_t * key, | | const gnutls_datum_t * key, | |
| const gnutls_datum_t * iv); | | const gnutls_datum_t * iv); | |
| int gnutls_cipher_encrypt (const gnutls_cipher_hd_t handle, | | int gnutls_cipher_encrypt (const gnutls_cipher_hd_t handle, | |
| void *text, size_t textlen); | | void *text, size_t textlen); | |
| int gnutls_cipher_decrypt (const gnutls_cipher_hd_t handle, | | int gnutls_cipher_decrypt (const gnutls_cipher_hd_t handle, | |
| void *ciphertext, size_t ciphertextlen); | | void *ciphertext, size_t ciphertextlen); | |
| int gnutls_cipher_decrypt2 (gnutls_cipher_hd_t handle, | | int gnutls_cipher_decrypt2 (gnutls_cipher_hd_t handle, | |
| const void *ciphertext, size_t ciphertextlen, | | const void *ciphertext, size_t ciphertextlen, | |
| | | | |
| skipping to change at line 61 | | skipping to change at line 60 | |
| int gnutls_cipher_tag( gnutls_cipher_hd_t handle, void* tag, size_t tag_s
ize); | | int gnutls_cipher_tag( gnutls_cipher_hd_t handle, void* tag, size_t tag_s
ize); | |
| int gnutls_cipher_add_auth( gnutls_cipher_hd_t handle, const void* text,
size_t text_size); | | int gnutls_cipher_add_auth( gnutls_cipher_hd_t handle, const void* text,
size_t text_size); | |
| | | | |
| void gnutls_cipher_deinit (gnutls_cipher_hd_t handle); | | void gnutls_cipher_deinit (gnutls_cipher_hd_t handle); | |
| int gnutls_cipher_get_block_size (gnutls_cipher_algorithm_t algorithm); | | int gnutls_cipher_get_block_size (gnutls_cipher_algorithm_t algorithm); | |
| int gnutls_cipher_get_iv_size (gnutls_cipher_algorithm_t algorithm); | | int gnutls_cipher_get_iv_size (gnutls_cipher_algorithm_t algorithm); | |
| | | | |
| typedef struct hash_hd_st *gnutls_hash_hd_t; | | typedef struct hash_hd_st *gnutls_hash_hd_t; | |
| typedef struct hmac_hd_st *gnutls_hmac_hd_t; | | typedef struct hmac_hd_st *gnutls_hmac_hd_t; | |
| | | | |
|
| size_t gnutls_mac_get_key_size (gnutls_mac_algorithm_t algorithm); | | | |
| size_t gnutls_mac_get_nonce_size (gnutls_mac_algorithm_t algorithm); | | size_t gnutls_mac_get_nonce_size (gnutls_mac_algorithm_t algorithm); | |
| int gnutls_hmac_init (gnutls_hmac_hd_t * dig, | | int gnutls_hmac_init (gnutls_hmac_hd_t * dig, | |
| gnutls_mac_algorithm_t algorithm, const void *key, | | gnutls_mac_algorithm_t algorithm, const void *key, | |
| size_t keylen); | | size_t keylen); | |
| void gnutls_hmac_set_nonce (gnutls_hmac_hd_t handle, const void *nonce, s
ize_t nonce_len); | | void gnutls_hmac_set_nonce (gnutls_hmac_hd_t handle, const void *nonce, s
ize_t nonce_len); | |
| int gnutls_hmac (gnutls_hmac_hd_t handle, const void *text, size_t textle
n); | | int gnutls_hmac (gnutls_hmac_hd_t handle, const void *text, size_t textle
n); | |
| void gnutls_hmac_output (gnutls_hmac_hd_t handle, void *digest); | | void gnutls_hmac_output (gnutls_hmac_hd_t handle, void *digest); | |
| void gnutls_hmac_deinit (gnutls_hmac_hd_t handle, void *digest); | | void gnutls_hmac_deinit (gnutls_hmac_hd_t handle, void *digest); | |
| int gnutls_hmac_get_len (gnutls_mac_algorithm_t algorithm); | | int gnutls_hmac_get_len (gnutls_mac_algorithm_t algorithm); | |
| int gnutls_hmac_fast (gnutls_mac_algorithm_t algorithm, const void *key, | | int gnutls_hmac_fast (gnutls_mac_algorithm_t algorithm, const void *key, | |
| | | | |
End of changes. 2 change blocks. |
| 2 lines changed or deleted | | 0 lines changed or added | |
|
| gnutls.h (3.2.0) | | gnutls.h (3.2.1) | |
| | | | |
| 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.0" | | #define GNUTLS_VERSION "3.2.1" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 2 | | #define GNUTLS_VERSION_MINOR 2 | |
|
| #define GNUTLS_VERSION_PATCH 0 | | #define GNUTLS_VERSION_PATCH 1 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030200 | | #define GNUTLS_VERSION_NUMBER 0x030201 | |
| | | | |
| #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 835 | | skipping to change at line 835 | |
| const char *gnutls_cipher_get_name (gnutls_cipher_algorithm_t algorithm); | | const char *gnutls_cipher_get_name (gnutls_cipher_algorithm_t algorithm); | |
| const char *gnutls_mac_get_name (gnutls_mac_algorithm_t algorithm); | | const char *gnutls_mac_get_name (gnutls_mac_algorithm_t algorithm); | |
| const char *gnutls_compression_get_name (gnutls_compression_method_t | | const char *gnutls_compression_get_name (gnutls_compression_method_t | |
| algorithm); | | algorithm); | |
| const char *gnutls_kx_get_name (gnutls_kx_algorithm_t algorithm); | | const char *gnutls_kx_get_name (gnutls_kx_algorithm_t algorithm); | |
| const char *gnutls_certificate_type_get_name (gnutls_certificate_type_t | | const char *gnutls_certificate_type_get_name (gnutls_certificate_type_t | |
| type); | | type); | |
| const char *gnutls_pk_get_name (gnutls_pk_algorithm_t algorithm); | | const char *gnutls_pk_get_name (gnutls_pk_algorithm_t algorithm); | |
| const char *gnutls_sign_get_name (gnutls_sign_algorithm_t algorithm); | | const char *gnutls_sign_get_name (gnutls_sign_algorithm_t algorithm); | |
| | | | |
|
| | | size_t gnutls_cipher_get_key_size (gnutls_cipher_algorithm_t algorithm); | |
| | | size_t gnutls_mac_get_key_size (gnutls_mac_algorithm_t algorithm); | |
| | | | |
| int gnutls_sign_is_secure (gnutls_sign_algorithm_t algorithm); | | int gnutls_sign_is_secure (gnutls_sign_algorithm_t algorithm); | |
| gnutls_digest_algorithm_t | | gnutls_digest_algorithm_t | |
| gnutls_sign_get_hash_algorithm (gnutls_sign_algorithm_t sign); | | gnutls_sign_get_hash_algorithm (gnutls_sign_algorithm_t sign); | |
| gnutls_pk_algorithm_t | | gnutls_pk_algorithm_t | |
| gnutls_sign_get_pk_algorithm (gnutls_sign_algorithm_t sign); | | gnutls_sign_get_pk_algorithm (gnutls_sign_algorithm_t sign); | |
| gnutls_sign_algorithm_t | | gnutls_sign_algorithm_t | |
| gnutls_pk_to_sign (gnutls_pk_algorithm_t pk, | | gnutls_pk_to_sign (gnutls_pk_algorithm_t pk, | |
| gnutls_digest_algorithm_t hash); | | gnutls_digest_algorithm_t hash); | |
| | | | |
| #define gnutls_sign_algorithm_get_name gnutls_sign_get_name | | #define gnutls_sign_algorithm_get_name gnutls_sign_get_name | |
| | | | |
| skipping to change at line 1121 | | skipping to change at line 1124 | |
| gnutls_compression_method_t comp, | | gnutls_compression_method_t comp, | |
| const gnutls_datum_t* master, | | const gnutls_datum_t* master, | |
| const gnutls_datum_t * session_id); | | const gnutls_datum_t * session_id); | |
| | | | |
| /* returns the session ID */ | | /* returns the session ID */ | |
| #define GNUTLS_MAX_SESSION_ID 32 | | #define GNUTLS_MAX_SESSION_ID 32 | |
| int gnutls_session_get_id (gnutls_session_t session, void *session_id, | | int gnutls_session_get_id (gnutls_session_t session, void *session_id, | |
| size_t * session_id_size); | | size_t * session_id_size); | |
| int gnutls_session_get_id2 (gnutls_session_t session, gnutls_datum_t *ses
sion_id); | | int gnutls_session_get_id2 (gnutls_session_t session, gnutls_datum_t *ses
sion_id); | |
| | | | |
|
| | | int gnutls_session_set_id (gnutls_session_t session, | |
| | | const gnutls_datum_t * sid); | |
| | | | |
| int gnutls_session_channel_binding (gnutls_session_t session, | | int gnutls_session_channel_binding (gnutls_session_t session, | |
| gnutls_channel_binding_t cbtype, | | gnutls_channel_binding_t cbtype, | |
| gnutls_datum_t * cb); | | gnutls_datum_t * cb); | |
| | | | |
| /* checks if this session is a resumed one | | /* checks if this session is a resumed one | |
| */ | | */ | |
| int gnutls_session_is_resumed (gnutls_session_t session); | | int gnutls_session_is_resumed (gnutls_session_t session); | |
| int gnutls_session_resumption_requested (gnutls_session_t session); | | int gnutls_session_resumption_requested (gnutls_session_t session); | |
| | | | |
| typedef int (*gnutls_db_store_func) (void *, gnutls_datum_t key, | | typedef int (*gnutls_db_store_func) (void *, gnutls_datum_t key, | |
| | | | |
End of changes. 5 change blocks. |
| 3 lines changed or deleted | | 9 lines changed or added | |
|