| gnutls.h (3.4.6) | | gnutls.h (3.4.7) | |
| | | | |
| skipping to change at line 56 | | skipping to change at line 56 | |
| #endif | | #endif | |
| /* Get time_t. */ | | /* Get time_t. */ | |
| #include <time.h> | | #include <time.h> | |
| | | | |
| /* *INDENT-OFF* */ | | /* *INDENT-OFF* */ | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" { | | extern "C" { | |
| #endif | | #endif | |
| /* *INDENT-ON* */ | | /* *INDENT-ON* */ | |
| | | | |
|
| #define GNUTLS_VERSION "3.4.6" | | #define GNUTLS_VERSION "3.4.7" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 4 | | #define GNUTLS_VERSION_MINOR 4 | |
|
| #define GNUTLS_VERSION_PATCH 6 | | #define GNUTLS_VERSION_PATCH 7 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030406 | | #define GNUTLS_VERSION_NUMBER 0x030407 | |
| | | | |
| #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 | |
| | | | |
| #if !defined(GNUTLS_INTERNAL_BUILD) && defined(_WIN32) | | #if !defined(GNUTLS_INTERNAL_BUILD) && defined(_WIN32) | |
| # define _SYM_EXPORT __declspec(dllimport) | | # define _SYM_EXPORT __declspec(dllimport) | |
| #else | | #else | |
| # define _SYM_EXPORT | | # define _SYM_EXPORT | |
| #endif | | #endif | |
| | | | |
|
| | | /* Use the following definition globally in your program to disable | |
| | | * implicit initialization of gnutls. */ | |
| | | #define GNUTLS_SKIP_GLOBAL_INIT int _gnutls_global_init_skip(void); \ | |
| | | int _gnutls_global_init_skip(void) {return 1;} | |
| | | | |
| /** | | /** | |
| * 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. | |
| * @GNUTLS_CIPHER_ARCFOUR_128: ARCFOUR stream cipher with 128-bit keys. | | * @GNUTLS_CIPHER_ARCFOUR_128: ARCFOUR stream cipher with 128-bit keys. | |
| * @GNUTLS_CIPHER_3DES_CBC: 3DES in CBC mode. | | * @GNUTLS_CIPHER_3DES_CBC: 3DES in CBC mode. | |
| * @GNUTLS_CIPHER_AES_128_CBC: AES in CBC mode with 128-bit keys. | | * @GNUTLS_CIPHER_AES_128_CBC: AES in CBC mode with 128-bit keys. | |
| * @GNUTLS_CIPHER_AES_192_CBC: AES in CBC mode with 192-bit keys. | | * @GNUTLS_CIPHER_AES_192_CBC: AES in CBC mode with 192-bit keys. | |
| * @GNUTLS_CIPHER_AES_256_CBC: AES in CBC mode with 256-bit keys. | | * @GNUTLS_CIPHER_AES_256_CBC: AES in CBC mode with 256-bit keys. | |
| * @GNUTLS_CIPHER_ARCFOUR_40: ARCFOUR stream cipher with 40-bit keys. | | * @GNUTLS_CIPHER_ARCFOUR_40: ARCFOUR stream cipher with 40-bit keys. | |
| | | | |
| skipping to change at line 1462 | | skipping to change at line 1467 | |
| void gnutls_certificate_free_ca_names(gnutls_certificate_credentials_t sc); | | void gnutls_certificate_free_ca_names(gnutls_certificate_credentials_t sc); | |
| void gnutls_certificate_free_crls(gnutls_certificate_credentials_t sc); | | void gnutls_certificate_free_crls(gnutls_certificate_credentials_t sc); | |
| | | | |
| void gnutls_certificate_set_dh_params(gnutls_certificate_credentials_t res, | | void gnutls_certificate_set_dh_params(gnutls_certificate_credentials_t res, | |
| gnutls_dh_params_t dh_params); | | gnutls_dh_params_t dh_params); | |
| void gnutls_certificate_set_verify_flags(gnutls_certificate_credentials_t | | void gnutls_certificate_set_verify_flags(gnutls_certificate_credentials_t | |
| res, unsigned int flags); | | res, unsigned int flags); | |
| unsigned int | | unsigned int | |
| gnutls_certificate_get_verify_flags(gnutls_certificate_credentials_t res); | | gnutls_certificate_get_verify_flags(gnutls_certificate_credentials_t res); | |
| | | | |
|
| | | /** | |
| | | * gnutls_certificate_flags: | |
| | | * @GNUTLS_CERTIFICATE_SKIP_KEY_CERT_MATCH: Skip the key and certificate ma | |
| | | tching check. | |
| | | * | |
| | | * Enumeration of different certificate credentials flags. | |
| | | */ | |
| | | typedef enum gnutls_certificate_flags { | |
| | | GNUTLS_CERTIFICATE_SKIP_KEY_CERT_MATCH = 1 | |
| | | } gnutls_certificate_flags; | |
| | | | |
| | | void gnutls_certificate_set_flags(gnutls_certificate_credentials_t, | |
| | | unsigned flags); | |
| | | | |
| void gnutls_certificate_set_verify_limits(gnutls_certificate_credentials_t | | void gnutls_certificate_set_verify_limits(gnutls_certificate_credentials_t | |
| res, unsigned int max_bits, | | res, unsigned int max_bits, | |
| unsigned int max_depth); | | unsigned int max_depth); | |
| | | | |
| unsigned int | | unsigned int | |
| gnutls_certificate_get_verify_flags(gnutls_certificate_credentials_t); | | gnutls_certificate_get_verify_flags(gnutls_certificate_credentials_t); | |
| | | | |
| int | | int | |
| gnutls_certificate_set_x509_system_trust(gnutls_certificate_credentials_t | | gnutls_certificate_set_x509_system_trust(gnutls_certificate_credentials_t | |
| cred); | | cred); | |
| | | | |
End of changes. 5 change blocks. |
| 3 lines changed or deleted | | 22 lines changed or added | |
|
| pkcs7.h (3.4.6) | | pkcs7.h (3.4.7) | |
| | | | |
| skipping to change at line 105 | | skipping to change at line 105 | |
| unsigned idx, const gnutls_datum_t *data, uns
igned flags); | | unsigned idx, const gnutls_datum_t *data, uns
igned flags); | |
| int gnutls_pkcs7_verify(gnutls_pkcs7_t pkcs7, gnutls_x509_trust_list_t tl, | | int gnutls_pkcs7_verify(gnutls_pkcs7_t pkcs7, gnutls_x509_trust_list_t tl, | |
| gnutls_typed_vdata_st * vdata, unsigned int vdata_si
ze, | | gnutls_typed_vdata_st * vdata, unsigned int vdata_si
ze, | |
| unsigned idx, const gnutls_datum_t *data, unsigned f
lags); | | unsigned idx, const gnutls_datum_t *data, unsigned f
lags); | |
| | | | |
| #define GNUTLS_PKCS7_ATTR_ENCODE_OCTET_STRING 1 | | #define GNUTLS_PKCS7_ATTR_ENCODE_OCTET_STRING 1 | |
| int gnutls_pkcs7_add_attr(gnutls_pkcs7_attrs_t *list, const char *oid, gnut
ls_datum_t *data, unsigned flags); | | int gnutls_pkcs7_add_attr(gnutls_pkcs7_attrs_t *list, const char *oid, gnut
ls_datum_t *data, unsigned flags); | |
| void gnutls_pkcs7_attrs_deinit(gnutls_pkcs7_attrs_t list); | | void gnutls_pkcs7_attrs_deinit(gnutls_pkcs7_attrs_t list); | |
| int gnutls_pkcs7_get_attr(gnutls_pkcs7_attrs_t list, unsigned idx, char **o
id, gnutls_datum_t *data, unsigned flags); | | int gnutls_pkcs7_get_attr(gnutls_pkcs7_attrs_t list, unsigned idx, char **o
id, gnutls_datum_t *data, unsigned flags); | |
| | | | |
|
| #define GNUTLS_PKCS7_EMBED_DATA 1 | | /** | |
| #define GNUTLS_PKCS7_INCLUDE_TIME (1<<1) | | * gnutls_pkcs7_sign_flags: | |
| #define GNUTLS_PKCS7_INCLUDE_CERT (1<<2) | | * @GNUTLS_PKCS7_EMBED_DATA: The signed data will be embedded in the struct | |
| #define GNUTLS_PKCS7_WRITE_SPKI (1<<3) | | ure. | |
| | | * @GNUTLS_PKCS7_INCLUDE_TIME: The signing time will be included in the str | |
| | | ucture. | |
| | | * @GNUTLS_PKCS7_INCLUDE_CERT: The signer's certificate will be included in | |
| | | the cert list. | |
| | | * @GNUTLS_PKCS7_WRITE_SPKI: Use the signer's key identifier instead of nam | |
| | | e. | |
| | | * | |
| | | * Enumeration of the different PKCS #7 signature flags. | |
| | | */ | |
| | | typedef enum gnutls_pkcs7_sign_flags { | |
| | | GNUTLS_PKCS7_EMBED_DATA = 1, | |
| | | GNUTLS_PKCS7_INCLUDE_TIME = (1<<1), | |
| | | GNUTLS_PKCS7_INCLUDE_CERT = (1<<2), | |
| | | GNUTLS_PKCS7_WRITE_SPKI = (1<<3) | |
| | | } gnutls_pkcs7_sign_flags; | |
| | | | |
| int gnutls_pkcs7_sign(gnutls_pkcs7_t pkcs7, | | int gnutls_pkcs7_sign(gnutls_pkcs7_t pkcs7, | |
| gnutls_x509_crt_t signer, | | gnutls_x509_crt_t signer, | |
| gnutls_privkey_t signer_key, | | gnutls_privkey_t signer_key, | |
| const gnutls_datum_t *data, | | const gnutls_datum_t *data, | |
| gnutls_pkcs7_attrs_t signed_attrs, | | gnutls_pkcs7_attrs_t signed_attrs, | |
| gnutls_pkcs7_attrs_t unsigned_attrs, | | gnutls_pkcs7_attrs_t unsigned_attrs, | |
| gnutls_digest_algorithm_t dig, | | gnutls_digest_algorithm_t dig, | |
| unsigned flags); | | unsigned flags); | |
| | | | |
| int | | int | |
| | | | |
End of changes. 1 change blocks. |
| 4 lines changed or deleted | | 20 lines changed or added | |
|
| x509.h (3.4.6) | | x509.h (3.4.7) | |
| | | | |
| skipping to change at line 544 | | skipping to change at line 544 | |
| const char *dn, const char **err); | | const char *dn, const char **err); | |
| | | | |
| int gnutls_x509_crt_set_version(gnutls_x509_crt_t crt, | | int gnutls_x509_crt_set_version(gnutls_x509_crt_t crt, | |
| unsigned int version); | | unsigned int version); | |
| int gnutls_x509_crt_set_key(gnutls_x509_crt_t crt, | | int gnutls_x509_crt_set_key(gnutls_x509_crt_t crt, | |
| gnutls_x509_privkey_t key); | | gnutls_x509_privkey_t key); | |
| int gnutls_x509_crt_set_ca_status(gnutls_x509_crt_t crt, unsigned int ca); | | int gnutls_x509_crt_set_ca_status(gnutls_x509_crt_t crt, unsigned int ca); | |
| int gnutls_x509_crt_set_basic_constraints(gnutls_x509_crt_t crt, | | int gnutls_x509_crt_set_basic_constraints(gnutls_x509_crt_t crt, | |
| unsigned int ca, | | unsigned int ca, | |
| int pathLenConstraint); | | int pathLenConstraint); | |
|
| | | | |
| | | int | |
| | | gnutls_x509_crt_set_subject_unique_id(gnutls_x509_crt_t cert, const void *i | |
| | | d, | |
| | | size_t id_size); | |
| | | int | |
| | | gnutls_x509_crt_set_issuer_unique_id(gnutls_x509_crt_t cert, const void *id | |
| | | , | |
| | | size_t id_size); | |
| | | | |
| int gnutls_x509_crt_set_subject_alternative_name(gnutls_x509_crt_t | | int gnutls_x509_crt_set_subject_alternative_name(gnutls_x509_crt_t | |
| crt, | | crt, | |
| gnutls_x509_subject_alt_nam
e_t | | gnutls_x509_subject_alt_nam
e_t | |
| type, const char | | type, const char | |
| *data_string); | | *data_string); | |
| int gnutls_x509_crt_set_subject_alt_name(gnutls_x509_crt_t crt, | | int gnutls_x509_crt_set_subject_alt_name(gnutls_x509_crt_t crt, | |
| gnutls_x509_subject_alt_name_t | | gnutls_x509_subject_alt_name_t | |
| type, const void *data, | | type, const void *data, | |
| unsigned int data_size, | | unsigned int data_size, | |
| unsigned int flags); | | unsigned int flags); | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 10 lines changed or added | |
|