ABI
Tracker

(GnuTLS)



Headers diff: 3.0.3 vs 3.0.4



 abstract.h (3.0.3)   abstract.h (3.0.4) 
skipping to change at line 40 skipping to change at line 40
#include <gnutls/openpgp.h> #include <gnutls/openpgp.h>
/* Public key operations */ /* Public key operations */
struct gnutls_pubkey_st; struct gnutls_pubkey_st;
typedef struct gnutls_pubkey_st *gnutls_pubkey_t; typedef struct gnutls_pubkey_st *gnutls_pubkey_t;
struct gnutls_privkey_st; struct gnutls_privkey_st;
typedef struct gnutls_privkey_st *gnutls_privkey_t; typedef struct gnutls_privkey_st *gnutls_privkey_t;
typedef int (*gnutls_privkey_sign_func) (gnutls_privkey_t key,
void *userdata,
const gnutls_datum_t * raw_data,
gnutls_datum_t * signature);
typedef int (*gnutls_privkey_decrypt_func) (gnutls_privkey_t key,
void *userdata,
const gnutls_datum_t * cipherte
xt,
gnutls_datum_t * plaintext);
int gnutls_pubkey_init (gnutls_pubkey_t * key); int gnutls_pubkey_init (gnutls_pubkey_t * key);
void gnutls_pubkey_deinit (gnutls_pubkey_t key); void gnutls_pubkey_deinit (gnutls_pubkey_t key);
int gnutls_pubkey_get_pk_algorithm (gnutls_pubkey_t key, unsigned int *bits ); int gnutls_pubkey_get_pk_algorithm (gnutls_pubkey_t key, unsigned int *bits );
int gnutls_pubkey_import_x509 (gnutls_pubkey_t key, gnutls_x509_crt_t crt, int gnutls_pubkey_import_x509 (gnutls_pubkey_t key, gnutls_x509_crt_t crt,
unsigned int flags); unsigned int flags);
int gnutls_pubkey_import_pkcs11 (gnutls_pubkey_t key, int gnutls_pubkey_import_pkcs11 (gnutls_pubkey_t key,
gnutls_pkcs11_obj_t obj, unsigned int flag s); gnutls_pkcs11_obj_t obj, unsigned int flag s);
int gnutls_pubkey_import_openpgp (gnutls_pubkey_t key, int gnutls_pubkey_import_openpgp (gnutls_pubkey_t key,
gnutls_openpgp_crt_t crt, gnutls_openpgp_crt_t crt,
skipping to change at line 157 skipping to change at line 166
#define GNUTLS_PRIVKEY_IMPORT_COPY (1<<1) #define GNUTLS_PRIVKEY_IMPORT_COPY (1<<1)
int gnutls_privkey_import_pkcs11 (gnutls_privkey_t pkey, int gnutls_privkey_import_pkcs11 (gnutls_privkey_t pkey,
gnutls_pkcs11_privkey_t key, gnutls_pkcs11_privkey_t key,
unsigned int flags); unsigned int flags);
int gnutls_privkey_import_x509 (gnutls_privkey_t pkey, int gnutls_privkey_import_x509 (gnutls_privkey_t pkey,
gnutls_x509_privkey_t key, gnutls_x509_privkey_t key,
unsigned int flags); unsigned int flags);
int gnutls_privkey_import_openpgp (gnutls_privkey_t pkey, int gnutls_privkey_import_openpgp (gnutls_privkey_t pkey,
gnutls_openpgp_privkey_t key, gnutls_openpgp_privkey_t key,
unsigned int flags); unsigned int flags);
int
gnutls_privkey_import_ext (gnutls_privkey_t pkey,
gnutls_pk_algorithm_t pk,
void* userdata,
gnutls_privkey_sign_func sign_func,
gnutls_privkey_decrypt_func decrypt_func,
unsigned int flags);
int gnutls_privkey_sign_data (gnutls_privkey_t signer, int gnutls_privkey_sign_data (gnutls_privkey_t signer,
gnutls_digest_algorithm_t hash, gnutls_digest_algorithm_t hash,
unsigned int flags, unsigned int flags,
const gnutls_datum_t * data, const gnutls_datum_t * data,
gnutls_datum_t * signature); gnutls_datum_t * signature);
int gnutls_privkey_sign_hash (gnutls_privkey_t signer, int gnutls_privkey_sign_hash (gnutls_privkey_t signer,
gnutls_digest_algorithm_t hash_algo, gnutls_digest_algorithm_t hash_algo,
unsigned int flags, unsigned int flags,
skipping to change at line 251 skipping to change at line 267
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 pk_algos_length, int pk_algos_length,
gnutls_pcert_st **, gnutls_pcert_st **,
unsigned int *pcert_len gth, unsigned int *pcert_len gth,
gnutls_privkey_t *privk ey); gnutls_privkey_t *privk ey);
void gnutls_certificate_set_retrieve_function2 void gnutls_certificate_set_retrieve_function2
(gnutls_certificate_credentials_t cred, (gnutls_certificate_credentials_t cred,
gnutls_certificate_retrieve_function2 * func); gnutls_certificate_retrieve_function2 * func);
int
gnutls_certificate_set_key (gnutls_certificate_credentials_t res,
const char** names,
int names_size,
gnutls_pcert_st * pcert_list,
int pcert_list_size,
gnutls_privkey_t key);
#endif #endif
 End of changes. 3 change blocks. 
3 lines changed or deleted 28 lines changed or added


 compat.h (3.0.3)   compat.h (3.0.4) 
skipping to change at line 195 skipping to change at line 195
(gnutls_certificate_credentials_t cred, (gnutls_certificate_credentials_t cred,
gnutls_certificate_client_retrieve_function * gnutls_certificate_client_retrieve_function *
func) _GNUTLS_GCC_ATTR_DEPRECATED; func) _GNUTLS_GCC_ATTR_DEPRECATED;
void void
gnutls_certificate_server_set_retrieve_function gnutls_certificate_server_set_retrieve_function
(gnutls_certificate_credentials_t cred, (gnutls_certificate_credentials_t cred,
gnutls_certificate_server_retrieve_function * gnutls_certificate_server_retrieve_function *
func) _GNUTLS_GCC_ATTR_DEPRECATED; func) _GNUTLS_GCC_ATTR_DEPRECATED;
/* External signing callback. No longer supported because it /* External signing callback. No longer supported because it
* was deprecated by the PKCS #11 API. */ * was deprecated by the PKCS #11 API and gnutls_privkey_t. */
typedef int (*gnutls_sign_func) (gnutls_session_t session, typedef int (*gnutls_sign_func) (gnutls_session_t session,
void *userdata, void *userdata,
gnutls_certificate_type_t cert_type, gnutls_certificate_type_t cert_type,
const gnutls_datum_t * cert, const gnutls_datum_t * cert,
const gnutls_datum_t * hash, const gnutls_datum_t * hash,
gnutls_datum_t * signature); gnutls_datum_t * signature);
void void
gnutls_sign_callback_set (gnutls_session_t session, gnutls_sign_callback_set (gnutls_session_t session,
gnutls_sign_func sign_func, void *userdata) gnutls_sign_func sign_func, void *userdata)
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 gnutls.h (3.0.3)   gnutls.h (3.0.4) 
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.3" #define GNUTLS_VERSION "3.0.4"
#define GNUTLS_VERSION_MAJOR 3 #define GNUTLS_VERSION_MAJOR 3
#define GNUTLS_VERSION_MINOR 0 #define GNUTLS_VERSION_MINOR 0
#define GNUTLS_VERSION_PATCH 3 #define GNUTLS_VERSION_PATCH 4
#define GNUTLS_VERSION_NUMBER 0x030003 #define GNUTLS_VERSION_NUMBER 0x030004
#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 1463 skipping to change at line 1463
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;
typedef struct gnutls_pkcs11_privkey_st *gnutls_pkcs11_privkey_t; typedef struct gnutls_pkcs11_privkey_st *gnutls_pkcs11_privkey_t;
/** /**
* gnutls_privkey_type_t: * gnutls_privkey_type_t:
* @GNUTLS_PRIVKEY_X509: X.509 private key, #gnutls_x509_privkey_t. * @GNUTLS_PRIVKEY_X509: X.509 private key, #gnutls_x509_privkey_t.
* @GNUTLS_PRIVKEY_OPENPGP: OpenPGP private key, #gnutls_openpgp_privkey_t. * @GNUTLS_PRIVKEY_OPENPGP: OpenPGP private key, #gnutls_openpgp_privkey_t.
* @GNUTLS_PRIVKEY_PKCS11: PKCS11 private key, #gnutls_pkcs11_privkey_t. * @GNUTLS_PRIVKEY_PKCS11: PKCS11 private key, #gnutls_pkcs11_privkey_t.
* @GNUTLS_PRIVKEY_EXT: External private key, operating using callbacks.
* *
* Enumeration of different private key types. * Enumeration of different private key types.
*/ */
typedef enum typedef enum
{ {
GNUTLS_PRIVKEY_X509, GNUTLS_PRIVKEY_X509,
GNUTLS_PRIVKEY_OPENPGP, GNUTLS_PRIVKEY_OPENPGP,
GNUTLS_PRIVKEY_PKCS11 GNUTLS_PRIVKEY_PKCS11,
GNUTLS_PRIVKEY_EXT
} gnutls_privkey_type_t; } gnutls_privkey_type_t;
typedef struct gnutls_retr2_st typedef struct gnutls_retr2_st
{ {
gnutls_certificate_type_t cert_type; gnutls_certificate_type_t cert_type;
gnutls_privkey_type_t key_type; gnutls_privkey_type_t key_type;
union union
{ {
gnutls_x509_crt_t *x509; gnutls_x509_crt_t *x509;
 End of changes. 5 change blocks. 
4 lines changed or deleted 6 lines changed or added


 x509.h (3.0.3)   x509.h (3.0.4) 
skipping to change at line 81 skipping to change at line 81
*/ */
#define GNUTLS_KP_TLS_WWW_SERVER "1.3.6.1.5.5.7.3.1" #define GNUTLS_KP_TLS_WWW_SERVER "1.3.6.1.5.5.7.3.1"
#define GNUTLS_KP_TLS_WWW_CLIENT "1.3.6.1.5.5.7.3.2" #define GNUTLS_KP_TLS_WWW_CLIENT "1.3.6.1.5.5.7.3.2"
#define GNUTLS_KP_CODE_SIGNING "1.3.6.1.5.5.7.3.3" #define GNUTLS_KP_CODE_SIGNING "1.3.6.1.5.5.7.3.3"
#define GNUTLS_KP_EMAIL_PROTECTION "1.3.6.1.5.5.7.3.4" #define GNUTLS_KP_EMAIL_PROTECTION "1.3.6.1.5.5.7.3.4"
#define GNUTLS_KP_TIME_STAMPING "1.3.6.1.5.5.7.3.8" #define GNUTLS_KP_TIME_STAMPING "1.3.6.1.5.5.7.3.8"
#define GNUTLS_KP_OCSP_SIGNING "1.3.6.1.5.5.7.3.9" #define GNUTLS_KP_OCSP_SIGNING "1.3.6.1.5.5.7.3.9"
#define GNUTLS_KP_IPSEC_IKE "1.3.6.1.5.5.7.3.17" #define GNUTLS_KP_IPSEC_IKE "1.3.6.1.5.5.7.3.17"
#define GNUTLS_KP_ANY "2.5.29.37.0" #define GNUTLS_KP_ANY "2.5.29.37.0"
#define GNUTLS_OID_AIA "1.3.6.1.5.5.7.1.1"
#define GNUTLS_OID_AD_OCSP "1.3.6.1.5.5.7.48.1"
#define GNUTLS_OID_AD_CAISSUERS "1.3.6.1.5.5.7.48.2"
#define GNUTLS_FSAN_SET 0 #define GNUTLS_FSAN_SET 0
#define GNUTLS_FSAN_APPEND 1 #define GNUTLS_FSAN_APPEND 1
/* Certificate handling functions. /* Certificate handling functions.
*/ */
/** /**
* gnutls_certificate_import_flags: * gnutls_certificate_import_flags:
* @GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED: Fail if the * @GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED: Fail if the
* certificates in the buffer are more than the space allocated for * certificates in the buffer are more than the space allocated for
skipping to change at line 165 skipping to change at line 169
int gnutls_x509_crt_get_subject_key_id (gnutls_x509_crt_t cert, int gnutls_x509_crt_get_subject_key_id (gnutls_x509_crt_t cert,
void *ret, size_t * ret_size, void *ret, size_t * ret_size,
unsigned int *critical); unsigned int *critical);
int gnutls_x509_crt_get_subject_unique_id (gnutls_x509_crt_t crt, char *b uf, int gnutls_x509_crt_get_subject_unique_id (gnutls_x509_crt_t crt, char *b uf,
size_t * buf_size); size_t * buf_size);
int gnutls_x509_crt_get_issuer_unique_id (gnutls_x509_crt_t crt, char *bu f, int gnutls_x509_crt_get_issuer_unique_id (gnutls_x509_crt_t crt, char *bu f,
size_t * buf_size); size_t * buf_size);
/**
* gnutls_info_access_what_t:
* @GNUTLS_IA_ACCESSMETHOD_OID: Get accessMethod OID.
* @GNUTLS_IA_ACCESSLOCATION_GENERALNAME_TYPE: Get accessLocation name ty
pe.
* @GNUTLS_IA_URI: Get accessLocation URI value.
* @GNUTLS_IA_OCSP_URI: get accessLocation URI value for OCSP.
* @GNUTLS_IA_CAISSUERS_URI: get accessLocation URI value for caIssuers.
*
* Enumeration of types for the @what parameter of
* gnutls_x509_crt_get_authority_info_access().
*/
typedef enum gnutls_info_access_what_t
{
GNUTLS_IA_ACCESSMETHOD_OID = 1,
GNUTLS_IA_ACCESSLOCATION_GENERALNAME_TYPE = 2,
/* use 100-108 for the generalName types, populate as needed */
GNUTLS_IA_URI = 106,
/* quick-access variants that match both OID and name type. */
GNUTLS_IA_OCSP_URI = 10006,
GNUTLS_IA_CAISSUERS_URI = 10106
} gnutls_info_access_what_t;
int gnutls_x509_crt_get_authority_info_access (gnutls_x509_crt_t crt,
unsigned int seq,
int what,
gnutls_datum_t * data,
int *critical);
#define GNUTLS_CRL_REASON_UNUSED 128 #define GNUTLS_CRL_REASON_UNUSED 128
#define GNUTLS_CRL_REASON_KEY_COMPROMISE 64 #define GNUTLS_CRL_REASON_KEY_COMPROMISE 64
#define GNUTLS_CRL_REASON_CA_COMPROMISE 32 #define GNUTLS_CRL_REASON_CA_COMPROMISE 32
#define GNUTLS_CRL_REASON_AFFILIATION_CHANGED 16 #define GNUTLS_CRL_REASON_AFFILIATION_CHANGED 16
#define GNUTLS_CRL_REASON_SUPERSEDED 8 #define GNUTLS_CRL_REASON_SUPERSEDED 8
#define GNUTLS_CRL_REASON_SUPERSEEDED GNUTLS_CRL_REASON_SUPERSEDED #define GNUTLS_CRL_REASON_SUPERSEEDED GNUTLS_CRL_REASON_SUPERSEDED
#define GNUTLS_CRL_REASON_CESSATION_OF_OPERATION 4 #define GNUTLS_CRL_REASON_CESSATION_OF_OPERATION 4
#define GNUTLS_CRL_REASON_CERTIFICATE_HOLD 2 #define GNUTLS_CRL_REASON_CERTIFICATE_HOLD 2
#define GNUTLS_CRL_REASON_PRIVILEGE_WITHDRAWN 1 #define GNUTLS_CRL_REASON_PRIVILEGE_WITHDRAWN 1
#define GNUTLS_CRL_REASON_AA_COMPROMISE 32768 #define GNUTLS_CRL_REASON_AA_COMPROMISE 32768
 End of changes. 2 change blocks. 
0 lines changed or deleted 33 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/