ABI
Tracker

(GnuTLS)



Headers diff: 3.1.2 vs 3.1.3



 abstract.h (3.1.2)   abstract.h (3.1.3) 
skipping to change at line 72 skipping to change at line 72
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,
unsigned int flags); unsigned int flags);
int gnutls_pubkey_import_openpgp_raw (gnutls_pubkey_t pkey,
const gnutls_datum_t * data,
gnutls_openpgp_crt_fmt_t format,
const gnutls_openpgp_keyid_t keyid,
unsigned int flags);
int gnutls_pubkey_import_x509_raw (gnutls_pubkey_t pkey,
const gnutls_datum_t * data,
gnutls_x509_crt_fmt_t format,
unsigned int flags);
int int
gnutls_pubkey_import_privkey (gnutls_pubkey_t key, gnutls_privkey_t pkey, gnutls_pubkey_import_privkey (gnutls_pubkey_t key, gnutls_privkey_t pkey,
unsigned int usage, unsigned int flags); unsigned int usage, unsigned int flags);
int int
gnutls_pubkey_import_tpm_url (gnutls_pubkey_t pkey, gnutls_pubkey_import_tpm_url (gnutls_pubkey_t pkey,
const char* url, const char* url,
const char *srk_password, const char *srk_password,
unsigned int flags); unsigned int flags);
skipping to change at line 111 skipping to change at line 122
gnutls_datum_t * g, gnutls_datum_t * y); gnutls_datum_t * g, gnutls_datum_t * y);
int gnutls_pubkey_get_pk_ecc_raw (gnutls_pubkey_t key, gnutls_ecc_curve_t * curve, int gnutls_pubkey_get_pk_ecc_raw (gnutls_pubkey_t key, gnutls_ecc_curve_t * curve,
gnutls_datum_t * x, gnutls_datum_t * y); gnutls_datum_t * x, gnutls_datum_t * y);
int gnutls_pubkey_get_pk_ecc_x962 (gnutls_pubkey_t key, gnutls_datum_t* par ameters, int gnutls_pubkey_get_pk_ecc_x962 (gnutls_pubkey_t key, gnutls_datum_t* par ameters,
gnutls_datum_t * ecpoint); gnutls_datum_t * ecpoint);
int gnutls_pubkey_export (gnutls_pubkey_t key, int gnutls_pubkey_export (gnutls_pubkey_t key,
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_pubkey_export2 (gnutls_pubkey_t key,
gnutls_x509_crt_fmt_t format,
gnutls_datum_t * out);
int gnutls_pubkey_get_key_id (gnutls_pubkey_t key, unsigned int flags, int gnutls_pubkey_get_key_id (gnutls_pubkey_t key, unsigned int flags,
unsigned char *output_data, unsigned char *output_data,
size_t * output_data_size); size_t * output_data_size);
int int
gnutls_pubkey_get_openpgp_key_id (gnutls_pubkey_t key, unsigned int flags, gnutls_pubkey_get_openpgp_key_id (gnutls_pubkey_t key, unsigned int flags,
unsigned char *output_data, unsigned char *output_data,
size_t * output_data_size, size_t * output_data_size,
unsigned int *subkey); unsigned int *subkey);
 End of changes. 2 change blocks. 
0 lines changed or deleted 15 lines changed or added


 gnutls.h (3.1.2)   gnutls.h (3.1.3) 
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.1.2" #define GNUTLS_VERSION "3.1.3"
#define GNUTLS_VERSION_MAJOR 3 #define GNUTLS_VERSION_MAJOR 3
#define GNUTLS_VERSION_MINOR 1 #define GNUTLS_VERSION_MINOR 1
#define GNUTLS_VERSION_PATCH 2 #define GNUTLS_VERSION_PATCH 3
#define GNUTLS_VERSION_NUMBER 0x030102 #define GNUTLS_VERSION_NUMBER 0x030103
#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 297 skipping to change at line 297
GNUTLS_COMP_ZLIB = GNUTLS_COMP_DEFLATE, GNUTLS_COMP_ZLIB = GNUTLS_COMP_DEFLATE,
} gnutls_compression_method_t; } gnutls_compression_method_t;
/* /*
* Flags for gnutls_init() * Flags for gnutls_init()
* *
* @GNUTLS_SERVER: Connection end is a server. * @GNUTLS_SERVER: Connection end is a server.
* @GNUTLS_CLIENT: Connection end is a client. * @GNUTLS_CLIENT: Connection end is a client.
* @GNUTLS_DATAGRAM: Connection is datagram oriented (DTLS). * @GNUTLS_DATAGRAM: Connection is datagram oriented (DTLS).
* @GNUTLS_NONBLOCK: Connection should not block (DTLS). * @GNUTLS_NONBLOCK: Connection should not block (DTLS).
* @GNUTLS_NO_EXTENSIONS: Do not enable any TLS extensions by default.
* *
*/ */
#define GNUTLS_SERVER 1 #define GNUTLS_SERVER 1
#define GNUTLS_CLIENT (1<<1) #define GNUTLS_CLIENT (1<<1)
#define GNUTLS_DATAGRAM (1<<2) #define GNUTLS_DATAGRAM (1<<2)
#define GNUTLS_NONBLOCK (1<<3) #define GNUTLS_NONBLOCK (1<<3)
#define GNUTLS_NO_EXTENSIONS (1<<4)
/** /**
* gnutls_alert_level_t: * gnutls_alert_level_t:
* @GNUTLS_AL_WARNING: Alert of warning severity. * @GNUTLS_AL_WARNING: Alert of warning severity.
* @GNUTLS_AL_FATAL: Alert of fatal severity. * @GNUTLS_AL_FATAL: Alert of fatal severity.
* *
* Enumeration of different TLS alert severities. * Enumeration of different TLS alert severities.
*/ */
typedef enum typedef enum
{ {
skipping to change at line 400 skipping to change at line 402
* @GNUTLS_HANDSHAKE_CLIENT_HELLO: Client hello. * @GNUTLS_HANDSHAKE_CLIENT_HELLO: Client hello.
* @GNUTLS_HANDSHAKE_SERVER_HELLO: Server hello. * @GNUTLS_HANDSHAKE_SERVER_HELLO: Server hello.
* @GNUTLS_HANDSHAKE_NEW_SESSION_TICKET: New session ticket. * @GNUTLS_HANDSHAKE_NEW_SESSION_TICKET: New session ticket.
* @GNUTLS_HANDSHAKE_CERTIFICATE_PKT: Certificate packet. * @GNUTLS_HANDSHAKE_CERTIFICATE_PKT: Certificate packet.
* @GNUTLS_HANDSHAKE_SERVER_KEY_EXCHANGE: Server key exchange. * @GNUTLS_HANDSHAKE_SERVER_KEY_EXCHANGE: Server key exchange.
* @GNUTLS_HANDSHAKE_CERTIFICATE_REQUEST: Certificate request. * @GNUTLS_HANDSHAKE_CERTIFICATE_REQUEST: Certificate request.
* @GNUTLS_HANDSHAKE_SERVER_HELLO_DONE: Server hello done. * @GNUTLS_HANDSHAKE_SERVER_HELLO_DONE: Server hello done.
* @GNUTLS_HANDSHAKE_CERTIFICATE_VERIFY: Certificate verify. * @GNUTLS_HANDSHAKE_CERTIFICATE_VERIFY: Certificate verify.
* @GNUTLS_HANDSHAKE_CLIENT_KEY_EXCHANGE: Client key exchange. * @GNUTLS_HANDSHAKE_CLIENT_KEY_EXCHANGE: Client key exchange.
* @GNUTLS_HANDSHAKE_FINISHED: Finished. * @GNUTLS_HANDSHAKE_FINISHED: Finished.
* @GNUTLS_HANDSHAKE_CERTIFICATE_STATUS: Certificate status (OCSP).
* @GNUTLS_HANDSHAKE_SUPPLEMENTAL: Supplemental. * @GNUTLS_HANDSHAKE_SUPPLEMENTAL: Supplemental.
* @GNUTLS_HANDSHAKE_CHANGE_CIPHER_SPEC: Change Cipher Spec * @GNUTLS_HANDSHAKE_CHANGE_CIPHER_SPEC: Change Cipher Spec.
* @GNUTLS_HANDSHAKE_CLIENT_HELLO_V2: SSLv2 Client Hello. * @GNUTLS_HANDSHAKE_CLIENT_HELLO_V2: SSLv2 Client Hello.
* *
* Enumeration of different TLS handshake packets. * Enumeration of different TLS handshake packets.
*/ */
typedef enum typedef enum
{ {
GNUTLS_HANDSHAKE_HELLO_REQUEST = 0, GNUTLS_HANDSHAKE_HELLO_REQUEST = 0,
GNUTLS_HANDSHAKE_CLIENT_HELLO = 1, GNUTLS_HANDSHAKE_CLIENT_HELLO = 1,
GNUTLS_HANDSHAKE_SERVER_HELLO = 2, GNUTLS_HANDSHAKE_SERVER_HELLO = 2,
GNUTLS_HANDSHAKE_HELLO_VERIFY_REQUEST = 3, GNUTLS_HANDSHAKE_HELLO_VERIFY_REQUEST = 3,
GNUTLS_HANDSHAKE_NEW_SESSION_TICKET = 4, GNUTLS_HANDSHAKE_NEW_SESSION_TICKET = 4,
GNUTLS_HANDSHAKE_CERTIFICATE_PKT = 11, GNUTLS_HANDSHAKE_CERTIFICATE_PKT = 11,
GNUTLS_HANDSHAKE_SERVER_KEY_EXCHANGE = 12, GNUTLS_HANDSHAKE_SERVER_KEY_EXCHANGE = 12,
GNUTLS_HANDSHAKE_CERTIFICATE_REQUEST = 13, GNUTLS_HANDSHAKE_CERTIFICATE_REQUEST = 13,
GNUTLS_HANDSHAKE_SERVER_HELLO_DONE = 14, GNUTLS_HANDSHAKE_SERVER_HELLO_DONE = 14,
GNUTLS_HANDSHAKE_CERTIFICATE_VERIFY = 15, GNUTLS_HANDSHAKE_CERTIFICATE_VERIFY = 15,
GNUTLS_HANDSHAKE_CLIENT_KEY_EXCHANGE = 16, GNUTLS_HANDSHAKE_CLIENT_KEY_EXCHANGE = 16,
GNUTLS_HANDSHAKE_FINISHED = 20, GNUTLS_HANDSHAKE_FINISHED = 20,
GNUTLS_HANDSHAKE_CERTIFICATE_STATUS = 22,
GNUTLS_HANDSHAKE_SUPPLEMENTAL = 23, GNUTLS_HANDSHAKE_SUPPLEMENTAL = 23,
GNUTLS_HANDSHAKE_CHANGE_CIPHER_SPEC = 254, GNUTLS_HANDSHAKE_CHANGE_CIPHER_SPEC = 254,
GNUTLS_HANDSHAKE_CLIENT_HELLO_V2 = 1024, GNUTLS_HANDSHAKE_CLIENT_HELLO_V2 = 1024,
} gnutls_handshake_description_t; } gnutls_handshake_description_t;
/** /**
* gnutls_certificate_status_t: * gnutls_certificate_status_t:
* @GNUTLS_CERT_INVALID: The certificate is not signed by one of the * @GNUTLS_CERT_INVALID: The certificate is not signed by one of the
* known authorities or the signature is invalid. * known authorities or the signature is invalid.
* @GNUTLS_CERT_SIGNATURE_FAILURE: The signature verification failed. * @GNUTLS_CERT_SIGNATURE_FAILURE: The signature verification failed.
skipping to change at line 1197 skipping to change at line 1201
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);
/* OCSP status request extension, RFC 6066 */
typedef int (*gnutls_status_request_ocsp_func)
(gnutls_session_t session, void *ptr, gnutls_datum_t *ocsp_response);
void gnutls_certificate_set_ocsp_status_request_function (gnutls_certific
ate_credentials_t res,
gnutls_status_re
quest_ocsp_func ocsp_func,
void *ptr);
int gnutls_certificate_set_ocsp_status_request_file (gnutls_certificate_c
redentials_t res,
const char* response
_file, unsigned int flags);
int gnutls_ocsp_status_request_enable_client (gnutls_session_t session,
gnutls_datum_t *responder_id
,
size_t responder_id_size,
gnutls_datum_t *request_exte
nsions);
int gnutls_ocsp_status_request_get (gnutls_session_t session, gnutls_datu
m_t *response);
/* 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
skipping to change at line 1267 skipping to change at line 1289
const gnutls_datum_t * generator); const gnutls_datum_t * generator);
int gnutls_dh_params_import_pkcs3 (gnutls_dh_params_t params, int gnutls_dh_params_import_pkcs3 (gnutls_dh_params_t params,
const gnutls_datum_t * pkcs3_params, const gnutls_datum_t * pkcs3_params,
gnutls_x509_crt_fmt_t format); gnutls_x509_crt_fmt_t format);
int gnutls_dh_params_generate2 (gnutls_dh_params_t params, int gnutls_dh_params_generate2 (gnutls_dh_params_t params,
unsigned int bits); unsigned int bits);
int gnutls_dh_params_export_pkcs3 (gnutls_dh_params_t params, int gnutls_dh_params_export_pkcs3 (gnutls_dh_params_t params,
gnutls_x509_crt_fmt_t format, gnutls_x509_crt_fmt_t format,
unsigned char *params_data, unsigned char *params_data,
size_t * params_data_size); size_t * params_data_size);
int gnutls_dh_params_export2_pkcs3 (gnutls_dh_params_t params,
gnutls_x509_crt_fmt_t format,
gnutls_datum_t *out);
int gnutls_dh_params_export_raw (gnutls_dh_params_t params, int gnutls_dh_params_export_raw (gnutls_dh_params_t params,
gnutls_datum_t * prime, gnutls_datum_t * prime,
gnutls_datum_t * generator, gnutls_datum_t * generator,
unsigned int *bits); unsigned int *bits);
int gnutls_dh_params_cpy (gnutls_dh_params_t dst, gnutls_dh_params_t src) ; int gnutls_dh_params_cpy (gnutls_dh_params_t dst, gnutls_dh_params_t src) ;
/* Session stuff /* Session stuff
*/ */
typedef struct typedef struct
{ {
skipping to change at line 1650 skipping to change at line 1675
/* get data from the session /* get data from the session
*/ */
const gnutls_datum_t *gnutls_certificate_get_peers (gnutls_session_t const gnutls_datum_t *gnutls_certificate_get_peers (gnutls_session_t
session, session,
unsigned int unsigned int
*list_size); *list_size);
const gnutls_datum_t *gnutls_certificate_get_ours (gnutls_session_t const gnutls_datum_t *gnutls_certificate_get_ours (gnutls_session_t
session); session);
int gnutls_certificate_get_peers_subkey_id(gnutls_session_t session,
gnutls_datum_t *id);
time_t gnutls_certificate_activation_time_peers (gnutls_session_t session ); time_t gnutls_certificate_activation_time_peers (gnutls_session_t session );
time_t gnutls_certificate_expiration_time_peers (gnutls_session_t session ); time_t gnutls_certificate_expiration_time_peers (gnutls_session_t session );
int gnutls_certificate_client_get_request_status (gnutls_session_t sessio n); int gnutls_certificate_client_get_request_status (gnutls_session_t sessio n);
int gnutls_certificate_verify_peers2 (gnutls_session_t session, int gnutls_certificate_verify_peers2 (gnutls_session_t session,
unsigned int *status); unsigned int *status);
int gnutls_pem_base64_encode (const char *msg, const gnutls_datum_t * dat a, int gnutls_pem_base64_encode (const char *msg, const gnutls_datum_t * dat a,
char *result, size_t * result_size); char *result, size_t * result_size);
int gnutls_pem_base64_decode (const char *header, int gnutls_pem_base64_decode (const char *header,
skipping to change at line 2020 skipping to change at line 2048
#define GNUTLS_E_X509_UNSUPPORTED_EXTENSION -327 #define GNUTLS_E_X509_UNSUPPORTED_EXTENSION -327
#define GNUTLS_E_SESSION_EOF -328 #define GNUTLS_E_SESSION_EOF -328
#define GNUTLS_E_TPM_ERROR -329 #define GNUTLS_E_TPM_ERROR -329
#define GNUTLS_E_TPM_KEY_PASSWORD_ERROR -330 #define GNUTLS_E_TPM_KEY_PASSWORD_ERROR -330
#define GNUTLS_E_TPM_SRK_PASSWORD_ERROR -331 #define GNUTLS_E_TPM_SRK_PASSWORD_ERROR -331
#define GNUTLS_E_TPM_SESSION_ERROR -332 #define GNUTLS_E_TPM_SESSION_ERROR -332
#define GNUTLS_E_TPM_KEY_NOT_FOUND -333 #define GNUTLS_E_TPM_KEY_NOT_FOUND -333
#define GNUTLS_E_TPM_UNINITIALIZED -334 #define GNUTLS_E_TPM_UNINITIALIZED -334
#define GNUTLS_E_NO_CERTIFICATE_STATUS -340
#define GNUTLS_E_OCSP_RESPONSE_ERROR -341
#define GNUTLS_E_UNIMPLEMENTED_FEATURE -1250 #define GNUTLS_E_UNIMPLEMENTED_FEATURE -1250
#define GNUTLS_E_APPLICATION_ERROR_MAX -65000 #define GNUTLS_E_APPLICATION_ERROR_MAX -65000
#define GNUTLS_E_APPLICATION_ERROR_MIN -65500 #define GNUTLS_E_APPLICATION_ERROR_MIN -65500
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#include <gnutls/compat.h> #include <gnutls/compat.h>
 End of changes. 12 change blocks. 
4 lines changed or deleted 42 lines changed or added


 ocsp.h (3.1.2)   ocsp.h (3.1.3) 
skipping to change at line 39 skipping to change at line 39
#include <gnutls/gnutls.h> #include <gnutls/gnutls.h>
#include <gnutls/x509.h> #include <gnutls/x509.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
{ {
#endif #endif
#define GNUTLS_OCSP_NONCE "1.3.6.1.5.5.7.48.1.2" #define GNUTLS_OCSP_NONCE "1.3.6.1.5.5.7.48.1.2"
/** /**
* gnutls_ocsp_print_formats_t: * gnutls_ocsp_print_formats_t:
* @GNUTLS_OCSP_PRINT_FULL: Full information about OCSP request/response. * @GNUTLS_OCSP_PRINT_FULL: Full information about OCSP request/response.
* @GNUTLS_OCSP_PRINT_COMPACT: More compact information about OCSP reques * @GNUTLS_OCSP_PRINT_COMPACT: More compact information about OCSP request/
t/response. response.
* *
* Enumeration of different OCSP printing variants. * Enumeration of different OCSP printing variants.
*/ */
typedef enum gnutls_ocsp_print_formats_t typedef enum gnutls_ocsp_print_formats_t
{ {
GNUTLS_OCSP_PRINT_FULL = 0, GNUTLS_OCSP_PRINT_FULL = 0,
GNUTLS_OCSP_PRINT_COMPACT = 1, GNUTLS_OCSP_PRINT_COMPACT = 1,
} gnutls_ocsp_print_formats_t; } gnutls_ocsp_print_formats_t;
/** /**
* gnutls_ocsp_resp_status_t: * gnutls_ocsp_resp_status_t:
* @GNUTLS_OCSP_RESP_SUCCESSFUL: Response has valid confirmations. * @GNUTLS_OCSP_RESP_SUCCESSFUL: Response has valid confirmations.
* @GNUTLS_OCSP_RESP_MALFORMEDREQUEST: Illegal confirmation request * @GNUTLS_OCSP_RESP_MALFORMEDREQUEST: Illegal confirmation request
* @GNUTLS_OCSP_RESP_INTERNALERROR: Internal error in issuer * @GNUTLS_OCSP_RESP_INTERNALERROR: Internal error in issuer
* @GNUTLS_OCSP_RESP_TRYLATER: Try again later * @GNUTLS_OCSP_RESP_TRYLATER: Try again later
* @GNUTLS_OCSP_RESP_SIGREQUIRED: Must sign the request * @GNUTLS_OCSP_RESP_SIGREQUIRED: Must sign the request
* @GNUTLS_OCSP_RESP_UNAUTHORIZED: Request unauthorized * @GNUTLS_OCSP_RESP_UNAUTHORIZED: Request unauthorized
* *
* Enumeration of different OCSP response status codes. * Enumeration of different OCSP response status codes.
*/ */
typedef enum gnutls_ocsp_resp_status_t typedef enum gnutls_ocsp_resp_status_t
{ {
GNUTLS_OCSP_RESP_SUCCESSFUL = 0, GNUTLS_OCSP_RESP_SUCCESSFUL = 0,
GNUTLS_OCSP_RESP_MALFORMEDREQUEST = 1, GNUTLS_OCSP_RESP_MALFORMEDREQUEST = 1,
GNUTLS_OCSP_RESP_INTERNALERROR = 2, GNUTLS_OCSP_RESP_INTERNALERROR = 2,
GNUTLS_OCSP_RESP_TRYLATER = 3, GNUTLS_OCSP_RESP_TRYLATER = 3,
GNUTLS_OCSP_RESP_SIGREQUIRED = 5, GNUTLS_OCSP_RESP_SIGREQUIRED = 5,
GNUTLS_OCSP_RESP_UNAUTHORIZED = 6 GNUTLS_OCSP_RESP_UNAUTHORIZED = 6
} gnutls_ocsp_resp_status_t; } gnutls_ocsp_resp_status_t;
/** /**
* gnutls_ocsp_cert_status_t: * gnutls_ocsp_cert_status_t:
* @GNUTLS_OCSP_CERT_GOOD: Positive response to status inquiry. * @GNUTLS_OCSP_CERT_GOOD: Positive response to status inquiry.
* @GNUTLS_OCSP_CERT_REVOKED: Certificate has been revoked. * @GNUTLS_OCSP_CERT_REVOKED: Certificate has been revoked.
* @GNUTLS_OCSP_CERT_UNKNOWN: The responder doesn't know about the * @GNUTLS_OCSP_CERT_UNKNOWN: The responder doesn't know about the
* certificate. * certificate.
* *
* Enumeration of different OCSP response certificate status codes. * Enumeration of different OCSP response certificate status codes.
*/ */
typedef enum gnutls_ocsp_cert_status_t typedef enum gnutls_ocsp_cert_status_t
{ {
GNUTLS_OCSP_CERT_GOOD = 0, GNUTLS_OCSP_CERT_GOOD = 0,
GNUTLS_OCSP_CERT_REVOKED = 1, GNUTLS_OCSP_CERT_REVOKED = 1,
GNUTLS_OCSP_CERT_UNKNOWN = 2 GNUTLS_OCSP_CERT_UNKNOWN = 2
} gnutls_ocsp_cert_status_t; } gnutls_ocsp_cert_status_t;
/** /**
* gnutls_x509_crl_reason_t: * gnutls_x509_crl_reason_t:
* @GNUTLS_X509_CRLREASON_UNSPECIFIED: Unspecified reason. * @GNUTLS_X509_CRLREASON_UNSPECIFIED: Unspecified reason.
* @GNUTLS_X509_CRLREASON_KEYCOMPROMISE: Private key compromised. * @GNUTLS_X509_CRLREASON_KEYCOMPROMISE: Private key compromised.
* @GNUTLS_X509_CRLREASON_CACOMPROMISE: CA compromised. * @GNUTLS_X509_CRLREASON_CACOMPROMISE: CA compromised.
* @GNUTLS_X509_CRLREASON_AFFILIATIONCHANGED: Affiliation has changed. * @GNUTLS_X509_CRLREASON_AFFILIATIONCHANGED: Affiliation has changed.
* @GNUTLS_X509_CRLREASON_SUPERSEDED: Certificate superseded. * @GNUTLS_X509_CRLREASON_SUPERSEDED: Certificate superseded.
* @GNUTLS_X509_CRLREASON_CESSATIONOFOPERATION: Operation has ceased. * @GNUTLS_X509_CRLREASON_CESSATIONOFOPERATION: Operation has ceased.
* @GNUTLS_X509_CRLREASON_CERTIFICATEHOLD: Certificate is on hold. * @GNUTLS_X509_CRLREASON_CERTIFICATEHOLD: Certificate is on hold.
* @GNUTLS_X509_CRLREASON_REMOVEFROMCRL: Will be removed from delta CRL. * @GNUTLS_X509_CRLREASON_REMOVEFROMCRL: Will be removed from delta CRL.
* @GNUTLS_X509_CRLREASON_PRIVILEGEWITHDRAWN: Privilege withdrawn. * @GNUTLS_X509_CRLREASON_PRIVILEGEWITHDRAWN: Privilege withdrawn.
* @GNUTLS_X509_CRLREASON_AACOMPROMISE: AA compromised. * @GNUTLS_X509_CRLREASON_AACOMPROMISE: AA compromised.
* *
* Enumeration of different reason codes. Note that this * Enumeration of different reason codes. Note that this
* corresponds to the CRLReason ASN.1 enumeration type, and not the * corresponds to the CRLReason ASN.1 enumeration type, and not the
* ReasonFlags ASN.1 bit string. * ReasonFlags ASN.1 bit string.
*/ */
typedef enum gnutls_x509_crl_reason_t typedef enum gnutls_x509_crl_reason_t
{ {
GNUTLS_X509_CRLREASON_UNSPECIFIED = 0, GNUTLS_X509_CRLREASON_UNSPECIFIED = 0,
GNUTLS_X509_CRLREASON_KEYCOMPROMISE = 1, GNUTLS_X509_CRLREASON_KEYCOMPROMISE = 1,
GNUTLS_X509_CRLREASON_CACOMPROMISE = 2, GNUTLS_X509_CRLREASON_CACOMPROMISE = 2,
GNUTLS_X509_CRLREASON_AFFILIATIONCHANGED = 3, GNUTLS_X509_CRLREASON_AFFILIATIONCHANGED = 3,
GNUTLS_X509_CRLREASON_SUPERSEDED = 4, GNUTLS_X509_CRLREASON_SUPERSEDED = 4,
GNUTLS_X509_CRLREASON_CESSATIONOFOPERATION = 5, GNUTLS_X509_CRLREASON_CESSATIONOFOPERATION = 5,
GNUTLS_X509_CRLREASON_CERTIFICATEHOLD = 6, GNUTLS_X509_CRLREASON_CERTIFICATEHOLD = 6,
/* -- value 7 is not used */ GNUTLS_X509_CRLREASON_REMOVEFROMCRL = 8,
GNUTLS_X509_CRLREASON_REMOVEFROMCRL = 8, GNUTLS_X509_CRLREASON_PRIVILEGEWITHDRAWN = 9,
GNUTLS_X509_CRLREASON_PRIVILEGEWITHDRAWN = 9, GNUTLS_X509_CRLREASON_AACOMPROMISE = 10
GNUTLS_X509_CRLREASON_AACOMPROMISE = 10 } gnutls_x509_crl_reason_t;
} gnutls_x509_crl_reason_t;
/** /**
* gnutls_ocsp_verify_reason_t: * gnutls_ocsp_verify_reason_t:
* @GNUTLS_OCSP_VERIFY_SIGNER_NOT_FOUND: Signer cert not found. * @GNUTLS_OCSP_VERIFY_SIGNER_NOT_FOUND: Signer cert not found.
* @GNUTLS_OCSP_VERIFY_SIGNER_KEYUSAGE_ERROR: Signer keyusage bits incorr * @GNUTLS_OCSP_VERIFY_SIGNER_KEYUSAGE_ERROR: Signer keyusage bits incorrec
ect. t.
* @GNUTLS_OCSP_VERIFY_UNTRUSTED_SIGNER: Signer is not trusted. * @GNUTLS_OCSP_VERIFY_UNTRUSTED_SIGNER: Signer is not trusted.
* @GNUTLS_OCSP_VERIFY_INSECURE_ALGORITHM: Signature using insecure algor * @GNUTLS_OCSP_VERIFY_INSECURE_ALGORITHM: Signature using insecure algorit
ithm. hm.
* @GNUTLS_OCSP_VERIFY_SIGNATURE_FAILURE: Signature mismatch. * @GNUTLS_OCSP_VERIFY_SIGNATURE_FAILURE: Signature mismatch.
* @GNUTLS_OCSP_VERIFY_CERT_NOT_ACTIVATED: Signer cert is not yet activat * @GNUTLS_OCSP_VERIFY_CERT_NOT_ACTIVATED: Signer cert is not yet activated
ed. .
* @GNUTLS_OCSP_VERIFY_CERT_EXPIRED: Signer cert has expired. * @GNUTLS_OCSP_VERIFY_CERT_EXPIRED: Signer cert has expired.
* *
* Enumeration of OCSP verify status codes, used by * Enumeration of OCSP verify status codes, used by
* gnutls_ocsp_resp_verify() and gnutls_ocsp_resp_verify_direct(). * gnutls_ocsp_resp_verify() and gnutls_ocsp_resp_verify_direct().
*/ */
typedef enum gnutls_ocsp_verify_reason_t typedef enum gnutls_ocsp_verify_reason_t
{ {
GNUTLS_OCSP_VERIFY_SIGNER_NOT_FOUND = 1, GNUTLS_OCSP_VERIFY_SIGNER_NOT_FOUND = 1,
GNUTLS_OCSP_VERIFY_SIGNER_KEYUSAGE_ERROR = 2, GNUTLS_OCSP_VERIFY_SIGNER_KEYUSAGE_ERROR = 2,
GNUTLS_OCSP_VERIFY_UNTRUSTED_SIGNER = 4, GNUTLS_OCSP_VERIFY_UNTRUSTED_SIGNER = 4,
GNUTLS_OCSP_VERIFY_INSECURE_ALGORITHM = 8, GNUTLS_OCSP_VERIFY_INSECURE_ALGORITHM = 8,
GNUTLS_OCSP_VERIFY_SIGNATURE_FAILURE = 16, GNUTLS_OCSP_VERIFY_SIGNATURE_FAILURE = 16,
GNUTLS_OCSP_VERIFY_CERT_NOT_ACTIVATED = 32, GNUTLS_OCSP_VERIFY_CERT_NOT_ACTIVATED = 32,
GNUTLS_OCSP_VERIFY_CERT_EXPIRED = 64 GNUTLS_OCSP_VERIFY_CERT_EXPIRED = 64
} gnutls_ocsp_verify_reason_t; } gnutls_ocsp_verify_reason_t;
struct gnutls_ocsp_req_int; struct gnutls_ocsp_req_int;
typedef struct gnutls_ocsp_req_int *gnutls_ocsp_req_t; typedef struct gnutls_ocsp_req_int *gnutls_ocsp_req_t;
int gnutls_ocsp_req_init (gnutls_ocsp_req_t * req); int gnutls_ocsp_req_init (gnutls_ocsp_req_t * req);
void gnutls_ocsp_req_deinit (gnutls_ocsp_req_t req); void gnutls_ocsp_req_deinit (gnutls_ocsp_req_t req);
int gnutls_ocsp_req_import (gnutls_ocsp_req_t req, int gnutls_ocsp_req_import (gnutls_ocsp_req_t req,
const gnutls_datum_t * data); const gnutls_datum_t * data);
int gnutls_ocsp_req_export (gnutls_ocsp_req_t req, gnutls_datum_t * data) ; int gnutls_ocsp_req_export (gnutls_ocsp_req_t req, gnutls_datum_t * data) ;
skipping to change at line 252 skipping to change at line 251
int gnutls_ocsp_resp_verify_direct (gnutls_ocsp_resp_t resp, int gnutls_ocsp_resp_verify_direct (gnutls_ocsp_resp_t resp,
gnutls_x509_crt_t issuer, gnutls_x509_crt_t issuer,
unsigned int *verify, unsigned int *verify,
unsigned int flags); unsigned int flags);
int gnutls_ocsp_resp_verify (gnutls_ocsp_resp_t resp, int gnutls_ocsp_resp_verify (gnutls_ocsp_resp_t resp,
gnutls_x509_trust_list_t trustlist, gnutls_x509_trust_list_t trustlist,
unsigned int *verify, unsigned int *verify,
unsigned int flags); unsigned int flags);
int gnutls_ocsp_resp_check_crt (gnutls_ocsp_resp_t resp,
unsigned int indx,
gnutls_x509_crt_t crt);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* GNUTLS_OCSP_H */ #endif /* GNUTLS_OCSP_H */
 End of changes. 6 change blocks. 
105 lines changed or deleted 108 lines changed or added


 openpgp.h (3.1.2)   openpgp.h (3.1.3) 
skipping to change at line 31 skipping to change at line 31
*/ */
/* This file contains the types and prototypes for the OpenPGP /* This file contains the types and prototypes for the OpenPGP
* key and private key parsing functions. * key and private key parsing functions.
*/ */
#ifndef GNUTLS_OPENPGP_H #ifndef GNUTLS_OPENPGP_H
#define GNUTLS_OPENPGP_H #define GNUTLS_OPENPGP_H
#include <gnutls/gnutls.h> #include <gnutls/gnutls.h>
#include <limits.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
{ {
#endif #endif
/* Openpgp certificate stuff /* Openpgp certificate stuff
*/ */
/** /**
skipping to change at line 71 skipping to change at line 72
/* frees all memory */ /* frees all memory */
void gnutls_openpgp_crt_deinit (gnutls_openpgp_crt_t key); void gnutls_openpgp_crt_deinit (gnutls_openpgp_crt_t key);
int gnutls_openpgp_crt_import (gnutls_openpgp_crt_t key, int gnutls_openpgp_crt_import (gnutls_openpgp_crt_t key,
const gnutls_datum_t * data, const gnutls_datum_t * data,
gnutls_openpgp_crt_fmt_t format); gnutls_openpgp_crt_fmt_t format);
int gnutls_openpgp_crt_export (gnutls_openpgp_crt_t key, int gnutls_openpgp_crt_export (gnutls_openpgp_crt_t key,
gnutls_openpgp_crt_fmt_t format, gnutls_openpgp_crt_fmt_t format,
void *output_data, void *output_data,
size_t * output_data_size); size_t * output_data_size);
int gnutls_openpgp_crt_export2 (gnutls_openpgp_crt_t key,
gnutls_openpgp_crt_fmt_t format,
gnutls_datum_t * out);
int gnutls_openpgp_crt_print (gnutls_openpgp_crt_t cert, int gnutls_openpgp_crt_print (gnutls_openpgp_crt_t cert,
gnutls_certificate_print_formats_t format, gnutls_certificate_print_formats_t format,
gnutls_datum_t * out); gnutls_datum_t * out);
/* The key_usage flags are defined in gnutls.h. They are /* The key_usage flags are defined in gnutls.h. They are
* the GNUTLS_KEY_* definitions. * the GNUTLS_KEY_* definitions.
*/ */
#define GNUTLS_OPENPGP_MASTER_KEYID_IDX INT_MAX
int gnutls_openpgp_crt_get_key_usage (gnutls_openpgp_crt_t key, int gnutls_openpgp_crt_get_key_usage (gnutls_openpgp_crt_t key,
unsigned int *key_usage); unsigned int *key_usage);
int gnutls_openpgp_crt_get_fingerprint (gnutls_openpgp_crt_t key, void *f pr, int gnutls_openpgp_crt_get_fingerprint (gnutls_openpgp_crt_t key, void *f pr,
size_t * fprlen); size_t * fprlen);
int gnutls_openpgp_crt_get_subkey_fingerprint (gnutls_openpgp_crt_t key, int gnutls_openpgp_crt_get_subkey_fingerprint (gnutls_openpgp_crt_t key,
unsigned int idx, unsigned int idx,
void *fpr, size_t * fprlen ); void *fpr, size_t * fprlen );
int gnutls_openpgp_crt_get_name (gnutls_openpgp_crt_t key, int gnutls_openpgp_crt_get_name (gnutls_openpgp_crt_t key,
int idx, char *buf, size_t * sizeof_buf) ; int idx, char *buf, size_t * sizeof_buf) ;
skipping to change at line 244 skipping to change at line 250
gnutls_datum_t * p, gnutls_datum_t * p,
gnutls_datum_t * q, gnutls_datum_t * q,
gnutls_datum_t * u); gnutls_datum_t * u);
int gnutls_openpgp_privkey_export (gnutls_openpgp_privkey_t key, int gnutls_openpgp_privkey_export (gnutls_openpgp_privkey_t key,
gnutls_openpgp_crt_fmt_t format, gnutls_openpgp_crt_fmt_t format,
const char *password, const char *password,
unsigned int flags, unsigned int flags,
void *output_data, void *output_data,
size_t * output_data_size); size_t * output_data_size);
int gnutls_openpgp_privkey_export2 (gnutls_openpgp_privkey_t key,
gnutls_openpgp_crt_fmt_t format,
const char *password,
unsigned int flags,
gnutls_datum_t * out);
int int
gnutls_openpgp_privkey_set_preferred_key_id (gnutls_openpgp_privkey_t k ey, gnutls_openpgp_privkey_set_preferred_key_id (gnutls_openpgp_privkey_t k ey,
const gnutls_openpgp_keyid _t const gnutls_openpgp_keyid _t
keyid); keyid);
int gnutls_openpgp_privkey_get_preferred_key_id (gnutls_openpgp_privkey_t int gnutls_openpgp_privkey_get_preferred_key_id (gnutls_openpgp_privkey_t
key, key,
gnutls_openpgp_keyid_t gnutls_openpgp_keyid_t
keyid); keyid);
 End of changes. 4 change blocks. 
0 lines changed or deleted 11 lines changed or added


 pkcs11.h (3.1.2)   pkcs11.h (3.1.3) 
skipping to change at line 120 skipping to change at line 120
const char *url, const char *url,
unsigned int flags unsigned int flags
/* GNUTLS_PKCS11_OBJ_FLAG_* */ ); /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
int gnutls_pkcs11_obj_export_url (gnutls_pkcs11_obj_t obj, int gnutls_pkcs11_obj_export_url (gnutls_pkcs11_obj_t obj,
gnutls_pkcs11_url_type_t detailed, gnutls_pkcs11_url_type_t detailed,
char **url); char **url);
void gnutls_pkcs11_obj_deinit (gnutls_pkcs11_obj_t obj); void gnutls_pkcs11_obj_deinit (gnutls_pkcs11_obj_t obj);
int gnutls_pkcs11_obj_export (gnutls_pkcs11_obj_t obj, int gnutls_pkcs11_obj_export (gnutls_pkcs11_obj_t obj,
void *output_data, size_t * output_data_size) ; void *output_data, size_t * output_data_size) ;
int gnutls_pkcs11_obj_export2 (gnutls_pkcs11_obj_t obj,
gnutls_datum_t *out);
int gnutls_pkcs11_copy_x509_crt (const char *token_url, gnutls_x509_crt_t c rt, int gnutls_pkcs11_copy_x509_crt (const char *token_url, gnutls_x509_crt_t c rt,
const char *label, unsigned int flags const char *label, unsigned int flags
/* GNUTLS_PKCS11_OBJ_FLAG_* */ ); /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
int gnutls_pkcs11_copy_x509_privkey (const char *token_url, gnutls_x509_pri vkey_t key, int gnutls_pkcs11_copy_x509_privkey (const char *token_url, gnutls_x509_pri vkey_t key,
const char *label, unsigned int key_usage /*GNUTLS_KEY_* */, unsigned int flags const char *label, unsigned int key_usage /*GNUTLS_KEY_* */, unsigned int flags
/* GNUTLS_PKCS11_OBJ_FLAG_* */ ); /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
int gnutls_pkcs11_delete_url (const char *object_url, unsigned int flags int gnutls_pkcs11_delete_url (const char *object_url, unsigned int flags
/* GNUTLS_PKCS11_OBJ_FLAG_* */ ); /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 pkcs12.h (3.1.2)   pkcs12.h (3.1.3) 
skipping to change at line 49 skipping to change at line 49
typedef struct gnutls_pkcs12_bag_int *gnutls_pkcs12_bag_t; typedef struct gnutls_pkcs12_bag_int *gnutls_pkcs12_bag_t;
int gnutls_pkcs12_init (gnutls_pkcs12_t * pkcs12); int gnutls_pkcs12_init (gnutls_pkcs12_t * pkcs12);
void gnutls_pkcs12_deinit (gnutls_pkcs12_t pkcs12); void gnutls_pkcs12_deinit (gnutls_pkcs12_t pkcs12);
int gnutls_pkcs12_import (gnutls_pkcs12_t pkcs12, int gnutls_pkcs12_import (gnutls_pkcs12_t pkcs12,
const gnutls_datum_t * data, const gnutls_datum_t * data,
gnutls_x509_crt_fmt_t format, unsigned int flag s); gnutls_x509_crt_fmt_t format, unsigned int flag s);
int gnutls_pkcs12_export (gnutls_pkcs12_t pkcs12, int gnutls_pkcs12_export (gnutls_pkcs12_t pkcs12,
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_pkcs12_export2 (gnutls_pkcs12_t pkcs12,
gnutls_x509_crt_fmt_t format,
gnutls_datum_t *out);
int gnutls_pkcs12_get_bag (gnutls_pkcs12_t pkcs12, int gnutls_pkcs12_get_bag (gnutls_pkcs12_t pkcs12,
int indx, gnutls_pkcs12_bag_t bag); int indx, gnutls_pkcs12_bag_t bag);
int gnutls_pkcs12_set_bag (gnutls_pkcs12_t pkcs12, gnutls_pkcs12_bag_t ba g); int gnutls_pkcs12_set_bag (gnutls_pkcs12_t pkcs12, gnutls_pkcs12_bag_t ba g);
int gnutls_pkcs12_generate_mac (gnutls_pkcs12_t pkcs12, const char *pass) ; int gnutls_pkcs12_generate_mac (gnutls_pkcs12_t pkcs12, const char *pass) ;
int gnutls_pkcs12_verify_mac (gnutls_pkcs12_t pkcs12, const char *pass); int gnutls_pkcs12_verify_mac (gnutls_pkcs12_t pkcs12, const char *pass);
int gnutls_pkcs12_bag_decrypt (gnutls_pkcs12_bag_t bag, const char *pass) ; int gnutls_pkcs12_bag_decrypt (gnutls_pkcs12_bag_t bag, const char *pass) ;
int gnutls_pkcs12_bag_encrypt (gnutls_pkcs12_bag_t bag, const char *pass, int gnutls_pkcs12_bag_encrypt (gnutls_pkcs12_bag_t bag, const char *pass,
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 x509.h (3.1.2)   x509.h (3.1.3) 
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_export2 (gnutls_x509_crt_t cert,
gnutls_x509_crt_fmt_t format,
gnutls_datum_t* out);
int gnutls_x509_crt_get_private_key_usage_period (gnutls_x509_crt_t cert, time_t* activation, time_t* expiration, int gnutls_x509_crt_get_private_key_usage_period (gnutls_x509_crt_t cert, time_t* activation, time_t* expiration,
unsigned int *critical); 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,
skipping to change at line 215 skipping to change at line 218
GNUTLS_IA_OCSP_URI = 10006, GNUTLS_IA_OCSP_URI = 10006,
GNUTLS_IA_CAISSUERS_URI = 10106 GNUTLS_IA_CAISSUERS_URI = 10106
} gnutls_info_access_what_t; } gnutls_info_access_what_t;
int gnutls_x509_crt_get_authority_info_access (gnutls_x509_crt_t crt, int gnutls_x509_crt_get_authority_info_access (gnutls_x509_crt_t crt,
unsigned int seq, unsigned int seq,
int what, int what,
gnutls_datum_t * data, gnutls_datum_t * data,
unsigned int *critical); unsigned int *critical);
#define GNUTLS_CRL_REASON_UNUSED 128 #define GNUTLS_CRL_REASON_SUPERSEEDED GNUTLS_CRL_REASON_SUPERSEDED,
#define GNUTLS_CRL_REASON_KEY_COMPROMISE 64 /**
#define GNUTLS_CRL_REASON_CA_COMPROMISE 32 * gnutls_x509_crl_reason_flags_t:
#define GNUTLS_CRL_REASON_AFFILIATION_CHANGED 16 * @GNUTLS_CRL_REASON_PRIVILEGE_WITHDRAWN: The privileges were withdrawn
#define GNUTLS_CRL_REASON_SUPERSEDED 8 from the owner.
#define GNUTLS_CRL_REASON_SUPERSEEDED GNUTLS_CRL_REASON_SUPERSEDED * @GNUTLS_CRL_REASON_CERTIFICATE_HOLD: The certificate is on hold.
#define GNUTLS_CRL_REASON_CESSATION_OF_OPERATION 4 * @GNUTLS_CRL_REASON_CESSATION_OF_OPERATION: The end-entity is no longer
#define GNUTLS_CRL_REASON_CERTIFICATE_HOLD 2 operating.
#define GNUTLS_CRL_REASON_PRIVILEGE_WITHDRAWN 1 * @GNUTLS_CRL_REASON_SUPERSEDED: There is a newer certificate of the own
#define GNUTLS_CRL_REASON_AA_COMPROMISE 32768 er.
* @GNUTLS_CRL_REASON_AFFILIATION_CHANGED: The end-entity affiliation has
changed.
* @GNUTLS_CRL_REASON_CA_COMPROMISE: The CA was compromised.
* @GNUTLS_CRL_REASON_KEY_COMPROMISE: The certificate's key was compromis
ed.
* @GNUTLS_CRL_REASON_UNUSED: The key was never used.
* @GNUTLS_CRL_REASON_AA_COMPROMISE: AA compromised.
*
* Enumeration of types for the CRL revocation reasons.
*/
typedef enum gnutls_x509_crl_reason_flags_t
{
GNUTLS_CRL_REASON_UNSPECIFIED=0,
GNUTLS_CRL_REASON_PRIVILEGE_WITHDRAWN=1,
GNUTLS_CRL_REASON_CERTIFICATE_HOLD=2,
GNUTLS_CRL_REASON_CESSATION_OF_OPERATION=4,
GNUTLS_CRL_REASON_SUPERSEDED=8,
GNUTLS_CRL_REASON_AFFILIATION_CHANGED=16,
GNUTLS_CRL_REASON_CA_COMPROMISE=32,
GNUTLS_CRL_REASON_KEY_COMPROMISE=64,
GNUTLS_CRL_REASON_UNUSED=128,
GNUTLS_CRL_REASON_AA_COMPROMISE=32768
} gnutls_x509_crl_reason_flags_t;
int gnutls_x509_crt_get_crl_dist_points (gnutls_x509_crt_t cert, int gnutls_x509_crt_get_crl_dist_points (gnutls_x509_crt_t cert,
unsigned int seq, void *ret, unsigned int seq, void *ret,
size_t * ret_size, size_t * ret_size,
unsigned int *reason_flags, unsigned int *reason_flags,
unsigned int *critical); unsigned int *critical);
int gnutls_x509_crt_set_crl_dist_points2 (gnutls_x509_crt_t crt, int gnutls_x509_crt_set_crl_dist_points2 (gnutls_x509_crt_t crt,
gnutls_x509_subject_alt_name_t gnutls_x509_subject_alt_name_t
type, const void *data, type, const void *data,
unsigned int data_size, unsigned int data_size,
skipping to change at line 448 skipping to change at line 469
int iava, gnutls_x509_ava_st * ava); int iava, gnutls_x509_ava_st * ava);
int gnutls_x509_dn_init (gnutls_x509_dn_t * dn); int gnutls_x509_dn_init (gnutls_x509_dn_t * dn);
int gnutls_x509_dn_import (gnutls_x509_dn_t dn, int gnutls_x509_dn_import (gnutls_x509_dn_t dn,
const gnutls_datum_t * data); const gnutls_datum_t * data);
int gnutls_x509_dn_export (gnutls_x509_dn_t dn, int gnutls_x509_dn_export (gnutls_x509_dn_t dn,
gnutls_x509_crt_fmt_t format, void *output_dat a, gnutls_x509_crt_fmt_t format, void *output_dat a,
size_t * output_data_size); size_t * output_data_size);
int gnutls_x509_dn_export2 (gnutls_x509_dn_t dn,
gnutls_x509_crt_fmt_t format,
gnutls_datum_t * out);
void gnutls_x509_dn_deinit (gnutls_x509_dn_t dn); void gnutls_x509_dn_deinit (gnutls_x509_dn_t dn);
/* CRL handling functions. /* CRL handling functions.
*/ */
int gnutls_x509_crl_init (gnutls_x509_crl_t * crl); int gnutls_x509_crl_init (gnutls_x509_crl_t * crl);
void gnutls_x509_crl_deinit (gnutls_x509_crl_t crl); void gnutls_x509_crl_deinit (gnutls_x509_crl_t crl);
int gnutls_x509_crl_import (gnutls_x509_crl_t crl, int gnutls_x509_crl_import (gnutls_x509_crl_t crl,
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_crl_export (gnutls_x509_crl_t crl, int gnutls_x509_crl_export (gnutls_x509_crl_t crl,
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_crl_export2 (gnutls_x509_crl_t crl,
gnutls_x509_crt_fmt_t format,
gnutls_datum_t *out);
int int
gnutls_x509_crl_get_raw_issuer_dn (gnutls_x509_crl_t crl, gnutls_x509_crl_get_raw_issuer_dn (gnutls_x509_crl_t crl,
gnutls_datum_t * dn); gnutls_datum_t * dn);
int gnutls_x509_crl_get_issuer_dn (const gnutls_x509_crl_t crl, int gnutls_x509_crl_get_issuer_dn (const gnutls_x509_crl_t crl,
char *buf, size_t * sizeof_buf); char *buf, size_t * sizeof_buf);
int gnutls_x509_crl_get_issuer_dn_by_oid (gnutls_x509_crl_t crl, int gnutls_x509_crl_get_issuer_dn_by_oid (gnutls_x509_crl_t crl,
const char *oid, int indx, const char *oid, int indx,
unsigned int raw_flag, unsigned int raw_flag,
skipping to change at line 563 skipping to change at line 590
typedef struct gnutls_pkcs7_int *gnutls_pkcs7_t; typedef struct gnutls_pkcs7_int *gnutls_pkcs7_t;
int gnutls_pkcs7_init (gnutls_pkcs7_t * pkcs7); int gnutls_pkcs7_init (gnutls_pkcs7_t * pkcs7);
void gnutls_pkcs7_deinit (gnutls_pkcs7_t pkcs7); void gnutls_pkcs7_deinit (gnutls_pkcs7_t pkcs7);
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,
gnutls_x509_crt_fmt_t format,
gnutls_datum_t *out);
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_siz e); void *certificate, size_t * certificate_siz e);
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);
skipping to change at line 786 skipping to change at line 816
int gnutls_x509_privkey_generate (gnutls_x509_privkey_t key, int gnutls_x509_privkey_generate (gnutls_x509_privkey_t key,
gnutls_pk_algorithm_t algo, gnutls_pk_algorithm_t algo,
unsigned int bits, unsigned int flags); unsigned int bits, unsigned int flags);
int gnutls_x509_privkey_verify_params (gnutls_x509_privkey_t key); int gnutls_x509_privkey_verify_params (gnutls_x509_privkey_t key);
int gnutls_x509_privkey_export (gnutls_x509_privkey_t key, int gnutls_x509_privkey_export (gnutls_x509_privkey_t key,
gnutls_x509_crt_fmt_t format, gnutls_x509_crt_fmt_t format,
void *output_data, void *output_data,
size_t * output_data_size); size_t * output_data_size);
int gnutls_x509_privkey_export2 (gnutls_x509_privkey_t key,
gnutls_x509_crt_fmt_t format,
gnutls_datum_t * out);
int gnutls_x509_privkey_export_pkcs8 (gnutls_x509_privkey_t key, int gnutls_x509_privkey_export_pkcs8 (gnutls_x509_privkey_t key,
gnutls_x509_crt_fmt_t format, gnutls_x509_crt_fmt_t format,
const char *password, const char *password,
unsigned int flags, unsigned int flags,
void *output_data, void *output_data,
size_t * output_data_size); size_t * output_data_size);
int gnutls_x509_privkey_export2_pkcs8 (gnutls_x509_privkey_t key,
gnutls_x509_crt_fmt_t format,
const char *password,
unsigned int flags,
gnutls_datum_t * out);
int gnutls_x509_privkey_export_rsa_raw2 (gnutls_x509_privkey_t key, int gnutls_x509_privkey_export_rsa_raw2 (gnutls_x509_privkey_t key,
gnutls_datum_t * m, gnutls_datum_t * m,
gnutls_datum_t * e, gnutls_datum_t * e,
gnutls_datum_t * d, gnutls_datum_t * d,
gnutls_datum_t * p, gnutls_datum_t * p,
gnutls_datum_t * q, gnutls_datum_t * q,
gnutls_datum_t * u, gnutls_datum_t * u,
gnutls_datum_t * e1, gnutls_datum_t * e1,
gnutls_datum_t * e2); gnutls_datum_t * e2);
int gnutls_x509_privkey_export_rsa_raw (gnutls_x509_privkey_t key, int gnutls_x509_privkey_export_rsa_raw (gnutls_x509_privkey_t key,
skipping to change at line 870 skipping to change at line 908
int gnutls_x509_crq_set_attribute_by_oid (gnutls_x509_crq_t crq, int gnutls_x509_crq_set_attribute_by_oid (gnutls_x509_crq_t crq,
const char *oid, void *buf, const char *oid, void *buf,
size_t sizeof_buf); size_t sizeof_buf);
int gnutls_x509_crq_get_attribute_by_oid (gnutls_x509_crq_t crq, int gnutls_x509_crq_get_attribute_by_oid (gnutls_x509_crq_t crq,
const char *oid, int indx, const char *oid, int indx,
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_crq_export2 (gnutls_x509_crq_t crq,
gnutls_x509_crt_fmt_t format,
gnutls_datum_t * out);
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, int gnutls_x509_crq_set_private_key_usage_period (gnutls_x509_crq_t crq,
time_t activation, time_t activation,
time_t expiration); 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,
 End of changes. 8 change blocks. 
10 lines changed or deleted 56 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/