| gnutls.h (3.4.2) | | gnutls.h (3.4.3) | |
| | | | |
| 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.2" | | #define GNUTLS_VERSION "3.4.3" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 4 | | #define GNUTLS_VERSION_MINOR 4 | |
|
| #define GNUTLS_VERSION_PATCH 2 | | #define GNUTLS_VERSION_PATCH 3 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030402 | | #define GNUTLS_VERSION_NUMBER 0x030403 | |
| | | | |
| #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 833 | | skipping to change at line 833 | |
| gnutls_sec_param_t gnutls_pk_bits_to_sec_param(gnutls_pk_algorithm_t algo, | | gnutls_sec_param_t gnutls_pk_bits_to_sec_param(gnutls_pk_algorithm_t algo, | |
| unsigned int bits); | | unsigned int bits); | |
| const char *gnutls_sec_param_get_name(gnutls_sec_param_t param); | | const char *gnutls_sec_param_get_name(gnutls_sec_param_t param); | |
| unsigned int gnutls_sec_param_to_pk_bits(gnutls_pk_algorithm_t algo, | | unsigned int gnutls_sec_param_to_pk_bits(gnutls_pk_algorithm_t algo, | |
| gnutls_sec_param_t param); | | gnutls_sec_param_t param); | |
| unsigned int | | unsigned int | |
| gnutls_sec_param_to_symmetric_bits(gnutls_sec_param_t param); | | gnutls_sec_param_to_symmetric_bits(gnutls_sec_param_t param); | |
| | | | |
| /* Elliptic curves */ | | /* Elliptic curves */ | |
| const char *gnutls_ecc_curve_get_name(gnutls_ecc_curve_t curve); | | const char *gnutls_ecc_curve_get_name(gnutls_ecc_curve_t curve); | |
|
| | | const char *gnutls_ecc_curve_get_oid(gnutls_ecc_curve_t curve); | |
| | | | |
| int gnutls_ecc_curve_get_size(gnutls_ecc_curve_t curve); | | int gnutls_ecc_curve_get_size(gnutls_ecc_curve_t curve); | |
| gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session); | | gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session); | |
| | | | |
| /* get information on the current session */ | | /* get information on the current session */ | |
| gnutls_cipher_algorithm_t gnutls_cipher_get(gnutls_session_t session); | | gnutls_cipher_algorithm_t gnutls_cipher_get(gnutls_session_t session); | |
| gnutls_kx_algorithm_t gnutls_kx_get(gnutls_session_t session); | | gnutls_kx_algorithm_t gnutls_kx_get(gnutls_session_t session); | |
| gnutls_mac_algorithm_t gnutls_mac_get(gnutls_session_t session); | | gnutls_mac_algorithm_t gnutls_mac_get(gnutls_session_t session); | |
| gnutls_compression_method_t | | gnutls_compression_method_t | |
| gnutls_compression_get(gnutls_session_t session); | | gnutls_compression_get(gnutls_session_t session); | |
| gnutls_certificate_type_t | | gnutls_certificate_type_t | |
| | | | |
| skipping to change at line 855 | | skipping to change at line 857 | |
| int gnutls_sign_algorithm_get(gnutls_session_t session); | | int gnutls_sign_algorithm_get(gnutls_session_t session); | |
| int gnutls_sign_algorithm_get_client(gnutls_session_t session); | | int gnutls_sign_algorithm_get_client(gnutls_session_t session); | |
| | | | |
| int gnutls_sign_algorithm_get_requested(gnutls_session_t session, | | int gnutls_sign_algorithm_get_requested(gnutls_session_t session, | |
| size_t indx, | | size_t indx, | |
| gnutls_sign_algorithm_t * algo); | | gnutls_sign_algorithm_t * algo); | |
| | | | |
| /* the name of the specified algorithms */ | | /* the name of the specified algorithms */ | |
| 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_digest_get_name(gnutls_digest_algorithm_t algorithm); | | const char *gnutls_digest_get_name(gnutls_digest_algorithm_t algorithm); | |
|
| | | const char *gnutls_digest_get_oid(gnutls_digest_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_pk_get_oid(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); | |
|
| | | const char *gnutls_sign_get_oid(gnutls_sign_algorithm_t algorithm); | |
| | | | |
| size_t gnutls_cipher_get_key_size(gnutls_cipher_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); | | 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 | |
| | | | |
| skipping to change at line 880 | | skipping to change at line 888 | |
| 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 | |
| | | | |
| gnutls_mac_algorithm_t gnutls_mac_get_id(const char *name); | | gnutls_mac_algorithm_t gnutls_mac_get_id(const char *name); | |
| gnutls_digest_algorithm_t gnutls_digest_get_id(const char *name); | | gnutls_digest_algorithm_t gnutls_digest_get_id(const char *name); | |
|
| | | | |
| gnutls_compression_method_t gnutls_compression_get_id(const char *name); | | gnutls_compression_method_t gnutls_compression_get_id(const char *name); | |
| gnutls_cipher_algorithm_t gnutls_cipher_get_id(const char *name); | | gnutls_cipher_algorithm_t gnutls_cipher_get_id(const char *name); | |
| gnutls_kx_algorithm_t gnutls_kx_get_id(const char *name); | | gnutls_kx_algorithm_t gnutls_kx_get_id(const char *name); | |
| gnutls_protocol_t gnutls_protocol_get_id(const char *name); | | gnutls_protocol_t gnutls_protocol_get_id(const char *name); | |
| gnutls_certificate_type_t gnutls_certificate_type_get_id(const char *name); | | gnutls_certificate_type_t gnutls_certificate_type_get_id(const char *name); | |
| gnutls_pk_algorithm_t gnutls_pk_get_id(const char *name); | | gnutls_pk_algorithm_t gnutls_pk_get_id(const char *name); | |
| gnutls_sign_algorithm_t gnutls_sign_get_id(const char *name); | | gnutls_sign_algorithm_t gnutls_sign_get_id(const char *name); | |
|
| | | gnutls_ecc_curve_t gnutls_ecc_curve_get_id(const char *name); | |
| | | | |
| | | gnutls_digest_algorithm_t gnutls_oid_to_digest(const char *oid); | |
| | | gnutls_pk_algorithm_t gnutls_oid_to_pk(const char *oid); | |
| | | gnutls_sign_algorithm_t gnutls_oid_to_sign(const char *oid); | |
| | | gnutls_ecc_curve_t gnutls_oid_to_ecc_curve(const char *oid); | |
| | | | |
| /* list supported algorithms */ | | /* list supported algorithms */ | |
| const gnutls_ecc_curve_t *gnutls_ecc_curve_list(void); | | const gnutls_ecc_curve_t *gnutls_ecc_curve_list(void); | |
| const gnutls_cipher_algorithm_t *gnutls_cipher_list(void); | | const gnutls_cipher_algorithm_t *gnutls_cipher_list(void); | |
| const gnutls_mac_algorithm_t *gnutls_mac_list(void); | | const gnutls_mac_algorithm_t *gnutls_mac_list(void); | |
| const gnutls_digest_algorithm_t *gnutls_digest_list(void); | | const gnutls_digest_algorithm_t *gnutls_digest_list(void); | |
| const gnutls_compression_method_t *gnutls_compression_list(void); | | const gnutls_compression_method_t *gnutls_compression_list(void); | |
| const gnutls_protocol_t *gnutls_protocol_list(void); | | const gnutls_protocol_t *gnutls_protocol_list(void); | |
| const gnutls_certificate_type_t *gnutls_certificate_type_list(void); | | const gnutls_certificate_type_t *gnutls_certificate_type_list(void); | |
| const gnutls_kx_algorithm_t *gnutls_kx_list(void); | | const gnutls_kx_algorithm_t *gnutls_kx_list(void); | |
| | | | |
End of changes. 10 change blocks. |
| 3 lines changed or deleted | | 18 lines changed or added | |
|
| pkcs11.h (3.4.2) | | pkcs11.h (3.4.3) | |
| | | | |
| skipping to change at line 263 | | skipping to change at line 263 | |
| | | | |
| /** | | /** | |
| * gnutls_pkcs11_obj_info_t: | | * gnutls_pkcs11_obj_info_t: | |
| * @GNUTLS_PKCS11_OBJ_ID_HEX: The object ID in hex. | | * @GNUTLS_PKCS11_OBJ_ID_HEX: The object ID in hex. | |
| * @GNUTLS_PKCS11_OBJ_LABEL: The object label. | | * @GNUTLS_PKCS11_OBJ_LABEL: The object label. | |
| * @GNUTLS_PKCS11_OBJ_TOKEN_LABEL: The token's label. | | * @GNUTLS_PKCS11_OBJ_TOKEN_LABEL: The token's label. | |
| * @GNUTLS_PKCS11_OBJ_TOKEN_SERIAL: The token's serial number. | | * @GNUTLS_PKCS11_OBJ_TOKEN_SERIAL: The token's serial number. | |
| * @GNUTLS_PKCS11_OBJ_TOKEN_MANUFACTURER: The token's manufacturer. | | * @GNUTLS_PKCS11_OBJ_TOKEN_MANUFACTURER: The token's manufacturer. | |
| * @GNUTLS_PKCS11_OBJ_TOKEN_MODEL: The token's model. | | * @GNUTLS_PKCS11_OBJ_TOKEN_MODEL: The token's model. | |
| * @GNUTLS_PKCS11_OBJ_ID: The object ID. | | * @GNUTLS_PKCS11_OBJ_ID: The object ID. | |
|
| * @GNUTLS_PKCS11_OBJ_LIBRARY_VERSION: The library's used to access the obj | | * @GNUTLS_PKCS11_OBJ_LIBRARY_VERSION: The library's version. | |
| ect version. | | * @GNUTLS_PKCS11_OBJ_LIBRARY_DESCRIPTION: The library's description. | |
| * @GNUTLS_PKCS11_OBJ_LIBRARY_DESCRIPTION: The library's used to access the | | * @GNUTLS_PKCS11_OBJ_LIBRARY_MANUFACTURER: The library's manufacturer name | |
| object description (name). | | . | |
| * @GNUTLS_PKCS11_OBJ_LIBRARY_MANUFACTURER: The library's used to access th | | | |
| e object manufacturer name. | | | |
| * | | * | |
| * Enumeration of several object information types. | | * Enumeration of several object information types. | |
| */ | | */ | |
| typedef enum { | | typedef enum { | |
| GNUTLS_PKCS11_OBJ_ID_HEX = 1, | | GNUTLS_PKCS11_OBJ_ID_HEX = 1, | |
| GNUTLS_PKCS11_OBJ_LABEL, | | GNUTLS_PKCS11_OBJ_LABEL, | |
| GNUTLS_PKCS11_OBJ_TOKEN_LABEL, | | GNUTLS_PKCS11_OBJ_TOKEN_LABEL, | |
| GNUTLS_PKCS11_OBJ_TOKEN_SERIAL, | | GNUTLS_PKCS11_OBJ_TOKEN_SERIAL, | |
| GNUTLS_PKCS11_OBJ_TOKEN_MANUFACTURER, | | GNUTLS_PKCS11_OBJ_TOKEN_MANUFACTURER, | |
| GNUTLS_PKCS11_OBJ_TOKEN_MODEL, | | GNUTLS_PKCS11_OBJ_TOKEN_MODEL, | |
| | | | |
| skipping to change at line 306 | | skipping to change at line 306 | |
| #define GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED_CA (GNUTLS_PKCS11_OBJ_FLAG_CRT|G
NUTLS_PKCS11_OBJ_FLAG_MARK_CA|GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED) | | #define GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED_CA (GNUTLS_PKCS11_OBJ_FLAG_CRT|G
NUTLS_PKCS11_OBJ_FLAG_MARK_CA|GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED) | |
| #define GNUTLS_PKCS11_OBJ_ATTR_PUBKEY GNUTLS_PKCS11_OBJ_FLAG_PUBKEY | | #define GNUTLS_PKCS11_OBJ_ATTR_PUBKEY GNUTLS_PKCS11_OBJ_FLAG_PUBKEY | |
| #define GNUTLS_PKCS11_OBJ_ATTR_PRIVKEY GNUTLS_PKCS11_OBJ_FLAG_PRIVKEY | | #define GNUTLS_PKCS11_OBJ_ATTR_PRIVKEY GNUTLS_PKCS11_OBJ_FLAG_PRIVKEY | |
| | | | |
| /** | | /** | |
| * gnutls_pkcs11_token_info_t: | | * gnutls_pkcs11_token_info_t: | |
| * @GNUTLS_PKCS11_TOKEN_LABEL: The token's label (string) | | * @GNUTLS_PKCS11_TOKEN_LABEL: The token's label (string) | |
| * @GNUTLS_PKCS11_TOKEN_SERIAL: The token's serial number (string) | | * @GNUTLS_PKCS11_TOKEN_SERIAL: The token's serial number (string) | |
| * @GNUTLS_PKCS11_TOKEN_MANUFACTURER: The token's manufacturer (string) | | * @GNUTLS_PKCS11_TOKEN_MANUFACTURER: The token's manufacturer (string) | |
| * @GNUTLS_PKCS11_TOKEN_MODEL: The token's model (string) | | * @GNUTLS_PKCS11_TOKEN_MODEL: The token's model (string) | |
|
| * @GNUTLS_PKCS11_TOKEN_TRUSTED: Whether the token is marked as trusted in
p11-kit (unsigned int) | | * @GNUTLS_PKCS11_TOKEN_MODNAME: The token's module name (string - since 3.
4.3) | |
| * | | * | |
| * Enumeration of types for retrieving token information. | | * Enumeration of types for retrieving token information. | |
| */ | | */ | |
| typedef enum { | | typedef enum { | |
| GNUTLS_PKCS11_TOKEN_LABEL, | | GNUTLS_PKCS11_TOKEN_LABEL, | |
| GNUTLS_PKCS11_TOKEN_SERIAL, | | GNUTLS_PKCS11_TOKEN_SERIAL, | |
| GNUTLS_PKCS11_TOKEN_MANUFACTURER, | | GNUTLS_PKCS11_TOKEN_MANUFACTURER, | |
|
| GNUTLS_PKCS11_TOKEN_MODEL | | GNUTLS_PKCS11_TOKEN_MODEL, | |
| | | GNUTLS_PKCS11_TOKEN_MODNAME | |
| } gnutls_pkcs11_token_info_t; | | } gnutls_pkcs11_token_info_t; | |
| | | | |
| /** | | /** | |
| * gnutls_pkcs11_obj_type_t: | | * gnutls_pkcs11_obj_type_t: | |
| * @GNUTLS_PKCS11_OBJ_UNKNOWN: Unknown PKCS11 object. | | * @GNUTLS_PKCS11_OBJ_UNKNOWN: Unknown PKCS11 object. | |
| * @GNUTLS_PKCS11_OBJ_X509_CRT: X.509 certificate. | | * @GNUTLS_PKCS11_OBJ_X509_CRT: X.509 certificate. | |
| * @GNUTLS_PKCS11_OBJ_PUBKEY: Public key. | | * @GNUTLS_PKCS11_OBJ_PUBKEY: Public key. | |
| * @GNUTLS_PKCS11_OBJ_PRIVKEY: Private key. | | * @GNUTLS_PKCS11_OBJ_PRIVKEY: Private key. | |
| * @GNUTLS_PKCS11_OBJ_SECRET_KEY: Secret key. | | * @GNUTLS_PKCS11_OBJ_SECRET_KEY: Secret key. | |
| * @GNUTLS_PKCS11_OBJ_DATA: Data object. | | * @GNUTLS_PKCS11_OBJ_DATA: Data object. | |
| | | | |
End of changes. 3 change blocks. |
| 8 lines changed or deleted | | 7 lines changed or added | |
|
| pkcs7.h (3.4.2) | | pkcs7.h (3.4.3) | |
| | | | |
| skipping to change at line 57 | | skipping to change at line 57 | |
| int gnutls_pkcs7_import(gnutls_pkcs7_t pkcs7, | | int gnutls_pkcs7_import(gnutls_pkcs7_t pkcs7, | |
| const gnutls_datum_t * data, | | const gnutls_datum_t * data, | |
| gnutls_x509_crt_fmt_t format); | | gnutls_x509_crt_fmt_t format); | |
| int gnutls_pkcs7_export(gnutls_pkcs7_t pkcs7, | | int gnutls_pkcs7_export(gnutls_pkcs7_t pkcs7, | |
| gnutls_x509_crt_fmt_t format, | | gnutls_x509_crt_fmt_t format, | |
| void *output_data, size_t * output_data_size); | | void *output_data, size_t * output_data_size); | |
| int gnutls_pkcs7_export2(gnutls_pkcs7_t pkcs7, | | int gnutls_pkcs7_export2(gnutls_pkcs7_t pkcs7, | |
| gnutls_x509_crt_fmt_t format, | | gnutls_x509_crt_fmt_t format, | |
| gnutls_datum_t * out); | | gnutls_datum_t * out); | |
| | | | |
|
| | | int gnutls_pkcs7_get_signature_count(gnutls_pkcs7_t pkcs7); | |
| | | | |
| int gnutls_pkcs7_get_crt_count(gnutls_pkcs7_t pkcs7); | | int gnutls_pkcs7_get_crt_count(gnutls_pkcs7_t pkcs7); | |
| int gnutls_pkcs7_get_crt_raw(gnutls_pkcs7_t pkcs7, int indx, | | int gnutls_pkcs7_get_crt_raw(gnutls_pkcs7_t pkcs7, int indx, | |
| void *certificate, size_t * certificate_size); | | void *certificate, size_t * certificate_size); | |
| | | | |
| int gnutls_pkcs7_set_crt_raw(gnutls_pkcs7_t pkcs7, | | int gnutls_pkcs7_set_crt_raw(gnutls_pkcs7_t pkcs7, | |
| const gnutls_datum_t * crt); | | const gnutls_datum_t * crt); | |
| int gnutls_pkcs7_set_crt(gnutls_pkcs7_t pkcs7, gnutls_x509_crt_t crt); | | int gnutls_pkcs7_set_crt(gnutls_pkcs7_t pkcs7, gnutls_x509_crt_t crt); | |
| int gnutls_pkcs7_delete_crt(gnutls_pkcs7_t pkcs7, int indx); | | int gnutls_pkcs7_delete_crt(gnutls_pkcs7_t pkcs7, int indx); | |
| | | | |
| int gnutls_pkcs7_get_crl_raw(gnutls_pkcs7_t pkcs7, | | int gnutls_pkcs7_get_crl_raw(gnutls_pkcs7_t pkcs7, | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 2 lines changed or added | |
|