| abstract.h (3.0.9) | | abstract.h (3.0.10) | |
| | | | |
| skipping to change at line 32 | | skipping to change at line 32 | |
| | | | |
| #ifndef __GNUTLS_ABSTRACT_H | | #ifndef __GNUTLS_ABSTRACT_H | |
| #define __GNUTLS_ABSTRACT_H | | #define __GNUTLS_ABSTRACT_H | |
| | | | |
| #include <stdarg.h> | | #include <stdarg.h> | |
| #include <gnutls/gnutls.h> | | #include <gnutls/gnutls.h> | |
| #include <gnutls/x509.h> | | #include <gnutls/x509.h> | |
| #include <gnutls/pkcs11.h> | | #include <gnutls/pkcs11.h> | |
| #include <gnutls/openpgp.h> | | #include <gnutls/openpgp.h> | |
| | | | |
|
| | | #ifdef __cplusplus | |
| | | extern "C" | |
| | | { | |
| | | #endif | |
| | | | |
| /* Public key operations */ | | /* Public key operations */ | |
| | | | |
| 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, | |
| | | | |
| skipping to change at line 279 | | skipping to change at line 284 | |
| 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); | |
| | | | |
|
| | | #ifdef __cplusplus | |
| | | } | |
| | | #endif | |
| | | | |
| #endif | | #endif | |
| | | | |
End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 9 lines changed or added | |
|
| gnutls.h (3.0.9) | | gnutls.h (3.0.10) | |
| | | | |
| 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.9" | | #define GNUTLS_VERSION "3.0.10" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 0 | | #define GNUTLS_VERSION_MINOR 0 | |
|
| #define GNUTLS_VERSION_PATCH 9 | | #define GNUTLS_VERSION_PATCH 10 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x030009 | | #define GNUTLS_VERSION_NUMBER 0x03000a | |
| | | | |
| #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 564 | | skipping to change at line 564 | |
| * | | * | |
| * 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_certificate_print_formats_t; | | } gnutls_certificate_print_formats_t; | |
| | | | |
|
| | | #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_ECC: Elliptic curve algorithm. Used to generate parameters. | | * @GNUTLS_PK_EC: Elliptic curve algorithm. Used to generate parameters. | |
| * | | * | |
| * Enumeration of different public-key algorithms. | | * Enumeration of different public-key algorithms. | |
| */ | | */ | |
| typedef enum | | typedef enum | |
| { | | { | |
| GNUTLS_PK_UNKNOWN = 0, | | GNUTLS_PK_UNKNOWN = 0, | |
| GNUTLS_PK_RSA = 1, | | GNUTLS_PK_RSA = 1, | |
| GNUTLS_PK_DSA = 2, | | GNUTLS_PK_DSA = 2, | |
| GNUTLS_PK_DH = 3, | | GNUTLS_PK_DH = 3, | |
|
| GNUTLS_PK_ECC = 4, | | GNUTLS_PK_EC = 4, | |
| } gnutls_pk_algorithm_t; | | } gnutls_pk_algorithm_t; | |
| | | | |
| const char *gnutls_pk_algorithm_get_name (gnutls_pk_algorithm_t algorithm
); | | const char *gnutls_pk_algorithm_get_name (gnutls_pk_algorithm_t algorithm
); | |
| | | | |
| /** | | /** | |
| * gnutls_sign_algorithm_t: | | * gnutls_sign_algorithm_t: | |
| * @GNUTLS_SIGN_UNKNOWN: Unknown signature algorithm. | | * @GNUTLS_SIGN_UNKNOWN: Unknown signature algorithm. | |
| * @GNUTLS_SIGN_RSA_SHA1: Digital signature algorithm RSA with SHA-1 | | * @GNUTLS_SIGN_RSA_SHA1: Digital signature algorithm RSA with SHA-1 | |
| * @GNUTLS_SIGN_RSA_SHA: Same as %GNUTLS_SIGN_RSA_SHA1. | | * @GNUTLS_SIGN_RSA_SHA: Same as %GNUTLS_SIGN_RSA_SHA1. | |
| * @GNUTLS_SIGN_DSA_SHA1: Digital signature algorithm DSA with SHA-1 | | * @GNUTLS_SIGN_DSA_SHA1: Digital signature algorithm DSA with SHA-1 | |
| | | | |
| skipping to change at line 1264 | | skipping to change at line 1265 | |
| void gnutls_transport_set_errno (gnutls_session_t session, int err); | | void gnutls_transport_set_errno (gnutls_session_t session, int err); | |
| | | | |
| /* session specific | | /* session specific | |
| */ | | */ | |
| void gnutls_session_set_ptr (gnutls_session_t session, void *ptr); | | void gnutls_session_set_ptr (gnutls_session_t session, void *ptr); | |
| void *gnutls_session_get_ptr (gnutls_session_t session); | | void *gnutls_session_get_ptr (gnutls_session_t session); | |
| | | | |
| void gnutls_openpgp_send_cert (gnutls_session_t session, | | void gnutls_openpgp_send_cert (gnutls_session_t session, | |
| gnutls_openpgp_crt_status_t status); | | gnutls_openpgp_crt_status_t status); | |
| | | | |
|
| /* fingerprint | | /* This function returns the hash of the given data. | |
| * Actually this function returns the hash of the given data. | | | |
| */ | | */ | |
| int gnutls_fingerprint (gnutls_digest_algorithm_t algo, | | int gnutls_fingerprint (gnutls_digest_algorithm_t algo, | |
| const gnutls_datum_t * data, void *result, | | const gnutls_datum_t * data, void *result, | |
| size_t * result_size); | | size_t * result_size); | |
| | | | |
|
| | | typedef enum gnutls_random_art | |
| | | { | |
| | | GNUTLS_RANDOM_ART_OPENSSH=1, | |
| | | } gnutls_random_art_t; | |
| | | | |
| | | int gnutls_random_art (gnutls_random_art_t type, | |
| | | const char* key_name, unsigned int key_size, | |
| | | void * fpr, size_t fpr_size, | |
| | | gnutls_datum_t* art); | |
| | | | |
| /* SRP | | /* SRP | |
| */ | | */ | |
| | | | |
| typedef struct gnutls_srp_server_credentials_st | | typedef struct gnutls_srp_server_credentials_st | |
| *gnutls_srp_server_credentials_t; | | *gnutls_srp_server_credentials_t; | |
| typedef struct gnutls_srp_client_credentials_st | | typedef struct gnutls_srp_client_credentials_st | |
| *gnutls_srp_client_credentials_t; | | *gnutls_srp_client_credentials_t; | |
| | | | |
| void | | void | |
| gnutls_srp_free_client_credentials (gnutls_srp_client_credentials_t sc)
; | | gnutls_srp_free_client_credentials (gnutls_srp_client_credentials_t sc)
; | |
| | | | |
End of changes. 8 change blocks. |
| 7 lines changed or deleted | | 17 lines changed or added | |
|
| pkcs11.h (3.0.9) | | pkcs11.h (3.0.10) | |
| | | | |
| skipping to change at line 30 | | skipping to change at line 30 | |
| * | | * | |
| */ | | */ | |
| | | | |
| #ifndef __GNUTLS_PKCS11_H | | #ifndef __GNUTLS_PKCS11_H | |
| #define __GNUTLS_PKCS11_H | | #define __GNUTLS_PKCS11_H | |
| | | | |
| #include <stdarg.h> | | #include <stdarg.h> | |
| #include <gnutls/gnutls.h> | | #include <gnutls/gnutls.h> | |
| #include <gnutls/x509.h> | | #include <gnutls/x509.h> | |
| | | | |
|
| | | #ifdef __cplusplus | |
| | | extern "C" | |
| | | { | |
| | | #endif | |
| | | | |
| #define GNUTLS_PKCS11_MAX_PIN_LEN 32 | | #define GNUTLS_PKCS11_MAX_PIN_LEN 32 | |
| | | | |
| /** | | /** | |
| * gnutls_pkcs11_token_callback_t: | | * gnutls_pkcs11_token_callback_t: | |
| * @userdata: user-controlled data from gnutls_pkcs11_set_token_function(). | | * @userdata: user-controlled data from gnutls_pkcs11_set_token_function(). | |
| * @label: token label. | | * @label: token label. | |
| * @retry: retry counter, initially 0. | | * @retry: retry counter, initially 0. | |
| * | | * | |
| * Token callback function. The callback will be used to ask the user | | * Token callback function. The callback will be used to ask the user | |
| * to re-insert the token with given (null terminated) label. The | | * to re-insert the token with given (null terminated) label. The | |
| | | | |
| skipping to change at line 343 | | skipping to change at line 348 | |
| | | | |
| 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 | | int | |
| gnutls_pkcs11_privkey_generate (const char* url, | | gnutls_pkcs11_privkey_generate (const char* url, | |
| gnutls_pk_algorithm_t pk, unsigned int bits, | | gnutls_pk_algorithm_t pk, unsigned int bits, | |
| const char* label, unsigned int flags); | | const char* label, unsigned int flags); | |
| | | | |
|
| | | #ifdef __cplusplus | |
| | | } | |
| | | #endif | |
| | | | |
| #endif | | #endif | |
| | | | |
End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 9 lines changed or added | |
|