Headers diff: 3.1.9.1 vs 3.1.10
| abstract.h (3.1.9.1) | | abstract.h (3.1.10) | |
| | | | |
| skipping to change at line 39 | | skipping to change at line 39 | |
| #include <gnutls/openpgp.h> | | #include <gnutls/openpgp.h> | |
| #include <gnutls/tpm.h> | | #include <gnutls/tpm.h> | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" | | extern "C" | |
| { | | { | |
| #endif | | #endif | |
| | | | |
| /* Public key operations */ | | /* Public key operations */ | |
| | | | |
|
| | | #define GNUTLS_PUBKEY_VERIFY_FLAG_TLS_RSA 1 | |
| | | /* The following flag disables call to PIN callbacks etc. | |
| | | * Only works for TPM keys. | |
| | | */ | |
| | | #define GNUTLS_PUBKEY_DISABLE_CALLBACKS (1<<2) | |
| | | #define GNUTLS_PUBKEY_GET_OPENPGP_FINGERPRINT (1<<3) | |
| | | | |
| 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, | | typedef int (*gnutls_privkey_sign_func) (gnutls_privkey_t key, | |
| void *userdata, | | void *userdata, | |
| const gnutls_datum_t * raw_data, | | const gnutls_datum_t * raw_data, | |
| gnutls_datum_t * signature); | | gnutls_datum_t * signature); | |
| | | | |
| skipping to change at line 177 | | skipping to change at line 184 | |
| | | | |
| int | | int | |
| gnutls_pubkey_encrypt_data (gnutls_pubkey_t key, unsigned int flags, | | gnutls_pubkey_encrypt_data (gnutls_pubkey_t key, unsigned int flags, | |
| const gnutls_datum_t * plaintext, | | const gnutls_datum_t * plaintext, | |
| gnutls_datum_t * ciphertext); | | gnutls_datum_t * ciphertext); | |
| | | | |
| int gnutls_x509_crt_set_pubkey (gnutls_x509_crt_t crt, gnutls_pubkey_t key)
; | | int gnutls_x509_crt_set_pubkey (gnutls_x509_crt_t crt, gnutls_pubkey_t key)
; | |
| | | | |
| int gnutls_x509_crq_set_pubkey (gnutls_x509_crq_t crq, gnutls_pubkey_t key)
; | | int gnutls_x509_crq_set_pubkey (gnutls_x509_crq_t crq, gnutls_pubkey_t key)
; | |
| | | | |
|
| #define GNUTLS_PUBKEY_VERIFY_FLAG_TLS_RSA 1 | | | |
| /* The following flag disables call to PIN callbacks etc. | | | |
| * Only works for TPM keys. | | | |
| */ | | | |
| #define GNUTLS_PUBKEY_DISABLE_CALLBACKS (1<<2) | | | |
| int | | int | |
| gnutls_pubkey_verify_hash2 (gnutls_pubkey_t key, | | gnutls_pubkey_verify_hash2 (gnutls_pubkey_t key, | |
| gnutls_sign_algorithm_t algo, | | gnutls_sign_algorithm_t algo, | |
| unsigned int flags, | | unsigned int flags, | |
| const gnutls_datum_t * hash, | | const gnutls_datum_t * hash, | |
| const gnutls_datum_t * signature); | | const gnutls_datum_t * signature); | |
| | | | |
| int | | int | |
| gnutls_pubkey_get_verify_algorithm (gnutls_pubkey_t key, | | gnutls_pubkey_get_verify_algorithm (gnutls_pubkey_t key, | |
| const gnutls_datum_t * signature, | | const gnutls_datum_t * signature, | |
| | | | |
| skipping to change at line 212 | | skipping to change at line 214 | |
| | | | |
| int gnutls_privkey_init (gnutls_privkey_t * key); | | int gnutls_privkey_init (gnutls_privkey_t * key); | |
| void gnutls_privkey_deinit (gnutls_privkey_t key); | | void gnutls_privkey_deinit (gnutls_privkey_t key); | |
| | | | |
| void gnutls_privkey_set_pin_function (gnutls_privkey_t key, | | void gnutls_privkey_set_pin_function (gnutls_privkey_t key, | |
| gnutls_pin_callback_t fn, void *userd
ata); | | gnutls_pin_callback_t fn, void *userd
ata); | |
| | | | |
| int gnutls_privkey_get_pk_algorithm (gnutls_privkey_t key, | | int gnutls_privkey_get_pk_algorithm (gnutls_privkey_t key, | |
| unsigned int *bits); | | unsigned int *bits); | |
| gnutls_privkey_type_t gnutls_privkey_get_type (gnutls_privkey_t key); | | gnutls_privkey_type_t gnutls_privkey_get_type (gnutls_privkey_t key); | |
|
| | | int gnutls_privkey_status (gnutls_privkey_t key); | |
| | | | |
| #define GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE (1<<0) | | #define GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE (1<<0) | |
| #define GNUTLS_PRIVKEY_IMPORT_COPY (1<<1) | | #define GNUTLS_PRIVKEY_IMPORT_COPY (1<<1) | |
| /* The following flag disables call to PIN callbacks etc. | | /* The following flag disables call to PIN callbacks etc. | |
| * Only works for TPM keys. | | * Only works for TPM keys. | |
| */ | | */ | |
| #define GNUTLS_PRIVKEY_DISABLE_CALLBACKS (1<<2) | | #define GNUTLS_PRIVKEY_DISABLE_CALLBACKS (1<<2) | |
| 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); | |
| | | | |
| skipping to change at line 285 | | skipping to change at line 288 | |
| 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, | |
| const gnutls_datum_t * hash_data, | | const gnutls_datum_t * hash_data, | |
| gnutls_datum_t * signature); | | gnutls_datum_t * signature); | |
| | | | |
|
| | | int | |
| | | gnutls_privkey_sign_raw_data (gnutls_privkey_t key, | |
| | | unsigned flags, | |
| | | const gnutls_datum_t * data, | |
| | | gnutls_datum_t * signature); | |
| | | | |
| int gnutls_privkey_decrypt_data (gnutls_privkey_t key, | | int gnutls_privkey_decrypt_data (gnutls_privkey_t key, | |
| unsigned int flags, | | unsigned int flags, | |
| const gnutls_datum_t * ciphertext, | | const gnutls_datum_t * ciphertext, | |
| gnutls_datum_t * plaintext); | | gnutls_datum_t * plaintext); | |
| | | | |
| int gnutls_x509_crt_privkey_sign (gnutls_x509_crt_t crt, | | int gnutls_x509_crt_privkey_sign (gnutls_x509_crt_t crt, | |
| gnutls_x509_crt_t issuer, | | gnutls_x509_crt_t issuer, | |
| gnutls_privkey_t issuer_key, | | gnutls_privkey_t issuer_key, | |
| gnutls_digest_algorithm_t dig, | | gnutls_digest_algorithm_t dig, | |
| unsigned int flags); | | unsigned int flags); | |
| | | | |
End of changes. 4 change blocks. |
| 5 lines changed or deleted | | 14 lines changed or added | |
|
| gnutls.h (3.1.9.1) | | gnutls.h (3.1.10) | |
| | | | |
| 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.9" | | #define GNUTLS_VERSION "3.1.10" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 1 | | #define GNUTLS_VERSION_MINOR 1 | |
|
| #define GNUTLS_VERSION_PATCH 9 | | #define GNUTLS_VERSION_PATCH 10 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030109 | | #define GNUTLS_VERSION_NUMBER 0x03010a | |
| | | | |
| #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 1089 | | skipping to change at line 1089 | |
| */ | | */ | |
| int gnutls_session_set_data (gnutls_session_t session, | | int gnutls_session_set_data (gnutls_session_t session, | |
| const void *session_data, | | const void *session_data, | |
| size_t session_data_size); | | size_t session_data_size); | |
| int gnutls_session_get_data (gnutls_session_t session, void *session_data
, | | int gnutls_session_get_data (gnutls_session_t session, void *session_data
, | |
| size_t * session_data_size); | | size_t * session_data_size); | |
| int gnutls_session_get_data2 (gnutls_session_t session, | | int gnutls_session_get_data2 (gnutls_session_t session, | |
| gnutls_datum_t * data); | | gnutls_datum_t * data); | |
| void gnutls_session_get_random (gnutls_session_t session, gnutls_datum_t*
client, | | void gnutls_session_get_random (gnutls_session_t session, gnutls_datum_t*
client, | |
| gnutls_datum_t* server); | | gnutls_datum_t* server); | |
|
| | | char * gnutls_session_get_desc (gnutls_session_t session); | |
| | | | |
| int gnutls_session_set_premaster (gnutls_session_t session, unsigned int
entity, | | int gnutls_session_set_premaster (gnutls_session_t session, unsigned int
entity, | |
| gnutls_protocol_t version, | | gnutls_protocol_t version, | |
| 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_compression_method_t comp, | | gnutls_compression_method_t comp, | |
| const gnutls_datum_t* master, | | const gnutls_datum_t* master, | |
| const gnutls_datum_t * session_id); | | const gnutls_datum_t * session_id); | |
| | | | |
| | | | |
End of changes. 4 change blocks. |
| 3 lines changed or deleted | | 4 lines changed or added | |
|
| openpgp.h (3.1.9.1) | | openpgp.h (3.1.10) | |
| | | | |
| skipping to change at line 55 | | skipping to change at line 55 | |
| * | | * | |
| * Enumeration of different OpenPGP key formats. | | * Enumeration of different OpenPGP key formats. | |
| */ | | */ | |
| typedef enum gnutls_openpgp_crt_fmt | | typedef enum gnutls_openpgp_crt_fmt | |
| { | | { | |
| GNUTLS_OPENPGP_FMT_RAW, | | GNUTLS_OPENPGP_FMT_RAW, | |
| GNUTLS_OPENPGP_FMT_BASE64 | | GNUTLS_OPENPGP_FMT_BASE64 | |
| } gnutls_openpgp_crt_fmt_t; | | } gnutls_openpgp_crt_fmt_t; | |
| | | | |
| #define GNUTLS_OPENPGP_KEYID_SIZE 8 | | #define GNUTLS_OPENPGP_KEYID_SIZE 8 | |
|
| | | #define GNUTLS_OPENPGP_V4_FINGERPRINT_SIZE 20 | |
| typedef unsigned char gnutls_openpgp_keyid_t[GNUTLS_OPENPGP_KEYID_SIZE]; | | typedef unsigned char gnutls_openpgp_keyid_t[GNUTLS_OPENPGP_KEYID_SIZE]; | |
| | | | |
| /* gnutls_openpgp_cert_t should be defined in gnutls.h | | /* gnutls_openpgp_cert_t should be defined in gnutls.h | |
| */ | | */ | |
| | | | |
| /* initializes the memory for gnutls_openpgp_crt_t struct */ | | /* initializes the memory for gnutls_openpgp_crt_t struct */ | |
| int gnutls_openpgp_crt_init (gnutls_openpgp_crt_t * key); | | int gnutls_openpgp_crt_init (gnutls_openpgp_crt_t * key); | |
| /* 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); | |
| | | | |
| | | | |
| skipping to change at line 310 | | skipping to change at line 311 | |
| * @session: a TLS session | | * @session: a TLS session | |
| * @keyfpr: key fingerprint | | * @keyfpr: key fingerprint | |
| * @keyfpr_length: length of key fingerprint | | * @keyfpr_length: length of key fingerprint | |
| * @key: output key. | | * @key: output key. | |
| * | | * | |
| * A callback of this type is used to retrieve OpenPGP keys. Only | | * A callback of this type is used to retrieve OpenPGP keys. Only | |
| * useful on the server, and will only be used if the peer send a key | | * useful on the server, and will only be used if the peer send a key | |
| * fingerprint instead of a full key. See also | | * fingerprint instead of a full key. See also | |
| * gnutls_openpgp_set_recv_key_function(). | | * gnutls_openpgp_set_recv_key_function(). | |
| * | | * | |
|
| | | * The variable @key must be allocated using gnutls_malloc(). | |
| | | * | |
| * Returns: On success, %GNUTLS_E_SUCCESS (zero) is returned, | | * Returns: On success, %GNUTLS_E_SUCCESS (zero) is returned, | |
| * otherwise an error code is returned. | | * otherwise an error code is returned. | |
| */ | | */ | |
| typedef int (*gnutls_openpgp_recv_key_func) (gnutls_session_t session, | | typedef int (*gnutls_openpgp_recv_key_func) (gnutls_session_t session, | |
| const unsigned char *keyfpr, | | const unsigned char *keyfpr, | |
| unsigned int keyfpr_length, | | unsigned int keyfpr_length, | |
| gnutls_datum_t * key); | | gnutls_datum_t * key); | |
| | | | |
| void | | void | |
| gnutls_openpgp_set_recv_key_function (gnutls_session_t session, | | gnutls_openpgp_set_recv_key_function (gnutls_session_t session, | |
| | | | |
End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 3 lines changed or added | |
|
| tpm.h (3.1.9.1) | | tpm.h (3.1.10) | |
| | | | |
| skipping to change at line 43 | | skipping to change at line 43 | |
| | | | |
| struct tpm_key_list_st; | | struct tpm_key_list_st; | |
| typedef struct tpm_key_list_st *gnutls_tpm_key_list_t; | | typedef struct tpm_key_list_st *gnutls_tpm_key_list_t; | |
| | | | |
| #define GNUTLS_TPM_KEY_SIGNING (1<<1) | | #define GNUTLS_TPM_KEY_SIGNING (1<<1) | |
| #define GNUTLS_TPM_REGISTER_KEY (1<<2) | | #define GNUTLS_TPM_REGISTER_KEY (1<<2) | |
| #define GNUTLS_TPM_KEY_USER (1<<3) | | #define GNUTLS_TPM_KEY_USER (1<<3) | |
| | | | |
| /** | | /** | |
| * gnutls_tpmkey_fmt_t: | | * gnutls_tpmkey_fmt_t: | |
|
| * @GNUTLS_TPMKEY_FMT_DER: The portable data format. | | * @GNUTLS_TPMKEY_FMT_RAW: The portable data format. | |
| | | * @GNUTLS_TPMKEY_FMT_DER: An alias for the raw format. | |
| * @GNUTLS_TPMKEY_FMT_CTK_PEM: A custom data format used by some TPM tools. | | * @GNUTLS_TPMKEY_FMT_CTK_PEM: A custom data format used by some TPM tools. | |
| * | | * | |
| * Enumeration of different certificate encoding formats. | | * Enumeration of different certificate encoding formats. | |
| */ | | */ | |
| typedef enum | | typedef enum | |
| { | | { | |
|
| GNUTLS_TPMKEY_FMT_DER = 0, | | GNUTLS_TPMKEY_FMT_RAW = 0, | |
| | | GNUTLS_TPMKEY_FMT_DER = GNUTLS_TPMKEY_FMT_RAW, | |
| GNUTLS_TPMKEY_FMT_CTK_PEM = 1 | | GNUTLS_TPMKEY_FMT_CTK_PEM = 1 | |
| } gnutls_tpmkey_fmt_t; | | } gnutls_tpmkey_fmt_t; | |
| | | | |
| int | | int | |
| gnutls_tpm_privkey_generate (gnutls_pk_algorithm_t pk, unsigned int bits, | | gnutls_tpm_privkey_generate (gnutls_pk_algorithm_t pk, unsigned int bits, | |
| const char* srk_password, | | const char* srk_password, | |
| const char* key_password, | | const char* key_password, | |
| gnutls_tpmkey_fmt_t format, | | gnutls_tpmkey_fmt_t format, | |
| gnutls_x509_crt_fmt_t pub_format, | | gnutls_x509_crt_fmt_t pub_format, | |
| gnutls_datum_t* privkey, | | gnutls_datum_t* privkey, | |
| | | | |
End of changes. 2 change blocks. |
| 2 lines changed or deleted | | 4 lines changed or added | |
|
| x509.h (3.1.9.1) | | x509.h (3.1.10) | |
| | | | |
| skipping to change at line 134 | | skipping to change at line 134 | |
| 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, | | int gnutls_x509_crt_export2 (gnutls_x509_crt_t cert, | |
| gnutls_x509_crt_fmt_t format, | | gnutls_x509_crt_fmt_t format, | |
| gnutls_datum_t* out); | | 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_dn2 (gnutls_x509_crt_t cert, gnutls_datum_
t* dn); | |
| int gnutls_x509_crt_get_issuer_dn_oid (gnutls_x509_crt_t cert, int indx, | | int gnutls_x509_crt_get_issuer_dn_oid (gnutls_x509_crt_t cert, int indx, | |
| void *oid, size_t * oid_size); | | void *oid, size_t * oid_size); | |
| int gnutls_x509_crt_get_issuer_dn_by_oid (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_issuer_dn_by_oid (gnutls_x509_crt_t cert, | |
| const char *oid, int indx, | | const char *oid, int indx, | |
| unsigned int raw_flag, | | unsigned int raw_flag, | |
| void *buf, size_t * buf_size); | | void *buf, size_t * buf_size); | |
| int gnutls_x509_crt_get_dn (gnutls_x509_crt_t cert, char *buf, | | int gnutls_x509_crt_get_dn (gnutls_x509_crt_t cert, char *buf, | |
| size_t * buf_size); | | size_t * buf_size); | |
|
| | | int gnutls_x509_crt_get_dn2 (gnutls_x509_crt_t cert, gnutls_datum_t* dn); | |
| int gnutls_x509_crt_get_dn_oid (gnutls_x509_crt_t cert, int indx, | | int gnutls_x509_crt_get_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_dn_by_oid (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_dn_by_oid (gnutls_x509_crt_t cert, | |
| const char *oid, int indx, | | const char *oid, int indx, | |
| unsigned int raw_flag, void *buf, | | unsigned int raw_flag, void *buf, | |
| size_t * buf_size); | | size_t * buf_size); | |
| int gnutls_x509_crt_check_hostname (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_check_hostname (gnutls_x509_crt_t cert, | |
| const char *hostname); | | const char *hostname); | |
| | | | |
| int gnutls_x509_crt_get_signature_algorithm (gnutls_x509_crt_t cert); | | int gnutls_x509_crt_get_signature_algorithm (gnutls_x509_crt_t cert); | |
| | | | |
| skipping to change at line 532 | | skipping to change at line 534 | |
| 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, | | int gnutls_x509_crl_export2 (gnutls_x509_crl_t crl, | |
| gnutls_x509_crt_fmt_t format, | | gnutls_x509_crt_fmt_t format, | |
| gnutls_datum_t *out); | | 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 (gnutls_x509_crl_t crl, | |
| char *buf, size_t * sizeof_buf); | | char *buf, size_t * sizeof_buf); | |
|
| | | int gnutls_x509_crl_get_issuer_dn2 (gnutls_x509_crl_t crl, gnutls_datum_t
* dn); | |
| 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, | |
| void *buf, size_t * sizeof_buf)
; | | void *buf, size_t * sizeof_buf)
; | |
| int gnutls_x509_crl_get_dn_oid (gnutls_x509_crl_t crl, int indx, | | int gnutls_x509_crl_get_dn_oid (gnutls_x509_crl_t crl, int indx, | |
| void *oid, size_t * sizeof_oid); | | void *oid, size_t * sizeof_oid); | |
| | | | |
| int gnutls_x509_crl_get_signature_algorithm (gnutls_x509_crl_t crl); | | int gnutls_x509_crl_get_signature_algorithm (gnutls_x509_crl_t crl); | |
| int gnutls_x509_crl_get_signature (gnutls_x509_crl_t crl, | | int gnutls_x509_crl_get_signature (gnutls_x509_crl_t crl, | |
| char *sig, size_t * sizeof_sig); | | char *sig, size_t * sizeof_sig); | |
| | | | |
| skipping to change at line 917 | | skipping to change at line 920 | |
| void gnutls_x509_crq_deinit (gnutls_x509_crq_t crq); | | void gnutls_x509_crq_deinit (gnutls_x509_crq_t crq); | |
| int gnutls_x509_crq_import (gnutls_x509_crq_t crq, | | int gnutls_x509_crq_import (gnutls_x509_crq_t crq, | |
| const gnutls_datum_t * data, | | const gnutls_datum_t * data, | |
| gnutls_x509_crt_fmt_t format); | | gnutls_x509_crt_fmt_t format); | |
| | | | |
| int gnutls_x509_crq_get_private_key_usage_period (gnutls_x509_crq_t cert,
time_t* activation, time_t* expiration, | | int gnutls_x509_crq_get_private_key_usage_period (gnutls_x509_crq_t cert,
time_t* activation, time_t* expiration, | |
| unsigned int *critical); | | unsigned int *critical); | |
| | | | |
| int gnutls_x509_crq_get_dn (gnutls_x509_crq_t crq, char *buf, | | int gnutls_x509_crq_get_dn (gnutls_x509_crq_t crq, char *buf, | |
| size_t * sizeof_buf); | | size_t * sizeof_buf); | |
|
| | | int gnutls_x509_crq_get_dn2 (gnutls_x509_crq_t crq, gnutls_datum_t* dn); | |
| int gnutls_x509_crq_get_dn_oid (gnutls_x509_crq_t crq, int indx, | | int gnutls_x509_crq_get_dn_oid (gnutls_x509_crq_t crq, int indx, | |
| void *oid, size_t * sizeof_oid); | | void *oid, size_t * sizeof_oid); | |
| int gnutls_x509_crq_get_dn_by_oid (gnutls_x509_crq_t crq, | | int gnutls_x509_crq_get_dn_by_oid (gnutls_x509_crq_t crq, | |
| const char *oid, int indx, | | const char *oid, int indx, | |
| unsigned int raw_flag, void *buf, | | unsigned int raw_flag, void *buf, | |
| size_t * sizeof_buf); | | size_t * sizeof_buf); | |
| int gnutls_x509_crq_set_dn (gnutls_x509_crq_t crq, const char *dn, const
char** err); | | int gnutls_x509_crq_set_dn (gnutls_x509_crq_t crq, const char *dn, const
char** err); | |
| int gnutls_x509_crq_set_dn_by_oid (gnutls_x509_crq_t crq, | | int gnutls_x509_crq_set_dn_by_oid (gnutls_x509_crq_t crq, | |
| const char *oid, | | const char *oid, | |
| unsigned int raw_flag, | | unsigned int raw_flag, | |
| | | | |
| skipping to change at line 1037 | | skipping to change at line 1041 | |
| | | | |
| void | | void | |
| gnutls_x509_trust_list_deinit (gnutls_x509_trust_list_t list, unsigned in
t all); | | gnutls_x509_trust_list_deinit (gnutls_x509_trust_list_t list, unsigned in
t all); | |
| | | | |
| int gnutls_x509_trust_list_get_issuer(gnutls_x509_trust_list_t list, | | int gnutls_x509_trust_list_get_issuer(gnutls_x509_trust_list_t list, | |
| gnutls_x509_crt_t cert, gnutls_x509_crt_t* issuer, unsigned int flags); | | gnutls_x509_crt_t cert, gnutls_x509_crt_t* issuer, unsigned int flags); | |
| | | | |
| int | | int | |
| gnutls_x509_trust_list_add_cas (gnutls_x509_trust_list_t list, | | gnutls_x509_trust_list_add_cas (gnutls_x509_trust_list_t list, | |
| const gnutls_x509_crt_t * clist, int clist_size, unsigned int flags); | | const gnutls_x509_crt_t * clist, int clist_size, unsigned int flags); | |
|
| | | int gnutls_x509_trust_list_remove_cas(gnutls_x509_trust_list_t list, | |
| | | const gnutls_x509_crt_t * clist, | |
| | | int clist_size); | |
| | | | |
| int gnutls_x509_trust_list_add_named_crt (gnutls_x509_trust_list_t list, | | int gnutls_x509_trust_list_add_named_crt (gnutls_x509_trust_list_t list, | |
| gnutls_x509_crt_t cert, const void* name, size_t name_size, unsigned
int flags); | | gnutls_x509_crt_t cert, const void* name, size_t name_size, unsigned
int flags); | |
| | | | |
| #define GNUTLS_TL_VERIFY_CRL 1 | | #define GNUTLS_TL_VERIFY_CRL 1 | |
| int | | int | |
| gnutls_x509_trust_list_add_crls (gnutls_x509_trust_list_t list, | | gnutls_x509_trust_list_add_crls (gnutls_x509_trust_list_t list, | |
| const gnutls_x509_crl_t * crl_list, int crl_size, unsigned int flags, | | const gnutls_x509_crl_t * crl_list, int crl_size, unsigned int flags, | |
| unsigned int verification_flags); | | unsigned int verification_flags); | |
| | | | |
| | | | |
| skipping to change at line 1092 | | skipping to change at line 1099 | |
| | | | |
| int | | int | |
| gnutls_x509_trust_list_add_trust_file(gnutls_x509_trust_list_t list, | | gnutls_x509_trust_list_add_trust_file(gnutls_x509_trust_list_t list, | |
| const char* ca_file, | | const char* ca_file, | |
| const char* crl_file, | | const char* crl_file, | |
| gnutls_x509_crt_fmt_t type, | | gnutls_x509_crt_fmt_t type, | |
| unsigned int tl_flags, | | unsigned int tl_flags, | |
| unsigned int tl_vflags); | | unsigned int tl_vflags); | |
| | | | |
| int | | int | |
|
| | | gnutls_x509_trust_list_remove_trust_file(gnutls_x509_trust_list_t list, | |
| | | const char* ca_file, | |
| | | gnutls_x509_crt_fmt_t type); | |
| | | | |
| | | int | |
| | | gnutls_x509_trust_list_remove_trust_mem(gnutls_x509_trust_list_t list, | |
| | | const gnutls_datum_t * cas, | |
| | | gnutls_x509_crt_fmt_t type); | |
| | | | |
| | | int | |
| gnutls_x509_trust_list_add_system_trust(gnutls_x509_trust_list_t list, | | gnutls_x509_trust_list_add_system_trust(gnutls_x509_trust_list_t list, | |
| unsigned int tl_flags, unsigned int
tl_vflags); | | unsigned int tl_flags, unsigned int
tl_vflags); | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } | | } | |
| #endif | | #endif | |
| | | | |
| #endif /* GNUTLS_X509_H */ | | #endif /* GNUTLS_X509_H */ | |
| | | | |
End of changes. 7 change blocks. |
| 1 lines changed or deleted | | 18 lines changed or added | |
|
|