Headers diff: 3.1.4 vs 3.1.5
| abstract.h (3.1.4) | | abstract.h (3.1.5) | |
| | | | |
| skipping to change at line 67 | | skipping to change at line 67 | |
| int gnutls_pubkey_init (gnutls_pubkey_t * key); | | int gnutls_pubkey_init (gnutls_pubkey_t * key); | |
| void gnutls_pubkey_deinit (gnutls_pubkey_t key); | | void gnutls_pubkey_deinit (gnutls_pubkey_t key); | |
| | | | |
| void gnutls_pubkey_set_pin_function (gnutls_pubkey_t key, | | void gnutls_pubkey_set_pin_function (gnutls_pubkey_t key, | |
| gnutls_pin_callback_t fn, void *userd
ata); | | gnutls_pin_callback_t fn, void *userd
ata); | |
| | | | |
| 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_x509_crq (gnutls_pubkey_t key, gnutls_x509_crq_t c | |
| | | rq, | |
| | | 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, | | int gnutls_pubkey_import_openpgp_raw (gnutls_pubkey_t pkey, | |
| const gnutls_datum_t * data, | | const gnutls_datum_t * data, | |
| gnutls_openpgp_crt_fmt_t format, | | gnutls_openpgp_crt_fmt_t format, | |
| const gnutls_openpgp_keyid_t keyid, | | const gnutls_openpgp_keyid_t keyid, | |
| | | | |
| skipping to change at line 387 | | skipping to change at line 389 | |
| | | | |
| int gnutls_pubkey_verify_data (gnutls_pubkey_t pubkey, | | int gnutls_pubkey_verify_data (gnutls_pubkey_t pubkey, | |
| unsigned int flags, | | unsigned int flags, | |
| const gnutls_datum_t * data, | | const gnutls_datum_t * data, | |
| const gnutls_datum_t * signature) _GNUTLS_GC
C_ATTR_DEPRECATED; | | const gnutls_datum_t * signature) _GNUTLS_GC
C_ATTR_DEPRECATED; | |
| | | | |
| int gnutls_pubkey_verify_hash (gnutls_pubkey_t key, unsigned int flags, | | int gnutls_pubkey_verify_hash (gnutls_pubkey_t key, unsigned int flags, | |
| const gnutls_datum_t * hash, | | const gnutls_datum_t * hash, | |
| const gnutls_datum_t * signature) _GNUTLS_GCC_AT
TR_DEPRECATED; | | const gnutls_datum_t * signature) _GNUTLS_GCC_AT
TR_DEPRECATED; | |
| | | | |
|
| | | int | |
| | | gnutls_pubkey_print (gnutls_pubkey_t pubkey, | |
| | | gnutls_certificate_print_formats_t format, | |
| | | gnutls_datum_t * out); | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } | | } | |
| #endif | | #endif | |
| | | | |
| #endif | | #endif | |
| | | | |
End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 8 lines changed or added | |
|
| gnutls.h (3.1.4) | | gnutls.h (3.1.5) | |
| | | | |
| 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.4" | | #define GNUTLS_VERSION "3.1.5" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 1 | | #define GNUTLS_VERSION_MINOR 1 | |
|
| #define GNUTLS_VERSION_PATCH 4 | | #define GNUTLS_VERSION_PATCH 5 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030104 | | #define GNUTLS_VERSION_NUMBER 0x030105 | |
| | | | |
| #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 574 | | skipping to change at line 574 | |
| */ | | */ | |
| 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_FULL_NUMBERS: Full information about certificate and i
nclude easy to parse public key parameters. | |
| * @GNUTLS_CRT_PRINT_COMPACT: Information about certificate name in one lin
e, plus identification of the public key. | | * @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_CRT_PRINT_COMPACT = 3, | |
| | | GNUTLS_CRT_PRINT_FULL_NUMBERS = 4, | |
| } 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. | |
| | | | |
End of changes. 5 change blocks. |
| 4 lines changed or deleted | | 6 lines changed or added | |
|
| pkcs11.h (3.1.4) | | pkcs11.h (3.1.5) | |
| | | | |
| skipping to change at line 308 | | skipping to change at line 308 | |
| | | | |
| int gnutls_pkcs11_privkey_export_url (gnutls_pkcs11_privkey_t key, | | int gnutls_pkcs11_privkey_export_url (gnutls_pkcs11_privkey_t key, | |
| gnutls_pkcs11_url_type_t detailed, | | gnutls_pkcs11_url_type_t detailed, | |
| char **url); | | char **url); | |
| | | | |
| int gnutls_pkcs11_privkey_generate (const char* url, | | int gnutls_pkcs11_privkey_generate (const char* url, | |
| gnutls_pk_algorithm_t pk, | | gnutls_pk_algorithm_t pk, | |
| unsigned int bits, | | unsigned int bits, | |
| const char* label, unsigned int flags); | | const char* label, unsigned int flags); | |
| | | | |
|
| | | int | |
| | | gnutls_pkcs11_privkey_generate2 (const char* url, gnutls_pk_algorithm_t pk, | |
| | | unsigned int bits, const char* label, | |
| | | gnutls_x509_crt_fmt_t fmt, | |
| | | gnutls_datum_t * pubkey, | |
| | | unsigned int flags); | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } | | } | |
| #endif | | #endif | |
| | | | |
| #endif | | #endif | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 7 lines changed or added | |
|
| x509.h (3.1.4) | | x509.h (3.1.5) | |
| | | | |
| skipping to change at line 338 | | skipping to change at line 338 | |
| int gnutls_x509_crt_set_authority_info_access (gnutls_x509_crt_t crt, | | int gnutls_x509_crt_set_authority_info_access (gnutls_x509_crt_t crt, | |
| int what, | | int what, | |
| gnutls_datum_t * data); | | gnutls_datum_t * data); | |
| | | | |
| int gnutls_x509_crt_get_proxy (gnutls_x509_crt_t cert, | | int gnutls_x509_crt_get_proxy (gnutls_x509_crt_t cert, | |
| unsigned int *critical, | | unsigned int *critical, | |
| int *pathlen, | | int *pathlen, | |
| char **policyLanguage, | | char **policyLanguage, | |
| char **policy, size_t * sizeof_policy); | | char **policy, size_t * sizeof_policy); | |
| | | | |
|
| | | #define GNUTLS_MAX_QUALIFIERS 8 | |
| | | | |
| | | /** | |
| | | * gnutls_x509_qualifier_t: | |
| | | * @GNUTLS_X509_QUALIFIER_UNKNOWN: Unknown qualifier. | |
| | | * @GNUTLS_X509_QUALIFIER_URI: A URL | |
| | | * @GNUTLS_X509_QUALIFIER_NOICE: A text notice. | |
| | | * | |
| | | * Enumeration of types for the X.509 qualifiers, of the certificate poli | |
| | | cy extension. | |
| | | */ | |
| | | typedef enum gnutls_x509_qualifier_t | |
| | | { | |
| | | GNUTLS_X509_QUALIFIER_UNKNOWN = 0, GNUTLS_X509_QUALIFIER_URI, | |
| | | GNUTLS_X509_QUALIFIER_NOTICE | |
| | | } gnutls_x509_qualifier_t; | |
| | | | |
| | | typedef struct gnutls_x509_policy_st | |
| | | { | |
| | | char* oid; | |
| | | unsigned int qualifiers; | |
| | | struct { | |
| | | gnutls_x509_qualifier_t type; | |
| | | char* data; | |
| | | unsigned int size; | |
| | | } qualifier[GNUTLS_MAX_QUALIFIERS]; | |
| | | } gnutls_x509_policy_st; | |
| | | | |
| | | void gnutls_x509_policy_release(struct gnutls_x509_policy_st* policy); | |
| | | int gnutls_x509_crt_get_policy (gnutls_x509_crt_t crt, int indx, | |
| | | struct gnutls_x509_policy_st* policy, | |
| | | unsigned int * critical); | |
| | | int gnutls_x509_crt_set_policy (gnutls_x509_crt_t crt, struct gnutls_x509 | |
| | | _policy_st* policy, | |
| | | unsigned int critical); | |
| | | | |
| int gnutls_x509_dn_oid_known (const char *oid); | | int gnutls_x509_dn_oid_known (const char *oid); | |
| | | | |
| #define GNUTLS_X509_DN_OID_RETURN_OID 1 | | #define GNUTLS_X509_DN_OID_RETURN_OID 1 | |
| const char* gnutls_x509_dn_oid_name (const char *oid, unsigned int flags)
; | | const char* gnutls_x509_dn_oid_name (const char *oid, unsigned int flags)
; | |
| | | | |
| /* Read extensions by OID. */ | | /* Read extensions by OID. */ | |
| int gnutls_x509_crt_get_extension_oid (gnutls_x509_crt_t cert, int indx, | | int gnutls_x509_crt_get_extension_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_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, | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 36 lines changed or added | |
|
|