Headers diff: 3.0.1 vs 3.0.2
| abstract.h (3.0.1) | | abstract.h (3.0.2) | |
| | | | |
| skipping to change at line 133 | | skipping to change at line 133 | |
| const gnutls_datum_t * signature); | | const gnutls_datum_t * signature); | |
| | | | |
| /* Private key operations */ | | /* Private key operations */ | |
| | | | |
| 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); | |
| 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); | |
| | | | |
|
| #define GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE 1 | | #define GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE (1<<0) | |
| | | #define GNUTLS_PRIVKEY_IMPORT_COPY (1<<1) | |
| int gnutls_privkey_import_pkcs11 (gnutls_privkey_t pkey, | | int gnutls_privkey_import_pkcs11 (gnutls_privkey_t pkey, | |
| gnutls_pkcs11_privkey_t key, | | gnutls_pkcs11_privkey_t key, | |
| unsigned int flags); | | unsigned int flags); | |
| int gnutls_privkey_import_x509 (gnutls_privkey_t pkey, | | int gnutls_privkey_import_x509 (gnutls_privkey_t pkey, | |
| gnutls_x509_privkey_t key, | | gnutls_x509_privkey_t key, | |
| unsigned int flags); | | unsigned int flags); | |
| int gnutls_privkey_import_openpgp (gnutls_privkey_t pkey, | | int gnutls_privkey_import_openpgp (gnutls_privkey_t pkey, | |
| gnutls_openpgp_privkey_t key, | | gnutls_openpgp_privkey_t key, | |
| unsigned int flags); | | unsigned int flags); | |
| | | | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 2 lines changed or added | |
|
| gnutls.h (3.0.1) | | gnutls.h (3.0.2) | |
| | | | |
| skipping to change at line 52 | | skipping to change at line 52 | |
| #include <sys/types.h> | | #include <sys/types.h> | |
| /* *INDENT-ON* */ | | /* *INDENT-ON* */ | |
| #endif | | #endif | |
| /* Get time_t. */ | | /* Get time_t. */ | |
| #include <time.h> | | #include <time.h> | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" | | extern "C" | |
| { | | { | |
| #endif | | #endif | |
| | | | |
|
| #define GNUTLS_VERSION "3.0.1" | | #define GNUTLS_VERSION "3.0.2" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 0 | | #define GNUTLS_VERSION_MINOR 0 | |
|
| #define GNUTLS_VERSION_PATCH 1 | | #define GNUTLS_VERSION_PATCH 2 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030001 | | #define GNUTLS_VERSION_NUMBER 0x030002 | |
| | | | |
| #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. | |
| | | | |
End of changes. 3 change blocks. |
| 3 lines changed or deleted | | 3 lines changed or added | |
|
| x509.h (3.0.1) | | x509.h (3.0.2) | |
| | | | |
| skipping to change at line 247 | | skipping to change at line 247 | |
| | | | |
| 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, | |
| unsigned int *critical, | | unsigned int *critical, | |
|
| int *ca, int *pathlen); | | unsigned int *ca, int *pathlen
); | |
| | | | |
| /* The key_usage flags are defined in gnutls.h. They are the | | /* The key_usage flags are defined in gnutls.h. They are the | |
| * GNUTLS_KEY_* definitions. | | * GNUTLS_KEY_* definitions. | |
| */ | | */ | |
| int gnutls_x509_crt_get_key_usage (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_key_usage (gnutls_x509_crt_t cert, | |
| unsigned int *key_usage, | | unsigned int *key_usage, | |
| unsigned int *critical); | | unsigned int *critical); | |
| int gnutls_x509_crt_set_key_usage (gnutls_x509_crt_t crt, | | int gnutls_x509_crt_set_key_usage (gnutls_x509_crt_t crt, | |
| unsigned int usage); | | unsigned int usage); | |
| | | | |
| | | | |
| skipping to change at line 278 | | skipping to change at line 278 | |
| void *oid, size_t * sizeof_oid); | | void *oid, size_t * sizeof_oid); | |
| int gnutls_x509_crt_get_extension_by_oid (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_extension_by_oid (gnutls_x509_crt_t cert, | |
| const char *oid, int indx, | | const char *oid, int indx, | |
| void *buf, | | void *buf, | |
| size_t * sizeof_buf, | | size_t * sizeof_buf, | |
| unsigned int *critical); | | unsigned int *critical); | |
| | | | |
| /* Read extensions by sequence number. */ | | /* Read extensions by sequence number. */ | |
| int gnutls_x509_crt_get_extension_info (gnutls_x509_crt_t cert, int indx, | | int gnutls_x509_crt_get_extension_info (gnutls_x509_crt_t cert, int indx, | |
| void *oid, size_t * sizeof_oid, | | void *oid, size_t * sizeof_oid, | |
|
| int *critical); | | unsigned int *critical); | |
| int gnutls_x509_crt_get_extension_data (gnutls_x509_crt_t cert, int indx, | | int gnutls_x509_crt_get_extension_data (gnutls_x509_crt_t cert, int indx, | |
| void *data, size_t * sizeof_data)
; | | void *data, size_t * sizeof_data)
; | |
| | | | |
| int gnutls_x509_crt_set_extension_by_oid (gnutls_x509_crt_t crt, | | int gnutls_x509_crt_set_extension_by_oid (gnutls_x509_crt_t crt, | |
| const char *oid, | | const char *oid, | |
| const void *buf, | | const void *buf, | |
| size_t sizeof_buf, | | size_t sizeof_buf, | |
| unsigned int critical); | | unsigned int critical); | |
| | | | |
| /* X.509 Certificate writing. | | /* X.509 Certificate writing. | |
| | | | |
| skipping to change at line 819 | | skipping to change at line 819 | |
| const void *oid, | | const void *oid, | |
| unsigned int critical); | | unsigned int critical); | |
| int gnutls_x509_crq_get_key_purpose_oid (gnutls_x509_crq_t crq, int indx, | | int gnutls_x509_crq_get_key_purpose_oid (gnutls_x509_crq_t crq, int indx, | |
| void *oid, size_t * sizeof_oid, | | void *oid, size_t * sizeof_oid, | |
| unsigned int *critical); | | unsigned int *critical); | |
| | | | |
| int gnutls_x509_crq_get_extension_data (gnutls_x509_crq_t crq, int indx, | | int gnutls_x509_crq_get_extension_data (gnutls_x509_crq_t crq, int indx, | |
| void *data, size_t * sizeof_data)
; | | void *data, size_t * sizeof_data)
; | |
| int gnutls_x509_crq_get_extension_info (gnutls_x509_crq_t crq, int indx, | | int gnutls_x509_crq_get_extension_info (gnutls_x509_crq_t crq, int indx, | |
| void *oid, size_t * sizeof_oid, | | void *oid, size_t * sizeof_oid, | |
|
| int *critical); | | unsigned int *critical); | |
| int gnutls_x509_crq_get_attribute_data (gnutls_x509_crq_t crq, int indx, | | int gnutls_x509_crq_get_attribute_data (gnutls_x509_crq_t crq, int indx, | |
| void *data, size_t * sizeof_data)
; | | void *data, size_t * sizeof_data)
; | |
| int gnutls_x509_crq_get_attribute_info (gnutls_x509_crq_t crq, int indx, | | int gnutls_x509_crq_get_attribute_info (gnutls_x509_crq_t crq, int indx, | |
| void *oid, size_t * sizeof_oid); | | void *oid, size_t * sizeof_oid); | |
| int gnutls_x509_crq_get_pk_algorithm (gnutls_x509_crq_t crq, | | int gnutls_x509_crq_get_pk_algorithm (gnutls_x509_crq_t crq, | |
| unsigned int *bits); | | unsigned int *bits); | |
| | | | |
| int gnutls_x509_crq_get_key_id (gnutls_x509_crq_t crq, unsigned int flags
, | | int gnutls_x509_crq_get_key_id (gnutls_x509_crq_t crq, unsigned int flags
, | |
| unsigned char *output_data, | | unsigned char *output_data, | |
| size_t * output_data_size); | | size_t * output_data_size); | |
| int gnutls_x509_crq_get_key_rsa_raw (gnutls_x509_crq_t crq, | | int gnutls_x509_crq_get_key_rsa_raw (gnutls_x509_crq_t crq, | |
| gnutls_datum_t * m, | | gnutls_datum_t * m, | |
| gnutls_datum_t * e); | | gnutls_datum_t * e); | |
| | | | |
| int gnutls_x509_crq_get_key_usage (gnutls_x509_crq_t crq, | | int gnutls_x509_crq_get_key_usage (gnutls_x509_crq_t crq, | |
| unsigned int *key_usage, | | unsigned int *key_usage, | |
| unsigned int *critical); | | unsigned int *critical); | |
| int gnutls_x509_crq_get_basic_constraints (gnutls_x509_crq_t crq, | | int gnutls_x509_crq_get_basic_constraints (gnutls_x509_crq_t crq, | |
| unsigned int *critical, | | unsigned int *critical, | |
|
| int *ca, int *pathlen); | | unsigned int *ca, int *pathlen
); | |
| int gnutls_x509_crq_get_subject_alt_name (gnutls_x509_crq_t crq, | | int gnutls_x509_crq_get_subject_alt_name (gnutls_x509_crq_t crq, | |
| unsigned int seq, void *ret, | | unsigned int seq, void *ret, | |
| size_t * ret_size, | | size_t * ret_size, | |
| unsigned int *ret_type, | | unsigned int *ret_type, | |
| unsigned int *critical); | | unsigned int *critical); | |
| int gnutls_x509_crq_get_subject_alt_othername_oid (gnutls_x509_crq_t crq, | | int gnutls_x509_crq_get_subject_alt_othername_oid (gnutls_x509_crq_t crq, | |
| unsigned int seq, | | unsigned int seq, | |
| void *ret, | | void *ret, | |
| size_t * ret_size); | | size_t * ret_size); | |
| | | | |
| | | | |
End of changes. 4 change blocks. |
| 4 lines changed or deleted | | 4 lines changed or added | |
|
|