diff options
Diffstat (limited to 'lib/gnutls.h.in.in')
| -rw-r--r-- | lib/gnutls.h.in.in | 388 |
1 files changed, 195 insertions, 193 deletions
diff --git a/lib/gnutls.h.in.in b/lib/gnutls.h.in.in index 883c80f865..26b6b7bb01 100644 --- a/lib/gnutls.h.in.in +++ b/lib/gnutls.h.in.in @@ -55,36 +55,38 @@ extern "C" { @DEFINE_TIME_T@ #endif +#include <gnutls/compat.h> + #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_CBC GNUTLS_CIPHER_AES_128_CBC #define GNUTLS_CIPHER_ARCFOUR GNUTLS_CIPHER_ARCFOUR_128 -typedef enum gnutls_cipher_algorithm { GNUTLS_CIPHER_NULL=1, +typedef enum { GNUTLS_CIPHER_NULL=1, GNUTLS_CIPHER_ARCFOUR_128, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_AES_256_CBC, GNUTLS_CIPHER_ARCFOUR_40 -} gnutls_cipher_algorithm; +} gnutls_cipher_algorithm_t; -typedef enum gnutls_kx_algorithm { GNUTLS_KX_RSA=1, GNUTLS_KX_DHE_DSS, +typedef enum { GNUTLS_KX_RSA=1, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, GNUTLS_KX_ANON_DH, GNUTLS_KX_SRP, GNUTLS_KX_RSA_EXPORT, GNUTLS_KX_SRP_RSA, GNUTLS_KX_SRP_DSS -} gnutls_kx_algorithm; +} gnutls_kx_algorithm_t; -typedef enum gnutls_params_type { GNUTLS_PARAMS_RSA_EXPORT=1, +typedef enum { GNUTLS_PARAMS_RSA_EXPORT=1, GNUTLS_PARAMS_DH -} gnutls_params_type; +} gnutls_params_type_t; -typedef enum gnutls_credentials_type { GNUTLS_CRD_CERTIFICATE=1, GNUTLS_CRD_ANON, GNUTLS_CRD_SRP } gnutls_credentials_type; +typedef enum { GNUTLS_CRD_CERTIFICATE=1, GNUTLS_CRD_ANON, GNUTLS_CRD_SRP } gnutls_credentials_type_t; -typedef enum gnutls_mac_algorithm { GNUTLS_MAC_NULL=1, +typedef enum { GNUTLS_MAC_NULL=1, GNUTLS_MAC_MD5, GNUTLS_MAC_SHA, GNUTLS_MAC_RMD160 -} gnutls_mac_algorithm; +} gnutls_mac_algorithm_t; -/* The enumerations here should have the same value with gnutls_mac_algorithm. +/* The enumerations here should have the same value with gnutls_mac_algorithm_t. */ -typedef enum gnutls_digest_algorithm { GNUTLS_DIG_NULL=1, GNUTLS_DIG_MD5, +typedef enum { GNUTLS_DIG_NULL=1, GNUTLS_DIG_MD5, GNUTLS_DIG_SHA, GNUTLS_DIG_RIPEMD160 -} gnutls_digest_algorithm; +} gnutls_digest_algorithm_t; /* exported for other gnutls headers. This is the maximum number * of algorithms (ciphers, kx or macs). @@ -92,17 +94,17 @@ typedef enum gnutls_digest_algorithm { GNUTLS_DIG_NULL=1, GNUTLS_DIG_MD5, #define GNUTLS_MAX_ALGORITHM_NUM 16 #define GNUTLS_COMP_ZLIB GNUTLS_COMP_DEFLATE -typedef enum gnutls_compression_method { GNUTLS_COMP_NULL=1, +typedef enum { GNUTLS_COMP_NULL=1, GNUTLS_COMP_DEFLATE, GNUTLS_COMP_LZO /* only available if gnutls-extra has been initialized */ -} gnutls_compression_method; +} gnutls_compression_method_t; -typedef enum gnutls_connection_end { GNUTLS_SERVER=1, GNUTLS_CLIENT } gnutls_connection_end; +typedef enum { GNUTLS_SERVER=1, GNUTLS_CLIENT } gnutls_connection_end_t; -typedef enum gnutls_alert_level { GNUTLS_AL_WARNING=1, GNUTLS_AL_FATAL } gnutls_alert_level; +typedef enum { GNUTLS_AL_WARNING=1, GNUTLS_AL_FATAL } gnutls_alert_level_t; -typedef enum gnutls_alert_description { GNUTLS_A_CLOSE_NOTIFY, +typedef enum { GNUTLS_A_CLOSE_NOTIFY, GNUTLS_A_UNEXPECTED_MESSAGE=10, GNUTLS_A_BAD_RECORD_MAC=20, GNUTLS_A_DECRYPTION_FAILED, GNUTLS_A_RECORD_OVERFLOW, GNUTLS_A_DECOMPRESSION_FAILURE=30, GNUTLS_A_HANDSHAKE_FAILURE=40, GNUTLS_A_SSL3_NO_CERTIFICATE=41, @@ -114,20 +116,20 @@ typedef enum gnutls_alert_description { GNUTLS_A_CLOSE_NOTIFY, GNUTLS_A_NO_RENEGOTIATION=100, GNUTLS_A_UNSUPPORTED_EXTENSION=110, GNUTLS_A_CERTIFICATE_UNOBTAINABLE=111, GNUTLS_A_UNRECOGNIZED_NAME=112, GNUTLS_A_UNKNOWN_SRP_USERNAME=120, GNUTLS_A_MISSING_SRP_USERNAME=121 -} gnutls_alert_description; +} gnutls_alert_description_t; -typedef enum gnutls_handshake_description { GNUTLS_HANDSHAKE_HELLO_REQUEST, +typedef enum { GNUTLS_HANDSHAKE_HELLO_REQUEST, GNUTLS_HANDSHAKE_CLIENT_HELLO, GNUTLS_HANDSHAKE_SERVER_HELLO, GNUTLS_HANDSHAKE_CERTIFICATE_PKT=11, GNUTLS_HANDSHAKE_SERVER_KEY_EXCHANGE, GNUTLS_HANDSHAKE_CERTIFICATE_REQUEST, GNUTLS_HANDSHAKE_SERVER_HELLO_DONE, GNUTLS_HANDSHAKE_CERTIFICATE_VERIFY, GNUTLS_HANDSHAKE_CLIENT_KEY_EXCHANGE, GNUTLS_HANDSHAKE_FINISHED=20 -} gnutls_handshake_description; +} gnutls_handshake_description_t; /* Note that the status bits have different meanings * in openpgp keys and x.509 certificate verification. */ -typedef enum gnutls_certificate_status { +typedef enum { GNUTLS_CERT_INVALID=2, /* will be set if the certificate * was not verified. */ @@ -140,90 +142,90 @@ typedef enum gnutls_certificate_status { */ GNUTLS_CERT_SIGNER_NOT_FOUND=64, GNUTLS_CERT_SIGNER_NOT_CA=128 -} gnutls_certificate_status; +} gnutls_certificate_status_t; -typedef enum gnutls_certificate_request { GNUTLS_CERT_IGNORE, GNUTLS_CERT_REQUEST=1, GNUTLS_CERT_REQUIRE } gnutls_certificate_request; +typedef enum { GNUTLS_CERT_IGNORE, GNUTLS_CERT_REQUEST=1, GNUTLS_CERT_REQUIRE } gnutls_certificate_request_t; -typedef enum gnutls_openpgp_key_status { GNUTLS_OPENPGP_KEY, +typedef enum { GNUTLS_OPENPGP_KEY, GNUTLS_OPENPGP_KEY_FINGERPRINT -} gnutls_openpgp_key_status; +} gnutls_openpgp_key_status_t; -typedef enum gnutls_close_request { GNUTLS_SHUT_RDWR=0, GNUTLS_SHUT_WR=1 } gnutls_close_request; +typedef enum { GNUTLS_SHUT_RDWR=0, GNUTLS_SHUT_WR=1 } gnutls_close_request_t; #define GNUTLS_TLS1 GNUTLS_TLS1_0 -typedef enum gnutls_protocol_version { GNUTLS_SSL3=1, GNUTLS_TLS1_0, - GNUTLS_TLS1_1 } gnutls_protocol_version; +typedef enum { GNUTLS_SSL3=1, GNUTLS_TLS1_0, + GNUTLS_TLS1_1 } gnutls_protocol_t; -typedef enum gnutls_certificate_type { GNUTLS_CRT_X509=1, GNUTLS_CRT_OPENPGP -} gnutls_certificate_type; +typedef enum { GNUTLS_CRT_X509=1, GNUTLS_CRT_OPENPGP +} gnutls_certificate_type_t; -typedef enum gnutls_x509_crt_fmt { GNUTLS_X509_FMT_DER, - GNUTLS_X509_FMT_PEM } gnutls_x509_crt_fmt; +typedef enum { GNUTLS_X509_FMT_DER, + GNUTLS_X509_FMT_PEM } gnutls_x509_crt_fmt_t; -typedef enum gnutls_pk_algorithm { GNUTLS_PK_RSA = 1, GNUTLS_PK_DSA, +typedef enum { GNUTLS_PK_RSA = 1, GNUTLS_PK_DSA, GNUTLS_PK_UNKNOWN = 0xff -} gnutls_pk_algorithm; +} gnutls_pk_algorithm_t; -const char *gnutls_pk_algorithm_get_name( gnutls_pk_algorithm algorithm); +const char *gnutls_pk_algorithm_get_name( gnutls_pk_algorithm_t algorithm); -typedef enum gnutls_sign_algorithm { GNUTLS_SIGN_RSA_SHA = 1, GNUTLS_SIGN_DSA_SHA, +typedef enum { GNUTLS_SIGN_RSA_SHA = 1, GNUTLS_SIGN_DSA_SHA, GNUTLS_SIGN_RSA_MD5, GNUTLS_SIGN_RSA_MD2, GNUTLS_SIGN_UNKNOWN = 0xff -} gnutls_sign_algorithm; +} gnutls_sign_algorithm_t; -const char *gnutls_sign_algorithm_get_name( gnutls_sign_algorithm algorithm); +const char *gnutls_sign_algorithm_get_name( gnutls_sign_algorithm_t algorithm); /* If you want to change this, then also change the * define in gnutls_int.h, and recompile. */ -typedef void * gnutls_transport_ptr; +typedef void * gnutls_transport_ptr_t; struct gnutls_session_int; -typedef struct gnutls_session_int* gnutls_session; +typedef struct gnutls_session_int* gnutls_session_t; struct gnutls_dh_params_int; -typedef struct gnutls_dh_params_int* gnutls_dh_params; +typedef struct gnutls_dh_params_int* gnutls_dh_params_t; struct gnutls_rsa_params_int; -typedef struct gnutls_rsa_params_int* gnutls_rsa_params; +typedef struct gnutls_rsa_params_int* gnutls_rsa_params_t; typedef struct { unsigned char * data; unsigned int size; -} gnutls_datum; +} gnutls_datum_t; /* internal functions */ -int gnutls_init(gnutls_session * session, gnutls_connection_end con_end); -void gnutls_deinit(gnutls_session session); +int gnutls_init(gnutls_session_t * session, gnutls_connection_end_t con_end); +void gnutls_deinit(gnutls_session_t session); #define _gnutls_deinit(x) gnutls_deinit(x) -int gnutls_bye( gnutls_session session, gnutls_close_request how); +int gnutls_bye( gnutls_session_t session, gnutls_close_request_t how); -int gnutls_handshake( gnutls_session session); -int gnutls_rehandshake( gnutls_session session); +int gnutls_handshake( gnutls_session_t session); +int gnutls_rehandshake( gnutls_session_t session); -gnutls_alert_description gnutls_alert_get( gnutls_session session); -int gnutls_alert_send( gnutls_session, gnutls_alert_level, gnutls_alert_description); -int gnutls_alert_send_appropriate( gnutls_session session, int err); -const char* gnutls_alert_get_name( gnutls_alert_description alert); +gnutls_alert_description_t gnutls_alert_get( gnutls_session_t session); +int gnutls_alert_send( gnutls_session_t, gnutls_alert_level_t, gnutls_alert_description_t); +int gnutls_alert_send_appropriate( gnutls_session_t session, int err); +const char* gnutls_alert_get_name( gnutls_alert_description_t alert); /* get information on the current session */ -gnutls_cipher_algorithm gnutls_cipher_get( gnutls_session session); -gnutls_kx_algorithm gnutls_kx_get( gnutls_session session); -gnutls_mac_algorithm gnutls_mac_get( gnutls_session session); -gnutls_compression_method gnutls_compression_get( gnutls_session session); -gnutls_certificate_type gnutls_certificate_type_get( gnutls_session session); +gnutls_cipher_algorithm_t gnutls_cipher_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_compression_method_t gnutls_compression_get( gnutls_session_t session); +gnutls_certificate_type_t gnutls_certificate_type_get( gnutls_session_t session); -size_t gnutls_cipher_get_key_size( gnutls_cipher_algorithm algorithm); +size_t gnutls_cipher_get_key_size( gnutls_cipher_algorithm_t algorithm); /* the name of the specified algorithms */ -const char *gnutls_cipher_get_name( gnutls_cipher_algorithm); -const char *gnutls_mac_get_name( gnutls_mac_algorithm); -const char *gnutls_compression_get_name( gnutls_compression_method); -const char *gnutls_kx_get_name( gnutls_kx_algorithm algorithm); -const char *gnutls_certificate_type_get_name( gnutls_certificate_type type); +const char *gnutls_cipher_get_name( gnutls_cipher_algorithm_t); +const char *gnutls_mac_get_name( gnutls_mac_algorithm_t); +const char *gnutls_compression_get_name( gnutls_compression_method_t); +const char *gnutls_kx_get_name( gnutls_kx_algorithm_t algorithm); +const char *gnutls_certificate_type_get_name( gnutls_certificate_type_t type); /* error functions */ @@ -235,88 +237,88 @@ const char* gnutls_strerror( int error); /* Semi-internal functions. */ -void gnutls_handshake_set_private_extensions(gnutls_session session, int allow); -gnutls_handshake_description gnutls_handshake_get_last_out( gnutls_session session); -gnutls_handshake_description gnutls_handshake_get_last_in( gnutls_session session); +void gnutls_handshake_set_private_extensions(gnutls_session_t session, int allow); +gnutls_handshake_description_t gnutls_handshake_get_last_out( gnutls_session_t session); +gnutls_handshake_description_t gnutls_handshake_get_last_in( gnutls_session_t session); /* Record layer functions. */ -ssize_t gnutls_record_send( gnutls_session session, const void *data, size_t sizeofdata); -ssize_t gnutls_record_recv( gnutls_session session, void *data, size_t sizeofdata); +ssize_t gnutls_record_send( gnutls_session_t session, const void *data, size_t sizeofdata); +ssize_t gnutls_record_recv( gnutls_session_t session, void *data, size_t sizeofdata); #define gnutls_read gnutls_record_recv #define gnutls_write gnutls_record_send -int gnutls_record_get_direction(gnutls_session session); +int gnutls_record_get_direction(gnutls_session_t session); -size_t gnutls_record_get_max_size( gnutls_session session); -ssize_t gnutls_record_set_max_size( gnutls_session session, size_t size); +size_t gnutls_record_get_max_size( gnutls_session_t session); +ssize_t gnutls_record_set_max_size( gnutls_session_t session, size_t size); -size_t gnutls_record_check_pending(gnutls_session session); +size_t gnutls_record_check_pending(gnutls_session_t session); /* TLS Extensions */ -typedef enum gnutls_server_name_type { GNUTLS_NAME_DNS=1 -} gnutls_server_name_type; +typedef enum { GNUTLS_NAME_DNS=1 +} gnutls_server_name_type_t; -int gnutls_server_name_set(gnutls_session session, - gnutls_server_name_type type, +int gnutls_server_name_set(gnutls_session_t session, + gnutls_server_name_type_t type, const void *name, size_t name_length); -int gnutls_server_name_get(gnutls_session session, +int gnutls_server_name_get(gnutls_session_t session, void *data, size_t *data_length, unsigned int * type, int unsigned indx); /* functions to set priority of cipher suites */ -int gnutls_cipher_set_priority( gnutls_session session, const int*); -int gnutls_mac_set_priority( gnutls_session session, const int*); -int gnutls_compression_set_priority( gnutls_session session, const int*); -int gnutls_kx_set_priority( gnutls_session session, const int*); -int gnutls_protocol_set_priority( gnutls_session session, const int*); -int gnutls_certificate_type_set_priority( gnutls_session session, const int*); +int gnutls_cipher_set_priority( gnutls_session_t session, const int*); +int gnutls_mac_set_priority( gnutls_session_t session, const int*); +int gnutls_compression_set_priority( gnutls_session_t session, const int*); +int gnutls_kx_set_priority( gnutls_session_t session, const int*); +int gnutls_protocol_set_priority( gnutls_session_t session, const int*); +int gnutls_certificate_type_set_priority( gnutls_session_t session, const int*); /* if you just want some defaults, use the following. */ -int gnutls_set_default_priority(gnutls_session session); -int gnutls_set_default_export_priority(gnutls_session session); +int gnutls_set_default_priority(gnutls_session_t session); +int gnutls_set_default_export_priority(gnutls_session_t session); /* Returns the name of a cipher suite */ -const char *gnutls_cipher_suite_get_name(gnutls_kx_algorithm kx_algorithm, - gnutls_cipher_algorithm cipher_algorithm, gnutls_mac_algorithm mac_algorithm); +const char *gnutls_cipher_suite_get_name(gnutls_kx_algorithm_t kx_algorithm, + gnutls_cipher_algorithm_t cipher_algorithm, gnutls_mac_algorithm_t mac_algorithm); /* get the currently used protocol version */ -gnutls_protocol_version gnutls_protocol_get_version(gnutls_session session); +gnutls_protocol_t gnutls_protocol_get_version(gnutls_session_t session); -const char *gnutls_protocol_get_name(gnutls_protocol_version version); +const char *gnutls_protocol_get_name(gnutls_protocol_t version); /* get/set session */ -int gnutls_session_set_data( gnutls_session session, const void* session_data, size_t session_data_size); -int gnutls_session_get_data( gnutls_session session, void* session_data, size_t *session_data_size); +int gnutls_session_set_data( gnutls_session_t session, const void* session_data, size_t session_data_size); +int gnutls_session_get_data( gnutls_session_t session, void* session_data, size_t *session_data_size); /* returns the session ID */ #define GNUTLS_MAX_SESSION_ID 32 -int gnutls_session_get_id( gnutls_session session, void* session_id, size_t *session_id_size); +int gnutls_session_get_id( gnutls_session_t session, void* session_id, size_t *session_id_size); /* checks if this session is a resumed one */ -int gnutls_session_is_resumed(gnutls_session session); +int gnutls_session_is_resumed(gnutls_session_t session); -typedef int (*gnutls_db_store_func)(void*, gnutls_datum key, gnutls_datum data); -typedef int (*gnutls_db_remove_func)(void*, gnutls_datum key); -typedef gnutls_datum (*gnutls_db_retr_func)(void*, gnutls_datum key); +typedef int (*gnutls_db_store_func)(void*, gnutls_datum_t key, gnutls_datum_t data); +typedef int (*gnutls_db_remove_func)(void*, gnutls_datum_t key); +typedef gnutls_datum_t (*gnutls_db_retr_func)(void*, gnutls_datum_t key); -void gnutls_db_set_cache_expiration( gnutls_session session, int seconds); +void gnutls_db_set_cache_expiration( gnutls_session_t session, int seconds); -void gnutls_db_remove_session( gnutls_session session); -void gnutls_db_set_retrieve_function( gnutls_session, gnutls_db_retr_func); -void gnutls_db_set_remove_function( gnutls_session, gnutls_db_remove_func); -void gnutls_db_set_store_function( gnutls_session, gnutls_db_store_func); -void gnutls_db_set_ptr( gnutls_session, void* db_ptr); -void* gnutls_db_get_ptr( gnutls_session); -int gnutls_db_check_entry( gnutls_session session, gnutls_datum session_entry); +void gnutls_db_remove_session( gnutls_session_t session); +void gnutls_db_set_retrieve_function( gnutls_session_t, gnutls_db_retr_func); +void gnutls_db_set_remove_function( gnutls_session_t, gnutls_db_remove_func); +void gnutls_db_set_store_function( gnutls_session_t, gnutls_db_store_func); +void gnutls_db_set_ptr( gnutls_session_t, void* db_ptr); +void* gnutls_db_get_ptr( gnutls_session_t); +int gnutls_db_check_entry( gnutls_session_t session, gnutls_datum_t session_entry); -void gnutls_handshake_set_max_packet_length( gnutls_session session, int max); +void gnutls_handshake_set_max_packet_length( gnutls_session_t session, int max); /* returns libgnutls version (call it with a NULL argument) */ @@ -324,82 +326,82 @@ const char* gnutls_check_version( const char*); /* Functions for setting/clearing credentials */ -int gnutls_credentials_clear( gnutls_session session); +int gnutls_credentials_clear( gnutls_session_t session); /* cred is a structure defined by the kx algorithm */ -int gnutls_credentials_set( gnutls_session, gnutls_credentials_type type, void* cred); +int gnutls_credentials_set( gnutls_session_t, gnutls_credentials_type_t type, void* cred); #define gnutls_cred_set gnutls_credentials_set /* Credential structures for SRP - used in gnutls_credentials_set(); */ struct DSTRUCT; -typedef struct DSTRUCT* gnutls_certificate_credentials; -typedef gnutls_certificate_credentials gnutls_certificate_server_credentials; -typedef gnutls_certificate_credentials gnutls_certificate_client_credentials; +typedef struct DSTRUCT* gnutls_certificate_credentials_t; +typedef gnutls_certificate_credentials_t gnutls_certificate_server_credentials; +typedef gnutls_certificate_credentials_t gnutls_certificate_client_credentials; -typedef struct DSTRUCT* gnutls_anon_server_credentials; -typedef struct DSTRUCT* gnutls_anon_client_credentials; +typedef struct DSTRUCT* gnutls_anon_server_credentials_t; +typedef struct DSTRUCT* gnutls_anon_client_credentials_t; -void gnutls_anon_free_server_credentials( gnutls_anon_server_credentials sc); -int gnutls_anon_allocate_server_credentials( gnutls_anon_server_credentials *sc); +void gnutls_anon_free_server_credentials( gnutls_anon_server_credentials_t sc); +int gnutls_anon_allocate_server_credentials( gnutls_anon_server_credentials_t *sc); -void gnutls_anon_set_server_dh_params( gnutls_anon_server_credentials res, gnutls_dh_params dh_params); +void gnutls_anon_set_server_dh_params( gnutls_anon_server_credentials_t res, gnutls_dh_params_t dh_params); -void gnutls_anon_free_client_credentials( gnutls_anon_client_credentials sc); -int gnutls_anon_allocate_client_credentials( gnutls_anon_client_credentials *sc); +void gnutls_anon_free_client_credentials( gnutls_anon_client_credentials_t sc); +int gnutls_anon_allocate_client_credentials( gnutls_anon_client_credentials_t *sc); /* CERTFILE is an x509 certificate in PEM form. * KEYFILE is a pkcs-1 private key in PEM form (for RSA keys). */ -void gnutls_certificate_free_credentials( gnutls_certificate_credentials sc); -int gnutls_certificate_allocate_credentials( gnutls_certificate_credentials *sc); +void gnutls_certificate_free_credentials( gnutls_certificate_credentials_t sc); +int gnutls_certificate_allocate_credentials( gnutls_certificate_credentials_t *sc); -void gnutls_certificate_free_keys(gnutls_certificate_credentials sc); -void gnutls_certificate_free_cas(gnutls_certificate_credentials sc); -void gnutls_certificate_free_ca_names(gnutls_certificate_credentials sc); -void gnutls_certificate_free_crls(gnutls_certificate_credentials sc); +void gnutls_certificate_free_keys(gnutls_certificate_credentials_t sc); +void gnutls_certificate_free_cas(gnutls_certificate_credentials_t sc); +void gnutls_certificate_free_ca_names(gnutls_certificate_credentials_t sc); +void gnutls_certificate_free_crls(gnutls_certificate_credentials_t sc); -void gnutls_certificate_set_dh_params(gnutls_certificate_credentials res, gnutls_dh_params); -void gnutls_certificate_set_rsa_export_params(gnutls_certificate_credentials res, gnutls_rsa_params rsa_params); -void gnutls_certificate_set_verify_flags(gnutls_certificate_credentials res, unsigned int flags); +void gnutls_certificate_set_dh_params(gnutls_certificate_credentials_t res, gnutls_dh_params_t); +void gnutls_certificate_set_rsa_export_params(gnutls_certificate_credentials_t res, gnutls_rsa_params_t rsa_params); +void gnutls_certificate_set_verify_flags(gnutls_certificate_credentials_t res, unsigned int flags); -int gnutls_certificate_set_x509_trust_file( gnutls_certificate_credentials res, const char* CAFILE, - gnutls_x509_crt_fmt); -int gnutls_certificate_set_x509_trust_mem(gnutls_certificate_credentials res, - const gnutls_datum *CA, gnutls_x509_crt_fmt); +int gnutls_certificate_set_x509_trust_file( gnutls_certificate_credentials_t res, const char* CAFILE, + gnutls_x509_crt_fmt_t); +int gnutls_certificate_set_x509_trust_mem(gnutls_certificate_credentials_t res, + const gnutls_datum_t *CA, gnutls_x509_crt_fmt_t); -int gnutls_certificate_set_x509_crl_file(gnutls_certificate_credentials res, - const char *crlfile, gnutls_x509_crt_fmt type); -int gnutls_certificate_set_x509_crl_mem(gnutls_certificate_credentials res, - const gnutls_datum *CRL, gnutls_x509_crt_fmt type); +int gnutls_certificate_set_x509_crl_file(gnutls_certificate_credentials_t res, + const char *crlfile, gnutls_x509_crt_fmt_t type); +int gnutls_certificate_set_x509_crl_mem(gnutls_certificate_credentials_t res, + const gnutls_datum_t *CRL, gnutls_x509_crt_fmt_t type); -int gnutls_certificate_set_x509_key_file( gnutls_certificate_credentials res, - const char *CERTFILE, const char* KEYFILE, gnutls_x509_crt_fmt); -int gnutls_certificate_set_x509_key_mem(gnutls_certificate_credentials res, - const gnutls_datum* CERT, const gnutls_datum* KEY, - gnutls_x509_crt_fmt); +int gnutls_certificate_set_x509_key_file( gnutls_certificate_credentials_t res, + const char *CERTFILE, const char* KEYFILE, gnutls_x509_crt_fmt_t); +int gnutls_certificate_set_x509_key_mem(gnutls_certificate_credentials_t res, + const gnutls_datum_t* CERT, const gnutls_datum_t* KEY, + gnutls_x509_crt_fmt_t); /* New functions to allow setting already parsed X.509 stuff. */ struct gnutls_x509_privkey_int; -typedef struct gnutls_x509_privkey_int* gnutls_x509_privkey; +typedef struct gnutls_x509_privkey_int* gnutls_x509_privkey_t; struct gnutls_x509_crl_int; -typedef struct gnutls_x509_crl_int* gnutls_x509_crl; +typedef struct gnutls_x509_crl_int* gnutls_x509_crl_t; struct gnutls_x509_crt_int; -typedef struct gnutls_x509_crt_int* gnutls_x509_crt; +typedef struct gnutls_x509_crt_int* gnutls_x509_crt_t; -int gnutls_certificate_set_x509_key(gnutls_certificate_credentials res, - gnutls_x509_crt *cert_list, int cert_list_size, - gnutls_x509_privkey key); -int gnutls_certificate_set_x509_trust(gnutls_certificate_credentials res, - gnutls_x509_crt * ca_list, int ca_list_size); -int gnutls_certificate_set_x509_crl(gnutls_certificate_credentials res, - gnutls_x509_crl* crl_list, int crl_list_size); +int gnutls_certificate_set_x509_key(gnutls_certificate_credentials_t res, + gnutls_x509_crt_t *cert_list, int cert_list_size, + gnutls_x509_privkey_t key); +int gnutls_certificate_set_x509_trust(gnutls_certificate_credentials_t res, + gnutls_x509_crt_t * ca_list, int ca_list_size); +int gnutls_certificate_set_x509_crl(gnutls_certificate_credentials_t res, + gnutls_x509_crl_t* crl_list, int crl_list_size); /* global state functions @@ -429,69 +431,69 @@ void gnutls_global_set_log_level( int level); /* Diffie Hellman parameter handling. */ -int gnutls_dh_params_init( gnutls_dh_params*); -void gnutls_dh_params_deinit( gnutls_dh_params); -int gnutls_dh_params_import_raw(gnutls_dh_params dh_params, const gnutls_datum *prime, - const gnutls_datum* generator); -int gnutls_dh_params_import_pkcs3(gnutls_dh_params params, - const gnutls_datum * pkcs3_params, gnutls_x509_crt_fmt format); -int gnutls_dh_params_generate2(gnutls_dh_params params, int bits); -int gnutls_dh_params_export_pkcs3( gnutls_dh_params params, - gnutls_x509_crt_fmt format, unsigned char* params_data, size_t* params_data_size); -int gnutls_dh_params_export_raw(gnutls_dh_params params, - gnutls_datum * prime, gnutls_datum * generator, unsigned int *bits); -int gnutls_dh_params_cpy(gnutls_dh_params dst, gnutls_dh_params src); +int gnutls_dh_params_init( gnutls_dh_params_t*); +void gnutls_dh_params_deinit( gnutls_dh_params_t); +int gnutls_dh_params_import_raw(gnutls_dh_params_t dh_params, const gnutls_datum_t *prime, + const gnutls_datum_t* generator); +int gnutls_dh_params_import_pkcs3(gnutls_dh_params_t params, + const gnutls_datum_t * pkcs3_params, gnutls_x509_crt_fmt_t format); +int gnutls_dh_params_generate2(gnutls_dh_params_t params, int bits); +int gnutls_dh_params_export_pkcs3( gnutls_dh_params_t params, + gnutls_x509_crt_fmt_t format, unsigned char* params_data, size_t* params_data_size); +int gnutls_dh_params_export_raw(gnutls_dh_params_t params, + gnutls_datum_t * prime, gnutls_datum_t * generator, unsigned int *bits); +int gnutls_dh_params_cpy(gnutls_dh_params_t dst, gnutls_dh_params_t src); /* RSA params */ -int gnutls_rsa_params_init(gnutls_rsa_params * rsa_params); -void gnutls_rsa_params_deinit(gnutls_rsa_params rsa_params); -int gnutls_rsa_params_cpy(gnutls_rsa_params dst, gnutls_rsa_params src); -int gnutls_rsa_params_import_raw(gnutls_rsa_params rsa_params, - const gnutls_datum *m, const gnutls_datum *e, - const gnutls_datum *d, const gnutls_datum *p, - const gnutls_datum *q, const gnutls_datum *u); -int gnutls_rsa_params_generate2(gnutls_rsa_params params, int bits); -int gnutls_rsa_params_export_raw(gnutls_rsa_params params, - gnutls_datum * m, gnutls_datum *e, - gnutls_datum *d, gnutls_datum *p, gnutls_datum* q, - gnutls_datum* u, unsigned int *bits); -int gnutls_rsa_params_export_pkcs1( gnutls_rsa_params params, - gnutls_x509_crt_fmt format, unsigned char* params_data, +int gnutls_rsa_params_init(gnutls_rsa_params_t * rsa_params); +void gnutls_rsa_params_deinit(gnutls_rsa_params_t rsa_params); +int gnutls_rsa_params_cpy(gnutls_rsa_params_t dst, gnutls_rsa_params_t src); +int gnutls_rsa_params_import_raw(gnutls_rsa_params_t rsa_params, + const gnutls_datum_t *m, const gnutls_datum_t *e, + const gnutls_datum_t *d, const gnutls_datum_t *p, + const gnutls_datum_t *q, const gnutls_datum_t *u); +int gnutls_rsa_params_generate2(gnutls_rsa_params_t params, int bits); +int gnutls_rsa_params_export_raw(gnutls_rsa_params_t params, + gnutls_datum_t * m, gnutls_datum_t *e, + gnutls_datum_t *d, gnutls_datum_t *p, gnutls_datum_t* q, + gnutls_datum_t* u, unsigned int *bits); +int gnutls_rsa_params_export_pkcs1( gnutls_rsa_params_t params, + gnutls_x509_crt_fmt_t format, unsigned char* params_data, size_t* params_data_size); -int gnutls_rsa_params_import_pkcs1(gnutls_rsa_params params, - const gnutls_datum * pkcs1_params, gnutls_x509_crt_fmt format); +int gnutls_rsa_params_import_pkcs1(gnutls_rsa_params_t params, + const gnutls_datum_t * pkcs1_params, gnutls_x509_crt_fmt_t format); /* Session stuff */ -typedef ssize_t (*gnutls_pull_func)(gnutls_transport_ptr, void*, size_t); -typedef ssize_t (*gnutls_push_func)(gnutls_transport_ptr, const void*, size_t); -void gnutls_transport_set_ptr(gnutls_session session, gnutls_transport_ptr ptr); -void gnutls_transport_set_ptr2(gnutls_session session, gnutls_transport_ptr recv_ptr, - gnutls_transport_ptr send_ptr); +typedef ssize_t (*gnutls_pull_func)(gnutls_transport_ptr_t, void*, size_t); +typedef ssize_t (*gnutls_push_func)(gnutls_transport_ptr_t, const void*, size_t); +void gnutls_transport_set_ptr(gnutls_session_t session, gnutls_transport_ptr_t ptr); +void gnutls_transport_set_ptr2(gnutls_session_t session, gnutls_transport_ptr_t recv_ptr, + gnutls_transport_ptr_t send_ptr); -gnutls_transport_ptr gnutls_transport_get_ptr(gnutls_session session); -void gnutls_transport_get_ptr2(gnutls_session session, - gnutls_transport_ptr *recv_ptr, - gnutls_transport_ptr *send_ptr); +gnutls_transport_ptr_t gnutls_transport_get_ptr(gnutls_session_t session); +void gnutls_transport_get_ptr2(gnutls_session_t session, + gnutls_transport_ptr_t *recv_ptr, + gnutls_transport_ptr_t *send_ptr); -void gnutls_transport_set_lowat( gnutls_session session, int num); +void gnutls_transport_set_lowat( gnutls_session_t session, int num); -void gnutls_transport_set_push_function( gnutls_session, gnutls_push_func push_func); -void gnutls_transport_set_pull_function( gnutls_session, gnutls_pull_func pull_func); +void gnutls_transport_set_push_function( gnutls_session_t, gnutls_push_func push_func); +void gnutls_transport_set_pull_function( gnutls_session_t, gnutls_pull_func pull_func); /* session specific */ -void gnutls_session_set_ptr(gnutls_session session, void* ptr); -void* gnutls_session_get_ptr(gnutls_session session); +void gnutls_session_set_ptr(gnutls_session_t session, void* ptr); +void* gnutls_session_get_ptr(gnutls_session_t session); -void gnutls_openpgp_send_key(gnutls_session session, gnutls_openpgp_key_status status); +void gnutls_openpgp_send_key(gnutls_session_t session, gnutls_openpgp_key_status_t status); /* fingerprint * Actually this function returns the hash of the given data. */ -int gnutls_fingerprint(gnutls_digest_algorithm algo, const gnutls_datum* data, +int gnutls_fingerprint(gnutls_digest_algorithm_t algo, const gnutls_datum_t* data, void* result, size_t* result_size); |