| compat.h (3.0.17) | | compat.h (3.0.18) | |
| | | | |
| skipping to change at line 50 | | skipping to change at line 50 | |
| #endif | | #endif | |
| #endif | | #endif | |
| | | | |
| #endif /* __GNUC__ */ | | #endif /* __GNUC__ */ | |
| | | | |
| #ifndef _GNUTLS_GCC_ATTR_DEPRECATED | | #ifndef _GNUTLS_GCC_ATTR_DEPRECATED | |
| #define _GNUTLS_GCC_ATTR_DEPRECATED | | #define _GNUTLS_GCC_ATTR_DEPRECATED | |
| #endif | | #endif | |
| | | | |
| /* gnutls_connection_end_t was made redundant in 2.99.0 */ | | /* gnutls_connection_end_t was made redundant in 2.99.0 */ | |
|
| #define gnutls_connection_end_t unsigned int | | typedef unsigned int gnutls_connection_end_t _GNUTLS_GCC_ATTR_DEPRECATED; | |
| | | | |
| /* Stuff deprected in 2.x */ | | /* Stuff deprected in 2.x */ | |
|
| #define gnutls_cipher_algorithm gnutls_cipher_algorithm_t | | typedef gnutls_cipher_algorithm_t gnutls_cipher_algorithm _GNUTLS_GCC_ATTR_ | |
| #define gnutls_kx_algorithm gnutls_kx_algorithm_t | | DEPRECATED; | |
| #define gnutls_paramsype gnutls_paramsype_t | | typedef gnutls_kx_algorithm_t gnutls_kx_algorithm _GNUTLS_GCC_ATTR_DEPRECAT | |
| #define gnutls_mac_algorithm gnutls_mac_algorithm_t | | ED; | |
| #define gnutls_digest_algorithm gnutls_digest_algorithm_t | | typedef gnutls_mac_algorithm_t gnutls_mac_algorithm _GNUTLS_GCC_ATTR_DEPREC | |
| #define gnutls_compression_method gnutls_compression_method_t | | ATED; | |
| #define gnutls_connection_end gnutls_connection_end_t | | typedef gnutls_digest_algorithm_t gnutls_digest_algorithm _GNUTLS_GCC_ATTR_ | |
| #define gnutls_credentialsype gnutls_credentialsype_t | | DEPRECATED; | |
| #define gnutls_certificateype gnutls_certificateype_t | | typedef gnutls_compression_method_t gnutls_compression_method _GNUTLS_GCC_A | |
| #define gnutls_x509_crt_fmt gnutls_x509_crt_fmt_t | | TTR_DEPRECATED; | |
| #define gnutls_openpgp_key_fmt gnutls_openpgp_key_fmt_t | | typedef gnutls_connection_end_t gnutls_connection_end _GNUTLS_GCC_ATTR_DEPR | |
| #define gnutls_pk_algorithm gnutls_pk_algorithm_t | | ECATED; | |
| #define gnutls_sign_algorithm gnutls_sign_algorithm_t | | typedef gnutls_x509_crt_fmt_t gnutls_x509_crt_fmt _GNUTLS_GCC_ATTR_DEPRECAT | |
| #define gnutls_server_name gnutls_server_nameype_t | | ED; | |
| #define gnutls_protocol gnutls_protocol_version_t | | typedef gnutls_pk_algorithm_t gnutls_pk_algorithm _GNUTLS_GCC_ATTR_DEPRECAT | |
| #define gnutls_close_request gnutls_close_request_t | | ED; | |
| #define gnutls_openpgp_key_status gnutls_openpgp_key_status_t | | typedef gnutls_sign_algorithm_t gnutls_sign_algorithm _GNUTLS_GCC_ATTR_DEPR | |
| #define gnutls_certificate_request gnutls_certificate_request_t | | ECATED; | |
| #define gnutls_certificate_status gnutls_certificate_status_t | | typedef gnutls_close_request_t gnutls_close_request _GNUTLS_GCC_ATTR_DEPREC | |
| #define gnutls_session gnutls_session_t | | ATED; | |
| #define gnutls_alert_level gnutls_alert_level_t | | typedef gnutls_certificate_request_t gnutls_certificate_request _GNUTLS_GCC | |
| #define gnutls_alert_description gnutls_alert_description_t | | _ATTR_DEPRECATED; | |
| #define gnutls_x509_subject_alt_name gnutls_x509_subject_alt_name_t | | typedef gnutls_certificate_status_t gnutls_certificate_status _GNUTLS_GCC_A | |
| #define gnutls_openpgp_key gnutls_openpgp_key_t | | TTR_DEPRECATED; | |
| #define gnutls_openpgp_privkey gnutls_openpgp_privkey_t | | typedef gnutls_session_t gnutls_session _GNUTLS_GCC_ATTR_DEPRECATED; | |
| #define gnutls_openpgp_keyring gnutls_openpgp_keyring_t | | typedef gnutls_alert_level_t gnutls_alert_level _GNUTLS_GCC_ATTR_DEPRECATED | |
| #define gnutls_x509_crt gnutls_x509_crt_t | | ; | |
| #define gnutls_x509_privkey gnutls_x509_privkey_t | | typedef gnutls_alert_description_t gnutls_alert_description _GNUTLS_GCC_ATT | |
| #define gnutls_x509_crl gnutls_x509_crl_t | | R_DEPRECATED; | |
| #define gnutls_pkcs7 gnutls_pkcs7_t | | typedef gnutls_x509_subject_alt_name_t gnutls_x509_subject_alt_name _GNUTLS | |
| #define gnutls_x509_crq gnutls_x509_crq_t | | _GCC_ATTR_DEPRECATED; | |
| #define gnutls_pkcs_encrypt_flags gnutls_pkcs_encrypt_flags_t | | typedef gnutls_openpgp_privkey_t gnutls_openpgp_privkey _GNUTLS_GCC_ATTR_DE | |
| #define gnutls_pkcs12_bag_type gnutls_pkcs12_bag_type_t | | PRECATED; | |
| #define gnutls_pkcs12_bag gnutls_pkcs12_bag_t | | typedef gnutls_openpgp_keyring_t gnutls_openpgp_keyring _GNUTLS_GCC_ATTR_DE | |
| #define gnutls_pkcs12 gnutls_pkcs12_t | | PRECATED; | |
| #define gnutls_certificate_credentials gnutls_certificate_credentials_t | | typedef gnutls_x509_crt_t gnutls_x509_crt _GNUTLS_GCC_ATTR_DEPRECATED; | |
| #define gnutls_anon_server_credentials gnutls_anon_server_credentials_t | | typedef gnutls_x509_privkey_t gnutls_x509_privkey _GNUTLS_GCC_ATTR_DEPRECAT | |
| #define gnutls_anon_client_credentials gnutls_anon_client_credentials_t | | ED; | |
| #define gnutls_srp_client_credentials gnutls_srp_client_credentials_t | | typedef gnutls_x509_crl_t gnutls_x509_crl _GNUTLS_GCC_ATTR_DEPRECATED; | |
| #define gnutls_srp_server_credentials gnutls_srp_server_credentials_t | | typedef gnutls_x509_crq_t gnutls_x509_crq _GNUTLS_GCC_ATTR_DEPRECATED; | |
| #define gnutls_dh_params gnutls_dh_params_t | | typedef gnutls_certificate_credentials_t gnutls_certificate_credentials _GN | |
| #define gnutls_rsa_params gnutls_rsa_params_t | | UTLS_GCC_ATTR_DEPRECATED; | |
| #define gnutls_params_type gnutls_params_type_t | | typedef gnutls_anon_server_credentials_t gnutls_anon_server_credentials _GN | |
| #define gnutls_credentials_type gnutls_credentials_type_t | | UTLS_GCC_ATTR_DEPRECATED; | |
| #define gnutls_certificate_type gnutls_certificate_type_t | | typedef gnutls_anon_client_credentials_t gnutls_anon_client_credentials _GN | |
| #define gnutls_datum gnutls_datum_t | | UTLS_GCC_ATTR_DEPRECATED; | |
| #define gnutls_transport_ptr gnutls_transport_ptr_t | | typedef gnutls_srp_client_credentials_t gnutls_srp_client_credentials _GNUT | |
| | | LS_GCC_ATTR_DEPRECATED; | |
| | | typedef gnutls_srp_server_credentials_t gnutls_srp_server_credentials _GNUT | |
| | | LS_GCC_ATTR_DEPRECATED; | |
| | | typedef gnutls_dh_params_t gnutls_dh_params _GNUTLS_GCC_ATTR_DEPRECATED; | |
| | | typedef gnutls_rsa_params_t gnutls_rsa_params _GNUTLS_GCC_ATTR_DEPRECATED; | |
| | | typedef gnutls_params_type_t gnutls_params_type _GNUTLS_GCC_ATTR_DEPRECATED | |
| | | ; | |
| | | typedef gnutls_credentials_type_t gnutls_credentials_type _GNUTLS_GCC_ATTR_ | |
| | | DEPRECATED; | |
| | | typedef gnutls_certificate_type_t gnutls_certificate_type _GNUTLS_GCC_ATTR_ | |
| | | DEPRECATED; | |
| | | typedef gnutls_datum_t gnutls_datum _GNUTLS_GCC_ATTR_DEPRECATED; | |
| | | typedef gnutls_transport_ptr_t gnutls_transport_ptr _GNUTLS_GCC_ATTR_DEPREC | |
| | | ATED; | |
| | | | |
| /* Old SRP alerts removed in 2.1.x because the TLS-SRP RFC was | | /* Old SRP alerts removed in 2.1.x because the TLS-SRP RFC was | |
| modified to use the PSK alert. */ | | modified to use the PSK alert. */ | |
| #define GNUTLS_A_MISSING_SRP_USERNAME GNUTLS_A_UNKNOWN_PSK_IDENTITY | | #define GNUTLS_A_MISSING_SRP_USERNAME GNUTLS_A_UNKNOWN_PSK_IDENTITY | |
| #define GNUTLS_A_UNKNOWN_SRP_USERNAME GNUTLS_A_UNKNOWN_PSK_IDENTITY | | #define GNUTLS_A_UNKNOWN_SRP_USERNAME GNUTLS_A_UNKNOWN_PSK_IDENTITY | |
| | | | |
| /* OpenPGP stuff renamed in 2.1.x. */ | | /* OpenPGP stuff renamed in 2.1.x. */ | |
|
| #define gnutls_openpgp_key_fmt_t gnutls_openpgp_crt_fmt_t | | | |
| #define GNUTLS_OPENPGP_KEY GNUTLS_OPENPGP_CERT | | #define GNUTLS_OPENPGP_KEY GNUTLS_OPENPGP_CERT | |
| #define GNUTLS_OPENPGP_KEY_FINGERPRINT GNUTLS_OPENPGP_CERT_FINGERPRINT | | #define GNUTLS_OPENPGP_KEY_FINGERPRINT GNUTLS_OPENPGP_CERT_FINGERPRINT | |
| #define gnutls_openpgp_send_key gnutls_openpgp_send_cert | | #define gnutls_openpgp_send_key gnutls_openpgp_send_cert | |
|
| #define gnutls_openpgp_key_status_t gnutls_openpgp_crt_status_t | | typedef gnutls_openpgp_crt_status_t gnutls_openpgp_key_status_t _GNUTLS_GCC | |
| #define gnutls_openpgp_key_t gnutls_openpgp_crt_t | | _ATTR_DEPRECATED; | |
| | | typedef gnutls_openpgp_crt_t gnutls_openpgp_key_t _GNUTLS_GCC_ATTR_DEPRECAT | |
| | | ED; | |
| #define gnutls_openpgp_key_init gnutls_openpgp_crt_init | | #define gnutls_openpgp_key_init gnutls_openpgp_crt_init | |
| #define gnutls_openpgp_key_deinit gnutls_openpgp_crt_deinit | | #define gnutls_openpgp_key_deinit gnutls_openpgp_crt_deinit | |
| #define gnutls_openpgp_key_import gnutls_openpgp_crt_import | | #define gnutls_openpgp_key_import gnutls_openpgp_crt_import | |
| #define gnutls_openpgp_key_export gnutls_openpgp_crt_export | | #define gnutls_openpgp_key_export gnutls_openpgp_crt_export | |
| #define gnutls_openpgp_key_get_key_usage gnutls_openpgp_crt_get_key_usage | | #define gnutls_openpgp_key_get_key_usage gnutls_openpgp_crt_get_key_usage | |
| #define gnutls_openpgp_key_get_fingerprint gnutls_openpgp_crt_get_fingerpri
nt | | #define gnutls_openpgp_key_get_fingerprint gnutls_openpgp_crt_get_fingerpri
nt | |
| #define gnutls_openpgp_key_get_pk_algorithm gnutls_openpgp_crt_get_pk_algor
ithm | | #define gnutls_openpgp_key_get_pk_algorithm gnutls_openpgp_crt_get_pk_algor
ithm | |
| #define gnutls_openpgp_key_get_name gnutls_openpgp_crt_get_name | | #define gnutls_openpgp_key_get_name gnutls_openpgp_crt_get_name | |
| #define gnutls_openpgp_key_get_version gnutls_openpgp_crt_get_version | | #define gnutls_openpgp_key_get_version gnutls_openpgp_crt_get_version | |
| #define gnutls_openpgp_key_get_creation_time gnutls_openpgp_crt_get_creatio
n_time | | #define gnutls_openpgp_key_get_creation_time gnutls_openpgp_crt_get_creatio
n_time | |
| | | | |
| skipping to change at line 136 | | skipping to change at line 122 | |
| | | | |
| /* OpenPGP stuff renamed in 2.3.x. */ | | /* OpenPGP stuff renamed in 2.3.x. */ | |
| #define gnutls_openpgp_crt_get_id gnutls_openpgp_crt_get_key_id | | #define gnutls_openpgp_crt_get_id gnutls_openpgp_crt_get_key_id | |
| | | | |
| /* New better names renamed in 2.3.x, add these for backwards | | /* New better names renamed in 2.3.x, add these for backwards | |
| compatibility with old poor names.*/ | | compatibility with old poor names.*/ | |
| #define GNUTLS_X509_CRT_FULL GNUTLS_CRT_PRINT_FULL | | #define GNUTLS_X509_CRT_FULL GNUTLS_CRT_PRINT_FULL | |
| #define GNUTLS_X509_CRT_ONELINE GNUTLS_CRT_PRINT_ONELINE | | #define GNUTLS_X509_CRT_ONELINE GNUTLS_CRT_PRINT_ONELINE | |
| #define GNUTLS_X509_CRT_UNSIGNED_FULL GNUTLS_CRT_PRINT_UNSIGNED_FULL | | #define GNUTLS_X509_CRT_UNSIGNED_FULL GNUTLS_CRT_PRINT_UNSIGNED_FULL | |
| | | | |
|
| /* These old #define's violate the gnutls_* namespace. */ | | | |
| #define TLS_MASTER_SIZE GNUTLS_MASTER_SIZE | | | |
| #define TLS_RANDOM_SIZE GNUTLS_RANDOM_SIZE | | | |
| | | | |
| /* Namespace problems. */ | | /* Namespace problems. */ | |
| #define LIBGNUTLS_VERSION GNUTLS_VERSION | | #define LIBGNUTLS_VERSION GNUTLS_VERSION | |
| #define LIBGNUTLS_VERSION_MAJOR GNUTLS_VERSION_MAJOR | | #define LIBGNUTLS_VERSION_MAJOR GNUTLS_VERSION_MAJOR | |
| #define LIBGNUTLS_VERSION_MINOR GNUTLS_VERSION_MINOR | | #define LIBGNUTLS_VERSION_MINOR GNUTLS_VERSION_MINOR | |
| #define LIBGNUTLS_VERSION_PATCH GNUTLS_VERSION_PATCH | | #define LIBGNUTLS_VERSION_PATCH GNUTLS_VERSION_PATCH | |
| #define LIBGNUTLS_VERSION_NUMBER GNUTLS_VERSION_NUMBER | | #define LIBGNUTLS_VERSION_NUMBER GNUTLS_VERSION_NUMBER | |
| #define LIBGNUTLS_EXTRA_VERSION GNUTLS_VERSION | | #define LIBGNUTLS_EXTRA_VERSION GNUTLS_VERSION | |
| | | | |
| /* The gnutls_retr_st was deprecated by gnutls_certificate_retrieve_functio
n() | | /* The gnutls_retr_st was deprecated by gnutls_certificate_retrieve_functio
n() | |
| * and gnutls_retr2_st. | | * and gnutls_retr2_st. | |
| | | | |
| skipping to change at line 328 | | skipping to change at line 310 | |
| gnutls_datum_t * exponent, | | gnutls_datum_t * exponent, | |
| gnutls_datum_t * modulus) _GNUTLS_GCC_A
TTR_DEPRECATED; | | gnutls_datum_t * modulus) _GNUTLS_GCC_A
TTR_DEPRECATED; | |
| int gnutls_rsa_export_get_modulus_bits (gnutls_session_t session) _GNUTLS
_GCC_ATTR_DEPRECATED; | | int gnutls_rsa_export_get_modulus_bits (gnutls_session_t session) _GNUTLS
_GCC_ATTR_DEPRECATED; | |
| int gnutls_set_default_export_priority (gnutls_session_t session) _GNUTLS
_GCC_ATTR_DEPRECATED; | | int gnutls_set_default_export_priority (gnutls_session_t session) _GNUTLS
_GCC_ATTR_DEPRECATED; | |
| | | | |
| void | | void | |
| gnutls_certificate_set_rsa_export_params (gnutls_certificate_credential
s_t | | gnutls_certificate_set_rsa_export_params (gnutls_certificate_credential
s_t | |
| res, | | res, | |
| gnutls_rsa_params_t rsa_param
s) _GNUTLS_GCC_ATTR_DEPRECATED; | | gnutls_rsa_params_t rsa_param
s) _GNUTLS_GCC_ATTR_DEPRECATED; | |
| | | | |
|
| | | #ifdef _ISOC99_SOURCE | |
| | | /* we provide older functions for compatibility as inline functions that | |
| | | * depend on gnutls_session_get_random. */ | |
| | | | |
| | | static inline const void *gnutls_session_get_server_random (gnutls_session_ | |
| | | t session) _GNUTLS_GCC_ATTR_DEPRECATED; | |
| | | static inline const void *gnutls_session_get_server_random (gnutls_session_ | |
| | | t session) | |
| | | { | |
| | | gnutls_datum_t rnd; | |
| | | gnutls_session_get_random(session, NULL, &rnd);/*doc-skip*/ | |
| | | return rnd.data; | |
| | | } | |
| | | | |
| | | static inline const void *gnutls_session_get_client_random (gnutls_session_ | |
| | | t session) _GNUTLS_GCC_ATTR_DEPRECATED; | |
| | | static inline const void *gnutls_session_get_client_random (gnutls_session_ | |
| | | t session) | |
| | | { | |
| | | gnutls_datum_t rnd; | |
| | | gnutls_session_get_random(session, &rnd, NULL);/*doc-skip*/ | |
| | | return rnd.data; | |
| | | } | |
| | | #endif | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } | | } | |
| #endif | | #endif | |
| | | | |
| #endif /* _GNUTLS_COMPAT_H */ | | #endif /* _GNUTLS_COMPAT_H */ | |
| | | | |
End of changes. 6 change blocks. |
| 55 lines changed or deleted | | 91 lines changed or added | |
|
| crypto.h (3.0.17) | | crypto.h (3.0.18) | |
| | | | |
| skipping to change at line 60 | | 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); | |
| | | | |
| 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; | |
| | | | |
| int gnutls_hmac_init (gnutls_hmac_hd_t * dig, | | int gnutls_hmac_init (gnutls_hmac_hd_t * dig, | |
|
| gnutls_digest_algorithm_t algorithm, const void *ke
y, | | gnutls_mac_algorithm_t algorithm, const void *key, | |
| size_t keylen); | | size_t keylen); | |
| 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, | |
| size_t keylen, const void *text, size_t textlen, | | size_t keylen, const void *text, size_t textlen, | |
| void *digest); | | void *digest); | |
| | | | |
| int gnutls_hash_init (gnutls_hash_hd_t * dig, | | int gnutls_hash_init (gnutls_hash_hd_t * dig, | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|
| gnutls.h (3.0.17) | | gnutls.h (3.0.18) | |
| | | | |
| 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.0.17" | | #define GNUTLS_VERSION "3.0.18" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 0 | | #define GNUTLS_VERSION_MINOR 0 | |
|
| #define GNUTLS_VERSION_PATCH 17 | | #define GNUTLS_VERSION_PATCH 18 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030011 | | #define GNUTLS_VERSION_NUMBER 0x030012 | |
| | | | |
| #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 960 | | skipping to change at line 960 | |
| | | | |
| /* get/set session | | /* get/set session | |
| */ | | */ | |
| int gnutls_session_set_data (gnutls_session_t session, | | int gnutls_session_set_data (gnutls_session_t session, | |
| const void *session_data, | | const void *session_data, | |
| size_t session_data_size); | | size_t session_data_size); | |
| int gnutls_session_get_data (gnutls_session_t session, void *session_data
, | | int gnutls_session_get_data (gnutls_session_t session, void *session_data
, | |
| size_t * session_data_size); | | size_t * session_data_size); | |
| int gnutls_session_get_data2 (gnutls_session_t session, | | int gnutls_session_get_data2 (gnutls_session_t session, | |
| gnutls_datum_t * data); | | gnutls_datum_t * data); | |
|
| | | void gnutls_session_get_random (gnutls_session_t session, gnutls_datum_t* | |
| | | client, | |
| | | gnutls_datum_t* server); | |
| | | | |
| /* 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_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); | |
| | | | |
| | | | |
| skipping to change at line 1143 | | skipping to change at line 1145 | |
| gnutls_x509_crt_t * cert_list, | | gnutls_x509_crt_t * cert_list, | |
| int cert_list_size, | | int cert_list_size, | |
| gnutls_x509_privkey_t key); | | gnutls_x509_privkey_t key); | |
| int gnutls_certificate_set_x509_trust (gnutls_certificate_credentials_t r
es, | | int gnutls_certificate_set_x509_trust (gnutls_certificate_credentials_t r
es, | |
| gnutls_x509_crt_t * ca_list, | | gnutls_x509_crt_t * ca_list, | |
| int ca_list_size); | | int ca_list_size); | |
| int gnutls_certificate_set_x509_crl (gnutls_certificate_credentials_t res
, | | int gnutls_certificate_set_x509_crl (gnutls_certificate_credentials_t res
, | |
| gnutls_x509_crl_t * crl_list, | | gnutls_x509_crl_t * crl_list, | |
| int crl_list_size); | | int crl_list_size); | |
| | | | |
|
| void | | | |
| gnutls_certificate_get_openpgp_keyring (gnutls_certificate_credentials_ | | | |
| t | | | |
| sc, | | | |
| gnutls_openpgp_keyring_t * | | | |
| keyring); | | | |
| | | | |
| /* global state functions | | /* global state functions | |
| */ | | */ | |
| int gnutls_global_init (void); | | int gnutls_global_init (void); | |
| void gnutls_global_deinit (void); | | void gnutls_global_deinit (void); | |
| | | | |
| /** | | /** | |
| * gnutls_time_func: | | * gnutls_time_func: | |
| * @t: where to store time. | | * @t: where to store time. | |
| * | | * | |
| * Function prototype for time()-like function. Set with | | * Function prototype for time()-like function. Set with | |
| | | | |
End of changes. 5 change blocks. |
| 10 lines changed or deleted | | 6 lines changed or added | |
|
| x509.h (3.0.17) | | x509.h (3.0.18) | |
| | | | |
| skipping to change at line 126 | | skipping to change at line 126 | |
| const gnutls_datum_t * data, | | const gnutls_datum_t * data, | |
| gnutls_x509_crt_fmt_t format, unsigned int fla
gs); | | gnutls_x509_crt_fmt_t format, unsigned int fla
gs); | |
| int gnutls_x509_crt_list_import (gnutls_x509_crt_t * certs, | | int gnutls_x509_crt_list_import (gnutls_x509_crt_t * certs, | |
| unsigned int *cert_max, | | unsigned int *cert_max, | |
| const gnutls_datum_t * data, | | const gnutls_datum_t * data, | |
| gnutls_x509_crt_fmt_t format, | | gnutls_x509_crt_fmt_t format, | |
| unsigned int flags); | | unsigned int flags); | |
| int gnutls_x509_crt_export (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_export (gnutls_x509_crt_t cert, | |
| 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_x509_crt_get_private_key_usage_period (gnutls_x509_crt_t cert, | |
| | | time_t* activation, time_t* expiration, | |
| | | unsigned int *critical); | |
| | | | |
| int gnutls_x509_crt_get_issuer_dn (gnutls_x509_crt_t cert, char *buf, | | int gnutls_x509_crt_get_issuer_dn (gnutls_x509_crt_t cert, char *buf, | |
| size_t * buf_size); | | size_t * buf_size); | |
| int gnutls_x509_crt_get_issuer_dn_oid (gnutls_x509_crt_t cert, int indx, | | int gnutls_x509_crt_get_issuer_dn_oid (gnutls_x509_crt_t cert, int indx, | |
| void *oid, size_t * oid_size); | | void *oid, size_t * oid_size); | |
| int gnutls_x509_crt_get_issuer_dn_by_oid (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_issuer_dn_by_oid (gnutls_x509_crt_t cert, | |
| const char *oid, int indx, | | const char *oid, int indx, | |
| unsigned int raw_flag, | | unsigned int raw_flag, | |
| void *buf, size_t * buf_size); | | void *buf, size_t * buf_size); | |
| int gnutls_x509_crt_get_dn (gnutls_x509_crt_t cert, char *buf, | | int gnutls_x509_crt_get_dn (gnutls_x509_crt_t cert, char *buf, | |
| size_t * buf_size); | | size_t * buf_size); | |
| | | | |
| skipping to change at line 154 | | skipping to change at line 157 | |
| | | | |
| int gnutls_x509_crt_get_signature_algorithm (gnutls_x509_crt_t cert); | | int gnutls_x509_crt_get_signature_algorithm (gnutls_x509_crt_t cert); | |
| int gnutls_x509_crt_get_signature (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_signature (gnutls_x509_crt_t cert, | |
| char *sig, size_t * sizeof_sig); | | char *sig, size_t * sizeof_sig); | |
| int gnutls_x509_crt_get_version (gnutls_x509_crt_t cert); | | int gnutls_x509_crt_get_version (gnutls_x509_crt_t cert); | |
| int gnutls_x509_crt_get_key_id (gnutls_x509_crt_t crt, | | int gnutls_x509_crt_get_key_id (gnutls_x509_crt_t crt, | |
| unsigned int flags, | | unsigned int flags, | |
| unsigned char *output_data, | | unsigned char *output_data, | |
| size_t * output_data_size); | | size_t * output_data_size); | |
| | | | |
|
| | | int gnutls_x509_crt_set_private_key_usage_period (gnutls_x509_crt_t crt, | |
| | | time_t activation, | |
| | | time_t expiration); | |
| int gnutls_x509_crt_set_authority_key_id (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_set_authority_key_id (gnutls_x509_crt_t cert, | |
| const void *id, size_t id_size)
; | | const void *id, size_t id_size)
; | |
| int gnutls_x509_crt_get_authority_key_id (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_authority_key_id (gnutls_x509_crt_t cert, | |
| void *id, size_t * id_size, | | void *id, size_t * id_size, | |
| unsigned int *critical); | | unsigned int *critical); | |
| int gnutls_x509_crt_get_authority_key_gn_serial (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_authority_key_gn_serial (gnutls_x509_crt_t cert, | |
| unsigned int seq, | | unsigned int seq, | |
| void *alt, | | void *alt, | |
| size_t * alt_size, | | size_t * alt_size, | |
| unsigned int *alt_type, | | unsigned int *alt_type, | |
| | | | |
| skipping to change at line 811 | | skipping to change at line 817 | |
| gnutls_datum_t * out); | | gnutls_datum_t * out); | |
| | | | |
| int gnutls_x509_crq_verify (gnutls_x509_crq_t crq, unsigned int flags); | | int gnutls_x509_crq_verify (gnutls_x509_crq_t crq, unsigned int flags); | |
| | | | |
| int gnutls_x509_crq_init (gnutls_x509_crq_t * crq); | | int gnutls_x509_crq_init (gnutls_x509_crq_t * crq); | |
| void gnutls_x509_crq_deinit (gnutls_x509_crq_t crq); | | void gnutls_x509_crq_deinit (gnutls_x509_crq_t crq); | |
| int gnutls_x509_crq_import (gnutls_x509_crq_t crq, | | int gnutls_x509_crq_import (gnutls_x509_crq_t crq, | |
| const gnutls_datum_t * data, | | const gnutls_datum_t * data, | |
| gnutls_x509_crt_fmt_t format); | | gnutls_x509_crt_fmt_t format); | |
| | | | |
|
| | | int gnutls_x509_crq_get_private_key_usage_period (gnutls_x509_crq_t cert, | |
| | | time_t* activation, time_t* expiration, | |
| | | unsigned int *critical); | |
| | | | |
| int gnutls_x509_crq_get_dn (gnutls_x509_crq_t crq, char *buf, | | int gnutls_x509_crq_get_dn (gnutls_x509_crq_t crq, char *buf, | |
| size_t * sizeof_buf); | | size_t * sizeof_buf); | |
| int gnutls_x509_crq_get_dn_oid (gnutls_x509_crq_t crq, int indx, | | int gnutls_x509_crq_get_dn_oid (gnutls_x509_crq_t crq, int indx, | |
| void *oid, size_t * sizeof_oid); | | void *oid, size_t * sizeof_oid); | |
| int gnutls_x509_crq_get_dn_by_oid (gnutls_x509_crq_t crq, | | int gnutls_x509_crq_get_dn_by_oid (gnutls_x509_crq_t crq, | |
| const char *oid, int indx, | | const char *oid, int indx, | |
| unsigned int raw_flag, void *buf, | | unsigned int raw_flag, void *buf, | |
| size_t * sizeof_buf); | | size_t * sizeof_buf); | |
| int gnutls_x509_crq_set_dn_by_oid (gnutls_x509_crq_t crq, | | int gnutls_x509_crq_set_dn_by_oid (gnutls_x509_crq_t crq, | |
| const char *oid, | | const char *oid, | |
| | | | |
| skipping to change at line 851 | | skipping to change at line 860 | |
| void *buf, size_t * sizeof_buf)
; | | void *buf, size_t * sizeof_buf)
; | |
| | | | |
| int gnutls_x509_crq_export (gnutls_x509_crq_t crq, | | int gnutls_x509_crq_export (gnutls_x509_crq_t crq, | |
| 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_x509_crt_set_crq (gnutls_x509_crt_t crt, gnutls_x509_crq_t crq
); | | int gnutls_x509_crt_set_crq (gnutls_x509_crt_t crt, gnutls_x509_crq_t crq
); | |
| int gnutls_x509_crt_set_crq_extensions (gnutls_x509_crt_t crt, | | int gnutls_x509_crt_set_crq_extensions (gnutls_x509_crt_t crt, | |
| gnutls_x509_crq_t crq); | | gnutls_x509_crq_t crq); | |
| | | | |
|
| | | int gnutls_x509_crq_set_private_key_usage_period (gnutls_x509_crq_t crq, | |
| | | time_t activation, | |
| | | time_t expiration); | |
| int gnutls_x509_crq_set_key_rsa_raw (gnutls_x509_crq_t crq, | | int gnutls_x509_crq_set_key_rsa_raw (gnutls_x509_crq_t crq, | |
| const gnutls_datum_t * m, | | const gnutls_datum_t * m, | |
| const gnutls_datum_t * e); | | const gnutls_datum_t * e); | |
| int gnutls_x509_crq_set_subject_alt_name (gnutls_x509_crq_t crq, | | int gnutls_x509_crq_set_subject_alt_name (gnutls_x509_crq_t crq, | |
| gnutls_x509_subject_alt_name_t
nt, | | gnutls_x509_subject_alt_name_t
nt, | |
| const void *data, | | const void *data, | |
| unsigned int data_size, | | unsigned int data_size, | |
| unsigned int flags); | | unsigned int flags); | |
| | | | |
| int gnutls_x509_crq_set_key_usage (gnutls_x509_crq_t crq, | | int gnutls_x509_crq_set_key_usage (gnutls_x509_crq_t crq, | |
| | | | |
End of changes. 4 change blocks. |
| 0 lines changed or deleted | | 14 lines changed or added | |
|