ABI
Tracker

(GnuTLS)

Headers diff: 3.0.8 vs 3.0.9

	gnutls.h (3.0.8)	gnutls.h (3.0.9)

	skipping to change at line 52	skipping to change at line 52
	#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.8"	#define GNUTLS_VERSION "3.0.9"

	#define GNUTLS_VERSION_MAJOR 3	#define GNUTLS_VERSION_MAJOR 3
	#define GNUTLS_VERSION_MINOR 0	#define GNUTLS_VERSION_MINOR 0

	#define GNUTLS_VERSION_PATCH 8	#define GNUTLS_VERSION_PATCH 9


	#define GNUTLS_VERSION_NUMBER 0x030008	#define GNUTLS_VERSION_NUMBER 0x030009

	#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 635	skipping to change at line 635
	GNUTLS_SIGN_ECDSA_SHA1 = 12,	GNUTLS_SIGN_ECDSA_SHA1 = 12,
	GNUTLS_SIGN_ECDSA_SHA224 = 13,	GNUTLS_SIGN_ECDSA_SHA224 = 13,
	GNUTLS_SIGN_ECDSA_SHA256 = 14,	GNUTLS_SIGN_ECDSA_SHA256 = 14,
	GNUTLS_SIGN_ECDSA_SHA384 = 15,	GNUTLS_SIGN_ECDSA_SHA384 = 15,
	GNUTLS_SIGN_ECDSA_SHA512 = 16,	GNUTLS_SIGN_ECDSA_SHA512 = 16,
	} gnutls_sign_algorithm_t;	} gnutls_sign_algorithm_t;

	/**	/**
	* gnutls_ecc_curve_t:	* gnutls_ecc_curve_t:
	* @GNUTLS_ECC_CURVE_INVALID: Cannot be known	* @GNUTLS_ECC_CURVE_INVALID: Cannot be known

		* @GNUTLS_ECC_CURVE_SECP192R1: the SECP192R1 curve
	* @GNUTLS_ECC_CURVE_SECP224R1: the SECP224R1 curve	* @GNUTLS_ECC_CURVE_SECP224R1: the SECP224R1 curve
	* @GNUTLS_ECC_CURVE_SECP256R1: the SECP256R1 curve	* @GNUTLS_ECC_CURVE_SECP256R1: the SECP256R1 curve
	* @GNUTLS_ECC_CURVE_SECP384R1: the SECP384R1 curve	* @GNUTLS_ECC_CURVE_SECP384R1: the SECP384R1 curve
	* @GNUTLS_ECC_CURVE_SECP521R1: the SECP521R1 curve	* @GNUTLS_ECC_CURVE_SECP521R1: the SECP521R1 curve
	*	*
	* Enumeration of ECC curves.	* Enumeration of ECC curves.
	*/	*/
	typedef enum	typedef enum
	{	{
	GNUTLS_ECC_CURVE_INVALID=0,	GNUTLS_ECC_CURVE_INVALID=0,
	GNUTLS_ECC_CURVE_SECP224R1,	GNUTLS_ECC_CURVE_SECP224R1,
	GNUTLS_ECC_CURVE_SECP256R1,	GNUTLS_ECC_CURVE_SECP256R1,
	GNUTLS_ECC_CURVE_SECP384R1,	GNUTLS_ECC_CURVE_SECP384R1,
	GNUTLS_ECC_CURVE_SECP521R1,	GNUTLS_ECC_CURVE_SECP521R1,

		GNUTLS_ECC_CURVE_SECP192R1,
	} gnutls_ecc_curve_t;	} gnutls_ecc_curve_t;

	/**	/**
	* gnutls_sec_param_t:	* gnutls_sec_param_t:
	* @GNUTLS_SEC_PARAM_UNKNOWN: Cannot be known	* @GNUTLS_SEC_PARAM_UNKNOWN: Cannot be known
	* @GNUTLS_SEC_PARAM_WEAK: 50 or less bits of security	* @GNUTLS_SEC_PARAM_WEAK: 50 or less bits of security
	* @GNUTLS_SEC_PARAM_LOW: 80 bits of security	* @GNUTLS_SEC_PARAM_LOW: 80 bits of security
	* @GNUTLS_SEC_PARAM_NORMAL: 112 bits of security	* @GNUTLS_SEC_PARAM_NORMAL: 112 bits of security
	* @GNUTLS_SEC_PARAM_HIGH: 128 bits of security	* @GNUTLS_SEC_PARAM_HIGH: 128 bits of security
	* @GNUTLS_SEC_PARAM_ULTRA: 192 bits of security	* @GNUTLS_SEC_PARAM_ULTRA: 192 bits of security

	skipping to change at line 802	skipping to change at line 804
	/* list supported algorithms */	/* list supported algorithms */
	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_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);
	const gnutls_pk_algorithm_t *gnutls_pk_list (void);	const gnutls_pk_algorithm_t *gnutls_pk_list (void);
	const gnutls_sign_algorithm_t *gnutls_sign_list (void);	const gnutls_sign_algorithm_t *gnutls_sign_list (void);
	const char *gnutls_cipher_suite_info (size_t idx,	const char *gnutls_cipher_suite_info (size_t idx,

	char *cs_id,	unsigned char *cs_id,
	gnutls_kx_algorithm_t * kx,	gnutls_kx_algorithm_t * kx,
	gnutls_cipher_algorithm_t * cipher,	gnutls_cipher_algorithm_t * cipher,
	gnutls_mac_algorithm_t * mac,	gnutls_mac_algorithm_t * mac,
	gnutls_protocol_t * min_version);	gnutls_protocol_t * min_version);

	/* error functions */	/* error functions */
	int gnutls_error_is_fatal (int error);	int gnutls_error_is_fatal (int error);
	int gnutls_error_to_alert (int err, int *level);	int gnutls_error_to_alert (int err, int *level);

	void gnutls_perror (int error);	void gnutls_perror (int error);

	skipping to change at line 908	skipping to change at line 910
	int gnutls_session_ticket_enable_server (gnutls_session_t session,	int gnutls_session_ticket_enable_server (gnutls_session_t session,
	const gnutls_datum_t * key);	const gnutls_datum_t * key);

	int gnutls_key_generate (gnutls_datum_t * key, unsigned int key_size);	int gnutls_key_generate (gnutls_datum_t * key, unsigned int key_size);

	/* if you just want some defaults, use the following.	/* if you just want some defaults, use the following.
	*/	*/
	int gnutls_priority_init (gnutls_priority_t * priority_cache,	int gnutls_priority_init (gnutls_priority_t * priority_cache,
	const char priorities, const char *err_pos);	const char priorities, const char *err_pos);
	void gnutls_priority_deinit (gnutls_priority_t priority_cache);	void gnutls_priority_deinit (gnutls_priority_t priority_cache);

		int gnutls_priority_get_cipher_suite_index (gnutls_priority_t pcache, uns igned int idx, unsigned int *sidx);

	int gnutls_priority_set (gnutls_session_t session,	int gnutls_priority_set (gnutls_session_t session,
	gnutls_priority_t priority);	gnutls_priority_t priority);
	int gnutls_priority_set_direct (gnutls_session_t session,	int gnutls_priority_set_direct (gnutls_session_t session,
	const char *priorities,	const char *priorities,
	const char **err_pos);	const char **err_pos);

	/* for compatibility	/* for compatibility
	*/	*/
	int gnutls_set_default_priority (gnutls_session_t session);	int gnutls_set_default_priority (gnutls_session_t session);

	skipping to change at line 1333	skipping to change at line 1336

	typedef int gnutls_srp_server_credentials_function (gnutls_session_t,	typedef int gnutls_srp_server_credentials_function (gnutls_session_t,
	const char *username,	const char *username,
	gnutls_datum_t * salt ,	gnutls_datum_t * salt ,
	gnutls_datum_t *	gnutls_datum_t *
	verifier,	verifier,
	gnutls_datum_t *	gnutls_datum_t *
	generator,	generator,
	gnutls_datum_t * prim e);	gnutls_datum_t * prim e);
	void	void

	gnutls_srp_set_server_credentials_function	gnutls_srp_set_server_credentials_function (
	(gnutls_srp_server_credentials_t cred,	gnutls_srp_server_credentials_t cred,
	gnutls_srp_server_credentials_function * func);	gnutls_srp_server_credentials_function * func);

	typedef int gnutls_srp_client_credentials_function (gnutls_session_t,	typedef int gnutls_srp_client_credentials_function (gnutls_session_t,
	char , char );	char , char );
	void	void

	gnutls_srp_set_client_credentials_function	gnutls_srp_set_client_credentials_function (
	(gnutls_srp_client_credentials_t cred,	gnutls_srp_client_credentials_t cred,
	gnutls_srp_client_credentials_function * func);	gnutls_srp_client_credentials_function * func);

	int gnutls_srp_base64_encode (const gnutls_datum_t * data, char *result,	int gnutls_srp_base64_encode (const gnutls_datum_t * data, char *result,
	size_t * result_size);	size_t * result_size);
	int gnutls_srp_base64_encode_alloc (const gnutls_datum_t * data,	int gnutls_srp_base64_encode_alloc (const gnutls_datum_t * data,
	gnutls_datum_t * result);	gnutls_datum_t * result);

	int gnutls_srp_base64_decode (const gnutls_datum_t * b64_data, char *resu lt,	int gnutls_srp_base64_decode (const gnutls_datum_t * b64_data, char *resu lt,
	size_t * result_size);	size_t * result_size);
	int gnutls_srp_base64_decode_alloc (const gnutls_datum_t * b64_data,	int gnutls_srp_base64_decode_alloc (const gnutls_datum_t * b64_data,

	skipping to change at line 1402	skipping to change at line 1405
	gnutls_psk_set_server_credentials_hint (gnutls_psk_server_credentials_t	gnutls_psk_set_server_credentials_hint (gnutls_psk_server_credentials_t
	res, const char *hint);	res, const char *hint);

	const char *gnutls_psk_server_get_username (gnutls_session_t session);	const char *gnutls_psk_server_get_username (gnutls_session_t session);
	const char *gnutls_psk_client_get_hint (gnutls_session_t session);	const char *gnutls_psk_client_get_hint (gnutls_session_t session);

	typedef int gnutls_psk_server_credentials_function (gnutls_session_t,	typedef int gnutls_psk_server_credentials_function (gnutls_session_t,
	const char *username,	const char *username,
	gnutls_datum_t * key) ;	gnutls_datum_t * key) ;
	void	void

	gnutls_psk_set_server_credentials_function	gnutls_psk_set_server_credentials_function (
	(gnutls_psk_server_credentials_t cred,	gnutls_psk_server_credentials_t cred,
	gnutls_psk_server_credentials_function * func);	gnutls_psk_server_credentials_function * func);

	typedef int gnutls_psk_client_credentials_function (gnutls_session_t,	typedef int gnutls_psk_client_credentials_function (gnutls_session_t,
	char **username,	char **username,
	gnutls_datum_t * key) ;	gnutls_datum_t * key) ;
	void	void

	gnutls_psk_set_client_credentials_function	gnutls_psk_set_client_credentials_function (
	(gnutls_psk_client_credentials_t cred,	gnutls_psk_client_credentials_t cred,
	gnutls_psk_client_credentials_function * func);	gnutls_psk_client_credentials_function * func);

	int gnutls_hex_encode (const gnutls_datum_t * data, char *result,	int gnutls_hex_encode (const gnutls_datum_t * data, char *result,
	size_t * result_size);	size_t * result_size);
	int gnutls_hex_decode (const gnutls_datum_t * hex_data, char *result,	int gnutls_hex_decode (const gnutls_datum_t * hex_data, char *result,
	size_t * result_size);	size_t * result_size);

	void	void
	gnutls_psk_set_server_dh_params (gnutls_psk_server_credentials_t res,	gnutls_psk_set_server_dh_params (gnutls_psk_server_credentials_t res,
	gnutls_dh_params_t dh_params);	gnutls_dh_params_t dh_params);

	skipping to change at line 1437	skipping to change at line 1440

	/**	/**
	* gnutls_x509_subject_alt_name_t:	* gnutls_x509_subject_alt_name_t:
	* @GNUTLS_SAN_DNSNAME: DNS-name SAN.	* @GNUTLS_SAN_DNSNAME: DNS-name SAN.
	* @GNUTLS_SAN_RFC822NAME: E-mail address SAN.	* @GNUTLS_SAN_RFC822NAME: E-mail address SAN.
	* @GNUTLS_SAN_URI: URI SAN.	* @GNUTLS_SAN_URI: URI SAN.
	* @GNUTLS_SAN_IPADDRESS: IP address SAN.	* @GNUTLS_SAN_IPADDRESS: IP address SAN.
	* @GNUTLS_SAN_OTHERNAME: OtherName SAN.	* @GNUTLS_SAN_OTHERNAME: OtherName SAN.
	* @GNUTLS_SAN_DN: DN SAN.	* @GNUTLS_SAN_DN: DN SAN.
	* @GNUTLS_SAN_OTHERNAME_XMPP: Virtual SAN, used by	* @GNUTLS_SAN_OTHERNAME_XMPP: Virtual SAN, used by

	* gnutls_x509_crt_get_subject_alt_othername_oid().	* gnutls_x509_crt_get_subject_alt_othername_oid.
	*	*
	* Enumeration of different subject alternative names types.	* Enumeration of different subject alternative names types.
	*/	*/
	typedef enum gnutls_x509_subject_alt_name_t	typedef enum gnutls_x509_subject_alt_name_t
	{	{
	GNUTLS_SAN_DNSNAME = 1,	GNUTLS_SAN_DNSNAME = 1,
	GNUTLS_SAN_RFC822NAME = 2,	GNUTLS_SAN_RFC822NAME = 2,
	GNUTLS_SAN_URI = 3,	GNUTLS_SAN_URI = 3,
	GNUTLS_SAN_IPADDRESS = 4,	GNUTLS_SAN_IPADDRESS = 4,
	GNUTLS_SAN_OTHERNAME = 5,	GNUTLS_SAN_OTHERNAME = 5,
	GNUTLS_SAN_DN = 6,	GNUTLS_SAN_DN = 6,
	/* The following are "virtual" subject alternative name types, in	/* The following are "virtual" subject alternative name types, in
	that they are represented by an otherName value and an OID.	that they are represented by an otherName value and an OID.

	Used by gnutls_x509_crt_get_subject_alt_othername_oid(). */	Used by gnutls_x509_crt_get_subject_alt_othername_oid. */
	GNUTLS_SAN_OTHERNAME_XMPP = 1000	GNUTLS_SAN_OTHERNAME_XMPP = 1000
	} gnutls_x509_subject_alt_name_t;	} gnutls_x509_subject_alt_name_t;

	struct gnutls_openpgp_crt_int;	struct gnutls_openpgp_crt_int;
	typedef struct gnutls_openpgp_crt_int *gnutls_openpgp_crt_t;	typedef struct gnutls_openpgp_crt_int *gnutls_openpgp_crt_t;

	struct gnutls_openpgp_privkey_int;	struct gnutls_openpgp_privkey_int;
	typedef struct gnutls_openpgp_privkey_int *gnutls_openpgp_privkey_t;	typedef struct gnutls_openpgp_privkey_int *gnutls_openpgp_privkey_t;

	struct gnutls_pkcs11_privkey_st;	struct gnutls_pkcs11_privkey_st;

	skipping to change at line 1545	skipping to change at line 1548
	gnutls_datum_t *	gnutls_datum_t *
	req_ca_rdn,	req_ca_rdn,
	int nreqs,	int nreqs,
	const	const
	gnutls_pk_algorithm_t	gnutls_pk_algorithm_t
	* pk_algos,	* pk_algos,
	int	int
	pk_algos_length,	pk_algos_length,
	gnutls_retr2_st *);	gnutls_retr2_st *);


	void gnutls_certificate_set_retrieve_function	void gnutls_certificate_set_retrieve_function (
	(gnutls_certificate_credentials_t cred,	gnutls_certificate_credentials_t cred,
	gnutls_certificate_retrieve_function * func);	gnutls_certificate_retrieve_function * func);

	typedef int gnutls_certificate_verify_function (gnutls_session_t);	typedef int gnutls_certificate_verify_function (gnutls_session_t);
	void	void
	gnutls_certificate_set_verify_function (gnutls_certificate_credentials_ t	gnutls_certificate_set_verify_function (gnutls_certificate_credentials_ t
	cred,	cred,
	gnutls_certificate_verify_funct ion	gnutls_certificate_verify_funct ion
	* func);	* func);

	void	void

End of changes. 14 change blocks.
	16 lines changed or deleted	19 lines changed or added

	openpgp.h (3.0.8)	openpgp.h (3.0.9)

	skipping to change at line 343	skipping to change at line 343
	const char *subkey_id,	const char *subkey_id,
	gnutls_openpgp_crt_fmt_t	gnutls_openpgp_crt_fmt_t
	format);	format);
	int	int
	gnutls_certificate_set_openpgp_key_mem2 (gnutls_certificate_credentials _t	gnutls_certificate_set_openpgp_key_mem2 (gnutls_certificate_credentials _t
	res, const gnutls_datum_t * ce rt,	res, const gnutls_datum_t * ce rt,
	const gnutls_datum_t * key,	const gnutls_datum_t * key,
	const char *subkey_id,	const char *subkey_id,
	gnutls_openpgp_crt_fmt_t forma t);	gnutls_openpgp_crt_fmt_t forma t);


	int gnutls_certificate_set_openpgp_keyring_mem	int gnutls_certificate_set_openpgp_keyring_mem (
	(gnutls_certificate_credentials_t c, const unsigned char *data,	gnutls_certificate_credentials_t c, const unsigned char *data,
	size_t dlen, gnutls_openpgp_crt_fmt_t format);	size_t dlen, gnutls_openpgp_crt_fmt_t format);


	int gnutls_certificate_set_openpgp_keyring_file	int gnutls_certificate_set_openpgp_keyring_file (
	(gnutls_certificate_credentials_t c, const char *file,	gnutls_certificate_credentials_t c, const char *file,
	gnutls_openpgp_crt_fmt_t format);	gnutls_openpgp_crt_fmt_t format);

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif	#endif

	#endif /* GNUTLS_OPENPGP_H */	#endif /* GNUTLS_OPENPGP_H */

End of changes. 2 change blocks.
	4 lines changed or deleted	4 lines changed or added

This html diff was produced by rfcdiff 1.41.The latest version is available from http://tools.ietf.org/tools/rfcdiff/

ABITracker

(GnuTLS)

Headers diff: 3.0.8 vs 3.0.9

ABI
Tracker