Headers diff: 3.0.12 vs 3.0.13
| abstract.h (3.0.12) | | abstract.h (3.0.13) | |
| | | | |
| skipping to change at line 277 | | skipping to change at line 277 | |
| 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 | | int | |
| gnutls_certificate_set_key (gnutls_certificate_credentials_t res, | | gnutls_certificate_set_key (gnutls_certificate_credentials_t res, | |
| const char** names, | | const char** names, | |
| int names_size, | | int names_size, | |
| gnutls_pcert_st * pcert_list, | | gnutls_pcert_st * pcert_list, | |
| int pcert_list_size, | | int pcert_list_size, | |
| gnutls_privkey_t key); | | gnutls_privkey_t key); | |
| | | | |
| | | | |
End of changes. 1 change blocks. |
| 2 lines changed or deleted | | 2 lines changed or added | |
|
| dtls.h (3.0.12) | | dtls.h (3.0.13) | |
| | | | |
| skipping to change at line 46 | | skipping to change at line 46 | |
| | | | |
| #define GNUTLS_COOKIE_KEY_SIZE 16 | | #define GNUTLS_COOKIE_KEY_SIZE 16 | |
| | | | |
| void gnutls_dtls_set_timeouts (gnutls_session_t session, | | void gnutls_dtls_set_timeouts (gnutls_session_t session, | |
| unsigned int retrans_timeout, | | unsigned int retrans_timeout, | |
| unsigned int total_timeout); | | unsigned int total_timeout); | |
| | | | |
| unsigned int gnutls_dtls_get_mtu (gnutls_session_t session); | | unsigned int gnutls_dtls_get_mtu (gnutls_session_t session); | |
| unsigned int gnutls_dtls_get_data_mtu (gnutls_session_t session); | | unsigned int gnutls_dtls_get_data_mtu (gnutls_session_t session); | |
| | | | |
|
| void gnutls_dtls_set_mtu (gnutls_session_t session, unsigned int mtu); | | void gnutls_dtls_set_mtu (gnutls_session_t session, unsigned int mtu); | |
| | | | |
| | | unsigned int gnutls_dtls_get_timeout (gnutls_session_t session); | |
| | | | |
| /** | | /** | |
| * gnutls_dtls_prestate_st: | | * gnutls_dtls_prestate_st: | |
| * @record_seq: record sequence number | | * @record_seq: record sequence number | |
| * @hsk_read_seq: handshake read sequence number | | * @hsk_read_seq: handshake read sequence number | |
| * @hsk_write_seq: handshake write sequence number | | * @hsk_write_seq: handshake write sequence number | |
| * | | * | |
| * DTLS cookie prestate struct. This is usually never modified by | | * DTLS cookie prestate struct. This is usually never modified by | |
| * the application, it is used to carry the cookie data between | | * the application, it is used to carry the cookie data between | |
| * gnutls_dtls_cookie_send(), gnutls_dtls_cookie_verify() and | | * gnutls_dtls_cookie_send(), gnutls_dtls_cookie_verify() and | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 3 lines changed or added | |
|
| gnutls.h (3.0.12) | | gnutls.h (3.0.13) | |
| | | | |
| skipping to change at line 24 | | skipping to change at line 24 | |
| * WITHOUT ANY WARRANTY; without even the implied warranty of | | * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| * Lesser General Public License for more details. | | * Lesser General Public License for more details. | |
| * | | * | |
| * You should have received a copy of the GNU Lesser General Public License | | * You should have received a copy of the GNU Lesser General Public License | |
| * along with this program. If not, see <http://www.gnu.org/licenses/> | | * along with this program. If not, see <http://www.gnu.org/licenses/> | |
| * | | * | |
| */ | | */ | |
| | | | |
| /* This file contains the types and prototypes for all the | | /* This file contains the types and prototypes for all the | |
|
| * high level functionality of gnutls main library. For the | | * high level functionality of the gnutls main library. | |
| * extra functionality (which is under the GNU GPL license) check | | | |
| * the gnutls/extra.h header. The openssl compatibility layer is | | | |
| * in gnutls/openssl.h. | | | |
| * | | * | |
|
| * The low level cipher functionality is in libgcrypt. Check | | * If the optional C++ binding was built, it is available in | |
| * gcrypt.h | | * gnutls/gnutlsxx.h. | |
| | | * | |
| | | * The openssl compatibility layer (which is under the GNU GPL | |
| | | * license) is in gnutls/openssl.h. | |
| | | * | |
| | | * The low level cipher functionality is in gnutls/crypto.h. | |
| */ | | */ | |
| | | | |
| #ifndef GNUTLS_H | | #ifndef GNUTLS_H | |
| #define GNUTLS_H | | #define GNUTLS_H | |
| | | | |
| /* Get size_t. */ | | /* Get size_t. */ | |
| #include <stddef.h> | | #include <stddef.h> | |
| /* Get ssize_t. */ | | /* Get ssize_t. */ | |
| #ifndef HAVE_SSIZE_T | | #ifndef HAVE_SSIZE_T | |
| #define HAVE_SSIZE_T | | #define HAVE_SSIZE_T | |
| | | | |
| skipping to change at line 52 | | 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.0.12" | | #define GNUTLS_VERSION "3.0.13" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 0 | | #define GNUTLS_VERSION_MINOR 0 | |
|
| #define GNUTLS_VERSION_PATCH 12 | | #define GNUTLS_VERSION_PATCH 13 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x03000c | | #define GNUTLS_VERSION_NUMBER 0x03000d | |
| | | | |
| #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 526 | | skipping to change at line 528 | |
| GNUTLS_DTLS1_0 = 5, | | GNUTLS_DTLS1_0 = 5, | |
| GNUTLS_VERSION_MAX = GNUTLS_DTLS1_0, | | GNUTLS_VERSION_MAX = GNUTLS_DTLS1_0, | |
| GNUTLS_VERSION_UNKNOWN = 0xff | | GNUTLS_VERSION_UNKNOWN = 0xff | |
| } gnutls_protocol_t; | | } gnutls_protocol_t; | |
| | | | |
| /** | | /** | |
| * gnutls_certificate_type_t: | | * gnutls_certificate_type_t: | |
| * @GNUTLS_CRT_UNKNOWN: Unknown certificate type. | | * @GNUTLS_CRT_UNKNOWN: Unknown certificate type. | |
| * @GNUTLS_CRT_X509: X.509 Certificate. | | * @GNUTLS_CRT_X509: X.509 Certificate. | |
| * @GNUTLS_CRT_OPENPGP: OpenPGP certificate. | | * @GNUTLS_CRT_OPENPGP: OpenPGP certificate. | |
|
| | | * @GNUTLS_CRT_RAW: Raw public key (SubjectPublicKey) | |
| * | | * | |
| * Enumeration of different certificate types. | | * Enumeration of different certificate types. | |
| */ | | */ | |
| typedef enum | | typedef enum | |
| { | | { | |
| GNUTLS_CRT_UNKNOWN = 0, | | GNUTLS_CRT_UNKNOWN = 0, | |
| GNUTLS_CRT_X509 = 1, | | GNUTLS_CRT_X509 = 1, | |
|
| GNUTLS_CRT_OPENPGP = 2 | | GNUTLS_CRT_OPENPGP = 2, | |
| | | GNUTLS_CRT_RAW = 3 | |
| } gnutls_certificate_type_t; | | } gnutls_certificate_type_t; | |
| | | | |
| /** | | /** | |
| * gnutls_x509_crt_fmt_t: | | * gnutls_x509_crt_fmt_t: | |
| * @GNUTLS_X509_FMT_DER: X.509 certificate in DER format (binary). | | * @GNUTLS_X509_FMT_DER: X.509 certificate in DER format (binary). | |
| * @GNUTLS_X509_FMT_PEM: X.509 certificate in PEM format (text). | | * @GNUTLS_X509_FMT_PEM: X.509 certificate in PEM format (text). | |
| * | | * | |
| * Enumeration of different certificate encoding formats. | | * Enumeration of different certificate encoding formats. | |
| */ | | */ | |
| typedef enum | | typedef enum | |
| { | | { | |
| GNUTLS_X509_FMT_DER = 0, | | GNUTLS_X509_FMT_DER = 0, | |
| GNUTLS_X509_FMT_PEM = 1 | | GNUTLS_X509_FMT_PEM = 1 | |
| } gnutls_x509_crt_fmt_t; | | } gnutls_x509_crt_fmt_t; | |
| | | | |
| /** | | /** | |
| * gnutls_certificate_print_formats_t: | | * gnutls_certificate_print_formats_t: | |
| * @GNUTLS_CRT_PRINT_FULL: Full information about certificate. | | * @GNUTLS_CRT_PRINT_FULL: Full information about certificate. | |
|
| | | * @GNUTLS_CRT_PRINT_COMPACT: Information about certificate name in one lin
e, plus identification of the public key. | |
| * @GNUTLS_CRT_PRINT_ONELINE: Information about certificate in one line. | | * @GNUTLS_CRT_PRINT_ONELINE: Information about certificate in one line. | |
| * @GNUTLS_CRT_PRINT_UNSIGNED_FULL: All info for an unsigned certificate. | | * @GNUTLS_CRT_PRINT_UNSIGNED_FULL: All info for an unsigned certificate. | |
| * | | * | |
| * Enumeration of different certificate printing variants. | | * Enumeration of different certificate printing variants. | |
| */ | | */ | |
| typedef enum gnutls_certificate_print_formats | | typedef enum gnutls_certificate_print_formats | |
| { | | { | |
| GNUTLS_CRT_PRINT_FULL = 0, | | GNUTLS_CRT_PRINT_FULL = 0, | |
| GNUTLS_CRT_PRINT_ONELINE = 1, | | GNUTLS_CRT_PRINT_ONELINE = 1, | |
|
| GNUTLS_CRT_PRINT_UNSIGNED_FULL = 2 | | GNUTLS_CRT_PRINT_UNSIGNED_FULL = 2, | |
| | | GNUTLS_CRT_PRINT_COMPACT = 3 | |
| } gnutls_certificate_print_formats_t; | | } gnutls_certificate_print_formats_t; | |
| | | | |
| #define GNUTLS_PK_ECC GNUTLS_PK_EC | | #define GNUTLS_PK_ECC GNUTLS_PK_EC | |
| /** | | /** | |
| * gnutls_pk_algorithm_t: | | * gnutls_pk_algorithm_t: | |
| * @GNUTLS_PK_UNKNOWN: Unknown public-key algorithm. | | * @GNUTLS_PK_UNKNOWN: Unknown public-key algorithm. | |
| * @GNUTLS_PK_RSA: RSA public-key algorithm. | | * @GNUTLS_PK_RSA: RSA public-key algorithm. | |
| * @GNUTLS_PK_DSA: DSA public-key algorithm. | | * @GNUTLS_PK_DSA: DSA public-key algorithm. | |
| * @GNUTLS_PK_DH: Diffie-Hellman algorithm. Used to generate parameters. | | * @GNUTLS_PK_DH: Diffie-Hellman algorithm. Used to generate parameters. | |
| * @GNUTLS_PK_EC: Elliptic curve algorithm. Used to generate parameters. | | * @GNUTLS_PK_EC: Elliptic curve algorithm. Used to generate parameters. | |
| | | | |
| skipping to change at line 654 | | skipping to change at line 660 | |
| 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_SECP192R1, | |
| } gnutls_ecc_curve_t; | | } gnutls_ecc_curve_t; | |
| | | | |
|
| | | #define GNUTLS_SEC_PARAM_WEAK GNUTLS_SEC_PARAM_LOW | |
| | | | |
| /** | | /** | |
| * 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_LOW: low security level | |
| * @GNUTLS_SEC_PARAM_LOW: 80 bits of security | | * @GNUTLS_SEC_PARAM_LEGACY: 96 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 | |
| * | | * | |
|
| * Enumeration of security parameters for passive attacks | | * Enumeration of security parameters for passive attacks. | |
| */ | | */ | |
| typedef enum | | typedef enum | |
| { | | { | |
| GNUTLS_SEC_PARAM_UNKNOWN, | | GNUTLS_SEC_PARAM_UNKNOWN, | |
|
| GNUTLS_SEC_PARAM_WEAK, | | GNUTLS_SEC_PARAM_LOW = 1, | |
| GNUTLS_SEC_PARAM_LOW, | | GNUTLS_SEC_PARAM_LEGACY = 2, | |
| GNUTLS_SEC_PARAM_NORMAL, | | GNUTLS_SEC_PARAM_NORMAL = 3, | |
| GNUTLS_SEC_PARAM_HIGH, | | GNUTLS_SEC_PARAM_HIGH = 4, | |
| GNUTLS_SEC_PARAM_ULTRA | | GNUTLS_SEC_PARAM_ULTRA = 5, | |
| } gnutls_sec_param_t; | | } gnutls_sec_param_t; | |
| | | | |
| /** | | /** | |
| * gnutls_channel_binding_t: | | * gnutls_channel_binding_t: | |
| * @GNUTLS_CB_TLS_UNIQUE: "tls-unique" (RFC 5929) channel binding | | * @GNUTLS_CB_TLS_UNIQUE: "tls-unique" (RFC 5929) channel binding | |
| * | | * | |
| * Enumeration of support channel binding types. | | * Enumeration of support channel binding types. | |
| */ | | */ | |
| typedef enum | | typedef enum | |
| { | | { | |
| | | | |
| skipping to change at line 796 | | skipping to change at line 804 | |
| gnutls_mac_algorithm_t gnutls_mac_get_id (const char *name); | | gnutls_mac_algorithm_t gnutls_mac_get_id (const char *name); | |
| gnutls_compression_method_t gnutls_compression_get_id (const char *name); | | gnutls_compression_method_t gnutls_compression_get_id (const char *name); | |
| gnutls_cipher_algorithm_t gnutls_cipher_get_id (const char *name); | | gnutls_cipher_algorithm_t gnutls_cipher_get_id (const char *name); | |
| gnutls_kx_algorithm_t gnutls_kx_get_id (const char *name); | | gnutls_kx_algorithm_t gnutls_kx_get_id (const char *name); | |
| gnutls_protocol_t gnutls_protocol_get_id (const char *name); | | gnutls_protocol_t gnutls_protocol_get_id (const char *name); | |
| gnutls_certificate_type_t gnutls_certificate_type_get_id (const char *nam
e); | | gnutls_certificate_type_t gnutls_certificate_type_get_id (const char *nam
e); | |
| gnutls_pk_algorithm_t gnutls_pk_get_id (const char *name); | | gnutls_pk_algorithm_t gnutls_pk_get_id (const char *name); | |
| gnutls_sign_algorithm_t gnutls_sign_get_id (const char *name); | | gnutls_sign_algorithm_t gnutls_sign_get_id (const char *name); | |
| | | | |
| /* list supported algorithms */ | | /* list supported algorithms */ | |
|
| | | const gnutls_ecc_curve_t * gnutls_ecc_curve_list (void); | |
| 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, | |
| unsigned char *cs_id, | | unsigned char *cs_id, | |
| | | | |
| skipping to change at line 919 | | skipping to change at line 928 | |
| 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_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); | |
| | | | |
|
| | | int gnutls_priority_certificate_type_list (gnutls_priority_t pcache, cons | |
| | | t unsigned int** list); | |
| | | int gnutls_priority_sign_list (gnutls_priority_t pcache, const unsigned i | |
| | | nt** list); | |
| | | int gnutls_priority_protocol_list (gnutls_priority_t pcache, const unsign | |
| | | ed int** list); | |
| | | int gnutls_priority_compression_list (gnutls_priority_t pcache, const uns | |
| | | igned int** list); | |
| | | int gnutls_priority_ecc_curve_list (gnutls_priority_t pcache, const unsig | |
| | | ned int** list); | |
| | | | |
| /* for compatibility | | /* for compatibility | |
| */ | | */ | |
| int gnutls_set_default_priority (gnutls_session_t session); | | int gnutls_set_default_priority (gnutls_session_t session); | |
| | | | |
| /* Returns the name of a cipher suite */ | | /* Returns the name of a cipher suite */ | |
| const char *gnutls_cipher_suite_get_name (gnutls_kx_algorithm_t | | const char *gnutls_cipher_suite_get_name (gnutls_kx_algorithm_t | |
| kx_algorithm, | | kx_algorithm, | |
| gnutls_cipher_algorithm_t | | gnutls_cipher_algorithm_t | |
| cipher_algorithm, | | cipher_algorithm, | |
| gnutls_mac_algorithm_t | | gnutls_mac_algorithm_t | |
| | | | |
| skipping to change at line 1434 | | skipping to change at line 1449 | |
| 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, void *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); | |
| | | | |
| void | | void | |
| gnutls_psk_set_server_params_function (gnutls_psk_server_credentials_t | | gnutls_psk_set_server_params_function (gnutls_psk_server_credentials_t | |
| res, | | res, | |
| gnutls_params_function * func); | | gnutls_params_function * func); | |
| | | | |
| skipping to change at line 1632 | | skipping to change at line 1647 | |
| void | | void | |
| gnutls_certificate_set_params_function (gnutls_certificate_credentials_
t | | gnutls_certificate_set_params_function (gnutls_certificate_credentials_
t | |
| res, | | res, | |
| gnutls_params_function * func); | | gnutls_params_function * func); | |
| void gnutls_anon_set_params_function (gnutls_anon_server_credentials_t re
s, | | void gnutls_anon_set_params_function (gnutls_anon_server_credentials_t re
s, | |
| gnutls_params_function * func); | | gnutls_params_function * func); | |
| void gnutls_psk_set_params_function (gnutls_psk_server_credentials_t res, | | void gnutls_psk_set_params_function (gnutls_psk_server_credentials_t res, | |
| gnutls_params_function * func); | | gnutls_params_function * func); | |
| | | | |
| int gnutls_hex2bin (const char *hex_data, size_t hex_size, | | int gnutls_hex2bin (const char *hex_data, size_t hex_size, | |
|
| char *bin_data, size_t * bin_size); | | void *bin_data, size_t * bin_size); | |
| | | | |
| | | /* Trust on first use (or ssh like) functions */ | |
| | | | |
| | | /* stores the provided information to a database | |
| | | */ | |
| | | typedef int (*gnutls_tdb_store_func) (const char* db_name, | |
| | | const char* host, | |
| | | const char* service, | |
| | | time_t expiration, | |
| | | const gnutls_datum_t* pubkey); | |
| | | | |
| | | typedef int (*gnutls_tdb_store_commitment_func) (const char* db_name, | |
| | | const char* host, | |
| | | const char* service, | |
| | | time_t expiration, | |
| | | gnutls_digest_algorithm_t hash | |
| | | _algo, | |
| | | const gnutls_datum_t* hash); | |
| | | | |
| | | /* searches for the provided host/service pair that match the | |
| | | * provided public key in the database. */ | |
| | | typedef int (*gnutls_tdb_verify_func) (const char* db_name, | |
| | | const char* host, | |
| | | const char* service, | |
| | | const gnutls_datum_t *pubkey); | |
| | | | |
| | | struct gnutls_tdb_int; | |
| | | typedef struct gnutls_tdb_int *gnutls_tdb_t; | |
| | | | |
| | | int gnutls_tdb_init(gnutls_tdb_t*); | |
| | | void gnutls_tdb_set_store_func(gnutls_tdb_t, gnutls_tdb_store_func); | |
| | | void gnutls_tdb_set_store_commitment_func(gnutls_tdb_t, gnutls_tdb_store_ | |
| | | commitment_func); | |
| | | void gnutls_tdb_set_verify_func(gnutls_tdb_t, gnutls_tdb_verify_func); | |
| | | void gnutls_tdb_deinit(gnutls_tdb_t); | |
| | | | |
| | | int gnutls_verify_stored_pubkey(const char* db_name, | |
| | | gnutls_tdb_t, | |
| | | const char* host, | |
| | | const char* service, | |
| | | gnutls_certificate_type_t cert_type, | |
| | | const gnutls_datum_t * cert, unsigned int flags | |
| | | ); | |
| | | | |
| | | int gnutls_store_commitment(const char* db_name, | |
| | | gnutls_tdb_t, | |
| | | const char* host, | |
| | | const char* service, | |
| | | gnutls_digest_algorithm_t hash_algo, | |
| | | const gnutls_datum_t* hash, | |
| | | time_t expiration, | |
| | | unsigned int flags); | |
| | | | |
| | | int gnutls_store_pubkey(const char* db_name, | |
| | | gnutls_tdb_t, | |
| | | const char* host, | |
| | | const char* service, | |
| | | gnutls_certificate_type_t cert_type, | |
| | | const gnutls_datum_t * cert, | |
| | | time_t expiration, | |
| | | unsigned int flags); | |
| | | | |
| /* Gnutls error codes. The mapping to a TLS alert is also shown in | | /* Gnutls error codes. The mapping to a TLS alert is also shown in | |
| * comments. | | * comments. | |
| */ | | */ | |
| | | | |
| #define GNUTLS_E_SUCCESS 0 | | #define GNUTLS_E_SUCCESS 0 | |
| #define GNUTLS_E_UNKNOWN_COMPRESSION_ALGORITHM -3 | | #define GNUTLS_E_UNKNOWN_COMPRESSION_ALGORITHM -3 | |
| #define GNUTLS_E_UNKNOWN_CIPHER_TYPE -6 | | #define GNUTLS_E_UNKNOWN_CIPHER_TYPE -6 | |
| #define GNUTLS_E_LARGE_PACKET -7 | | #define GNUTLS_E_LARGE_PACKET -7 | |
| #define GNUTLS_E_UNSUPPORTED_VERSION_PACKET -8 /* GNUTLS_A_PROTOCOL_VERSIO
N */ | | #define GNUTLS_E_UNSUPPORTED_VERSION_PACKET -8 /* GNUTLS_A_PROTOCOL_VERSIO
N */ | |
| | | | |
| skipping to change at line 1805 | | skipping to change at line 1878 | |
| | | | |
| #define GNUTLS_E_CRYPTO_INIT_FAILED -318 | | #define GNUTLS_E_CRYPTO_INIT_FAILED -318 | |
| #define GNUTLS_E_TIMEDOUT -319 | | #define GNUTLS_E_TIMEDOUT -319 | |
| #define GNUTLS_E_USER_ERROR -320 | | #define GNUTLS_E_USER_ERROR -320 | |
| #define GNUTLS_E_ECC_NO_SUPPORTED_CURVES -321 | | #define GNUTLS_E_ECC_NO_SUPPORTED_CURVES -321 | |
| #define GNUTLS_E_ECC_UNSUPPORTED_CURVE -322 | | #define GNUTLS_E_ECC_UNSUPPORTED_CURVE -322 | |
| #define GNUTLS_E_PKCS11_REQUESTED_OBJECT_NOT_AVAILBLE -323 | | #define GNUTLS_E_PKCS11_REQUESTED_OBJECT_NOT_AVAILBLE -323 | |
| #define GNUTLS_E_CERTIFICATE_LIST_UNSORTED -324 | | #define GNUTLS_E_CERTIFICATE_LIST_UNSORTED -324 | |
| #define GNUTLS_E_ILLEGAL_PARAMETER -325 | | #define GNUTLS_E_ILLEGAL_PARAMETER -325 | |
| #define GNUTLS_E_NO_PRIORITIES_WERE_SET -326 | | #define GNUTLS_E_NO_PRIORITIES_WERE_SET -326 | |
|
| | | #define GNUTLS_E_X509_UNSUPPORTED_EXTENSION -327 | |
| | | #define GNUTLS_E_SESSION_EOF -328 | |
| | | | |
| #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 | |
| | | | |
| | | | |
End of changes. 18 change blocks. |
| 21 lines changed or deleted | | 104 lines changed or added | |
|
| ocsp.h (3.0.12) | | ocsp.h (3.0.13) | |
| | | | |
| skipping to change at line 42 | | skipping to change at line 42 | |
| #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
t/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_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 | |
| | | | |
| skipping to change at line 221 | | skipping to change at line 223 | |
| int gnutls_ocsp_resp_get_version (gnutls_ocsp_resp_t resp); | | int gnutls_ocsp_resp_get_version (gnutls_ocsp_resp_t resp); | |
| int gnutls_ocsp_resp_get_responder (gnutls_ocsp_resp_t resp, | | int gnutls_ocsp_resp_get_responder (gnutls_ocsp_resp_t resp, | |
| gnutls_datum_t *dn); | | gnutls_datum_t *dn); | |
| time_t gnutls_ocsp_resp_get_produced (gnutls_ocsp_resp_t resp); | | time_t gnutls_ocsp_resp_get_produced (gnutls_ocsp_resp_t resp); | |
| int gnutls_ocsp_resp_get_single (gnutls_ocsp_resp_t resp, | | int gnutls_ocsp_resp_get_single (gnutls_ocsp_resp_t resp, | |
| unsigned indx, | | unsigned indx, | |
| gnutls_digest_algorithm_t *digest, | | gnutls_digest_algorithm_t *digest, | |
| gnutls_datum_t *issuer_name_hash, | | gnutls_datum_t *issuer_name_hash, | |
| gnutls_datum_t *issuer_key_hash, | | gnutls_datum_t *issuer_key_hash, | |
| gnutls_datum_t *serial_number, | | gnutls_datum_t *serial_number, | |
|
| int *cert_status, | | unsigned int *cert_status, | |
| time_t *this_update, | | time_t *this_update, | |
| time_t *next_update, | | time_t *next_update, | |
| time_t *revocation_time, | | time_t *revocation_time, | |
|
| int *revocation_reason); | | unsigned int *revocation_reason); | |
| int gnutls_ocsp_resp_get_extension (gnutls_ocsp_resp_t resp, | | int gnutls_ocsp_resp_get_extension (gnutls_ocsp_resp_t resp, | |
| unsigned indx, | | unsigned indx, | |
| gnutls_datum_t *oid, | | gnutls_datum_t *oid, | |
| unsigned int *critical, | | unsigned int *critical, | |
| gnutls_datum_t *data); | | gnutls_datum_t *data); | |
| int gnutls_ocsp_resp_get_nonce (gnutls_ocsp_resp_t resp, | | int gnutls_ocsp_resp_get_nonce (gnutls_ocsp_resp_t resp, | |
| unsigned int *critical, | | unsigned int *critical, | |
| gnutls_datum_t *nonce); | | gnutls_datum_t *nonce); | |
| int gnutls_ocsp_resp_get_signature_algorithm (gnutls_ocsp_resp_t resp); | | int gnutls_ocsp_resp_get_signature_algorithm (gnutls_ocsp_resp_t resp); | |
| int gnutls_ocsp_resp_get_signature (gnutls_ocsp_resp_t resp, | | int gnutls_ocsp_resp_get_signature (gnutls_ocsp_resp_t resp, | |
| gnutls_datum_t *sig); | | gnutls_datum_t *sig); | |
| int gnutls_ocsp_resp_get_certs (gnutls_ocsp_resp_t resp, | | int gnutls_ocsp_resp_get_certs (gnutls_ocsp_resp_t resp, | |
| gnutls_x509_crt_t ** certs, | | gnutls_x509_crt_t ** certs, | |
| size_t *ncerts); | | size_t *ncerts); | |
| | | | |
| 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 signercert, | | gnutls_x509_crt_t signercert, | |
|
| unsigned *verify, | | unsigned int*verify, | |
| 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 *verify, | | unsigned int*verify, | |
| int flags); | | unsigned int flags); | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } | | } | |
| #endif | | #endif | |
| | | | |
| #endif /* GNUTLS_OCSP_H */ | | #endif /* GNUTLS_OCSP_H */ | |
| | | | |
End of changes. 6 change blocks. |
| 6 lines changed or deleted | | 8 lines changed or added | |
|
| openssl.h (3.0.12) | | openssl.h (3.0.13) | |
| | | | |
| skipping to change at line 28 | | skipping to change at line 28 | |
| * along with GnuTLS-EXTRA; if not, write to the Free Software | | * along with GnuTLS-EXTRA; if not, write to the Free Software | |
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA | | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA | |
| * 02110-1301, USA. | | * 02110-1301, USA. | |
| * | | * | |
| */ | | */ | |
| | | | |
| /* WARNING: Error functions aren't currently thread-safe */ | | /* WARNING: Error functions aren't currently thread-safe */ | |
| | | | |
| /* This file contains prototypes about the OpenSSL compatibility layer | | /* This file contains prototypes about the OpenSSL compatibility layer | |
| * in GnuTLS. GnuTLS is not a complete replacement of OPENSSL so this | | * in GnuTLS. GnuTLS is not a complete replacement of OPENSSL so this | |
|
| * compatibility layer only support limited OpenSSL functionality. | | * compatibility layer only supports limited OpenSSL functionality. | |
| * | | * | |
| * New programs should avoid using this compatibility layer, and use | | * New programs should avoid using this compatibility layer, and use | |
| * the native GnuTLS API directly. | | * the native GnuTLS API directly. | |
| */ | | */ | |
| | | | |
| #ifndef GNUTLS_OPENSSL_H | | #ifndef GNUTLS_OPENSSL_H | |
| #define GNUTLS_OPENSSL_H | | #define GNUTLS_OPENSSL_H | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" | | extern "C" | |
| { | | { | |
| #endif | | #endif | |
| | | | |
| #include <gnutls/gnutls.h> | | #include <gnutls/gnutls.h> | |
| | | | |
|
| /* Extra definitions that do not longer exist in gnutls. | | /* Extra definitions that no longer exist in gnutls. | |
| */ | | */ | |
| #define GNUTLS_X509_CN_SIZE 256 | | #define GNUTLS_X509_CN_SIZE 256 | |
| #define GNUTLS_X509_C_SIZE 3 | | #define GNUTLS_X509_C_SIZE 3 | |
| #define GNUTLS_X509_O_SIZE 256 | | #define GNUTLS_X509_O_SIZE 256 | |
| #define GNUTLS_X509_OU_SIZE 256 | | #define GNUTLS_X509_OU_SIZE 256 | |
| #define GNUTLS_X509_L_SIZE 256 | | #define GNUTLS_X509_L_SIZE 256 | |
| #define GNUTLS_X509_S_SIZE 256 | | #define GNUTLS_X509_S_SIZE 256 | |
| #define GNUTLS_X509_EMAIL_SIZE 256 | | #define GNUTLS_X509_EMAIL_SIZE 256 | |
| | | | |
| typedef struct | | typedef struct | |
| | | | |
End of changes. 2 change blocks. |
| 2 lines changed or deleted | | 2 lines changed or added | |
|
| pkcs11.h (3.0.12) | | pkcs11.h (3.0.13) | |
| | | | |
| skipping to change at line 131 | | skipping to change at line 131 | |
| | | | |
| #define GNUTLS_PKCS11_FLAG_MANUAL 0 /* Manual loading of libraries */ | | #define GNUTLS_PKCS11_FLAG_MANUAL 0 /* Manual loading of libraries */ | |
| #define GNUTLS_PKCS11_FLAG_AUTO 1 /* Automatically load libraries by
reading /etc/gnutls/pkcs11.conf */ | | #define GNUTLS_PKCS11_FLAG_AUTO 1 /* Automatically load libraries by
reading /etc/gnutls/pkcs11.conf */ | |
| | | | |
| /* pkcs11.conf format: | | /* pkcs11.conf format: | |
| * load = /lib/xxx-pkcs11.so | | * load = /lib/xxx-pkcs11.so | |
| * load = /lib/yyy-pkcs11.so | | * load = /lib/yyy-pkcs11.so | |
| */ | | */ | |
| | | | |
| int gnutls_pkcs11_init (unsigned int flags, const char *deprecated_config_f
ile); | | int gnutls_pkcs11_init (unsigned int flags, const char *deprecated_config_f
ile); | |
|
| | | int gnutls_pkcs11_reinit (void); | |
| void gnutls_pkcs11_deinit (void); | | void gnutls_pkcs11_deinit (void); | |
| void gnutls_pkcs11_set_token_function (gnutls_pkcs11_token_callback_t fn, | | void gnutls_pkcs11_set_token_function (gnutls_pkcs11_token_callback_t fn, | |
| void *userdata); | | void *userdata); | |
| | | | |
| void gnutls_pkcs11_set_pin_function (gnutls_pkcs11_pin_callback_t fn, | | void gnutls_pkcs11_set_pin_function (gnutls_pkcs11_pin_callback_t fn, | |
| void *userdata); | | void *userdata); | |
| int gnutls_pkcs11_add_provider (const char *name, const char *params); | | int gnutls_pkcs11_add_provider (const char *name, const char *params); | |
| int gnutls_pkcs11_obj_init (gnutls_pkcs11_obj_t * obj); | | int gnutls_pkcs11_obj_init (gnutls_pkcs11_obj_t * obj); | |
| | | | |
| #define GNUTLS_PKCS11_OBJ_FLAG_LOGIN (1<<0) /* force login in the token
for the operation */ | | #define GNUTLS_PKCS11_OBJ_FLAG_LOGIN (1<<0) /* force login in the token
for the operation */ | |
| | | | |
| skipping to change at line 287 | | skipping to change at line 288 | |
| GNUTLS_PKCS11_OBJ_PRIVKEY, | | GNUTLS_PKCS11_OBJ_PRIVKEY, | |
| GNUTLS_PKCS11_OBJ_SECRET_KEY, | | GNUTLS_PKCS11_OBJ_SECRET_KEY, | |
| GNUTLS_PKCS11_OBJ_DATA | | GNUTLS_PKCS11_OBJ_DATA | |
| } gnutls_pkcs11_obj_type_t; | | } gnutls_pkcs11_obj_type_t; | |
| | | | |
| int | | int | |
| gnutls_pkcs11_token_init (const char *token_url, | | gnutls_pkcs11_token_init (const char *token_url, | |
| const char *so_pin, const char *label); | | const char *so_pin, const char *label); | |
| | | | |
| int | | int | |
|
| gnutls_pkcs11_token_get_mechanism (const char *url, int idx, | | gnutls_pkcs11_token_get_mechanism (const char *url, unsigned int idx, | |
| unsigned long *mechanism); | | unsigned long *mechanism); | |
| | | | |
| int gnutls_pkcs11_token_set_pin (const char *token_url, | | int gnutls_pkcs11_token_set_pin (const char *token_url, | |
| const char *oldpin, | | const char *oldpin, | |
| const char *newpin, | | const char *newpin, | |
| unsigned int flags /*gnutls_pkcs11_pin_fla
g_t */ | | unsigned int flags /*gnutls_pkcs11_pin_fla
g_t */ | |
| ); | | ); | |
| | | | |
| int gnutls_pkcs11_token_get_url (unsigned int seq, | | int gnutls_pkcs11_token_get_url (unsigned int seq, | |
| gnutls_pkcs11_url_type_t detailed, | | gnutls_pkcs11_url_type_t detailed, | |
| | | | |
End of changes. 2 change blocks. |
| 1 lines changed or deleted | | 2 lines changed or added | |
|
| x509.h (3.0.12) | | x509.h (3.0.13) | |
| | | | |
| skipping to change at line 156 | | skipping to change at line 156 | |
| char *sig, size_t * sizeof_sig); | | char *sig, size_t * sizeof_sig); | |
| int gnutls_x509_crt_get_version (gnutls_x509_crt_t cert); | | int gnutls_x509_crt_get_version (gnutls_x509_crt_t cert); | |
| int gnutls_x509_crt_get_key_id (gnutls_x509_crt_t crt, | | int gnutls_x509_crt_get_key_id (gnutls_x509_crt_t crt, | |
| unsigned int flags, | | unsigned int flags, | |
| unsigned char *output_data, | | unsigned char *output_data, | |
| size_t * output_data_size); | | size_t * output_data_size); | |
| | | | |
| int gnutls_x509_crt_set_authority_key_id (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_set_authority_key_id (gnutls_x509_crt_t cert, | |
| const void *id, size_t id_size)
; | | const void *id, size_t id_size)
; | |
| int gnutls_x509_crt_get_authority_key_id (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_authority_key_id (gnutls_x509_crt_t cert, | |
|
| void *ret, size_t * ret_size, | | void *id, size_t * id_size, | |
| unsigned int *critical); | | unsigned int *critical); | |
|
| | | int gnutls_x509_crt_get_authority_key_gn_serial (gnutls_x509_crt_t cert, | |
| | | unsigned int seq, | |
| | | void *alt, | |
| | | size_t * alt_size, | |
| | | unsigned int *alt_type, | |
| | | void* serial, | |
| | | size_t *serial_size, | |
| | | unsigned int *critical); | |
| | | | |
| 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); | |
| | | | |
| skipping to change at line 195 | | skipping to change at line 203 | |
| GNUTLS_IA_URI = 106, | | GNUTLS_IA_URI = 106, | |
| /* quick-access variants that match both OID and name type. */ | | /* quick-access variants that match both OID and name type. */ | |
| 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, | |
|
| int *critical); | | unsigned 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 | |
| | | | |
| skipping to change at line 246 | | skipping to change at line 254 | |
| int gnutls_x509_crt_get_pk_algorithm (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_pk_algorithm (gnutls_x509_crt_t cert, | |
| unsigned int *bits); | | unsigned int *bits); | |
| int gnutls_x509_crt_get_pk_rsa_raw (gnutls_x509_crt_t crt, | | int gnutls_x509_crt_get_pk_rsa_raw (gnutls_x509_crt_t crt, | |
| gnutls_datum_t * m, gnutls_datum_t *
e); | | gnutls_datum_t * m, gnutls_datum_t *
e); | |
| int gnutls_x509_crt_get_pk_dsa_raw (gnutls_x509_crt_t crt, | | int gnutls_x509_crt_get_pk_dsa_raw (gnutls_x509_crt_t crt, | |
| gnutls_datum_t * p, | | gnutls_datum_t * p, | |
| gnutls_datum_t * q, | | gnutls_datum_t * q, | |
| gnutls_datum_t * g, gnutls_datum_t *
y); | | gnutls_datum_t * g, gnutls_datum_t *
y); | |
| | | | |
| int gnutls_x509_crt_get_subject_alt_name (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_subject_alt_name (gnutls_x509_crt_t cert, | |
|
| unsigned int seq, void *ret, | | unsigned int seq, void *san, | |
| size_t * ret_size, | | size_t * san_size, | |
| unsigned int *critical); | | unsigned int *critical); | |
| int gnutls_x509_crt_get_subject_alt_name2 (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_subject_alt_name2 (gnutls_x509_crt_t cert, | |
|
| unsigned int seq, void *ret, | | unsigned int seq, void *san, | |
| size_t * ret_size, | | size_t * san_size, | |
| unsigned int *ret_type, | | unsigned int *san_type, | |
| unsigned int *critical); | | unsigned int *critical); | |
| | | | |
| int gnutls_x509_crt_get_subject_alt_othername_oid (gnutls_x509_crt_t cert
, | | int gnutls_x509_crt_get_subject_alt_othername_oid (gnutls_x509_crt_t cert
, | |
| unsigned int seq, | | unsigned int seq, | |
| void *oid, | | void *oid, | |
| size_t * oid_size); | | size_t * oid_size); | |
| | | | |
| int gnutls_x509_crt_get_issuer_alt_name (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_issuer_alt_name (gnutls_x509_crt_t cert, | |
|
| unsigned int seq, void *ret, | | unsigned int seq, void *ian, | |
| size_t * ret_size, | | size_t * ian_size, | |
| unsigned int *critical); | | unsigned int *critical); | |
| int gnutls_x509_crt_get_issuer_alt_name2 (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_issuer_alt_name2 (gnutls_x509_crt_t cert, | |
|
| unsigned int seq, void *ret, | | unsigned int seq, void *ian, | |
| size_t * ret_size, | | size_t * ian_size, | |
| unsigned int *ret_type, | | unsigned int *ian_type, | |
| unsigned int *critical); | | unsigned int *critical); | |
| | | | |
| int gnutls_x509_crt_get_issuer_alt_othername_oid (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_issuer_alt_othername_oid (gnutls_x509_crt_t cert, | |
| unsigned int seq, | | unsigned int seq, | |
| void *ret, | | void *ret, | |
| size_t * ret_size); | | size_t * ret_size); | |
| | | | |
| int gnutls_x509_crt_get_ca_status (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_ca_status (gnutls_x509_crt_t cert, | |
| unsigned int *critical); | | unsigned int *critical); | |
| int gnutls_x509_crt_get_basic_constraints (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_basic_constraints (gnutls_x509_crt_t cert, | |
| | | | |
| skipping to change at line 498 | | skipping to change at line 506 | |
| time_t act_time); | | time_t act_time); | |
| int gnutls_x509_crl_set_next_update (gnutls_x509_crl_t crl, | | int gnutls_x509_crl_set_next_update (gnutls_x509_crl_t crl, | |
| time_t exp_time); | | time_t exp_time); | |
| int gnutls_x509_crl_set_crt_serial (gnutls_x509_crl_t crl, | | int gnutls_x509_crl_set_crt_serial (gnutls_x509_crl_t crl, | |
| const void *serial, | | const void *serial, | |
| size_t serial_size, | | size_t serial_size, | |
| time_t revocation_time); | | time_t revocation_time); | |
| int gnutls_x509_crl_set_crt (gnutls_x509_crl_t crl, | | int gnutls_x509_crl_set_crt (gnutls_x509_crl_t crl, | |
| gnutls_x509_crt_t crt, time_t revocation_tim
e); | | gnutls_x509_crt_t crt, time_t revocation_tim
e); | |
| | | | |
|
| int gnutls_x509_crl_get_authority_key_id (gnutls_x509_crl_t crl, void *re | | int gnutls_x509_crl_get_authority_key_id (gnutls_x509_crl_t crl, void *id | |
| t, | | , | |
| size_t * ret_size, | | size_t * id_size, | |
| unsigned int *critical); | | unsigned int *critical); | |
|
| | | int gnutls_x509_crl_get_authority_key_gn_serial (gnutls_x509_crl_t crl, | |
| | | unsigned int seq, | |
| | | void *alt, | |
| | | size_t * alt_size, | |
| | | unsigned int *alt_type, | |
| | | void* serial, | |
| | | size_t *serial_size, | |
| | | unsigned int *critical); | |
| | | | |
| int gnutls_x509_crl_get_number (gnutls_x509_crl_t crl, void *ret, | | int gnutls_x509_crl_get_number (gnutls_x509_crl_t crl, void *ret, | |
| size_t * ret_size, unsigned int *critical
); | | size_t * ret_size, unsigned int *critical
); | |
| | | | |
| int gnutls_x509_crl_get_extension_oid (gnutls_x509_crl_t crl, int indx, | | int gnutls_x509_crl_get_extension_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_extension_info (gnutls_x509_crl_t crl, int indx, | | int gnutls_x509_crl_get_extension_info (gnutls_x509_crl_t crl, int indx, | |
| void *oid, size_t * sizeof_oid, | | void *oid, size_t * sizeof_oid, | |
|
| int *critical); | | unsigned int *critical); | |
| | | | |
| int gnutls_x509_crl_get_extension_data (gnutls_x509_crl_t crl, int indx, | | int gnutls_x509_crl_get_extension_data (gnutls_x509_crl_t crl, int indx, | |
| void *data, size_t * sizeof_data)
; | | void *data, size_t * sizeof_data)
; | |
| | | | |
| int gnutls_x509_crl_set_authority_key_id (gnutls_x509_crl_t crl, | | int gnutls_x509_crl_set_authority_key_id (gnutls_x509_crl_t crl, | |
| const void *id, size_t id_size)
; | | const void *id, size_t id_size)
; | |
| | | | |
| int gnutls_x509_crl_set_number (gnutls_x509_crl_t crl, | | int gnutls_x509_crl_set_number (gnutls_x509_crl_t crl, | |
| const void *nr, size_t nr_size); | | const void *nr, size_t nr_size); | |
| | | | |
| | | | |
End of changes. 10 change blocks. |
| 16 lines changed or deleted | | 32 lines changed or added | |
|
|