| abstract.h (3.0.11) | | abstract.h (3.0.12) | |
| /* | | /* | |
|
| * Copyright (C) 2010-2011 Free Software Foundation, Inc. | | * Copyright (C) 2010-2012 Free Software Foundation, Inc. | |
| * | | * | |
| * Author: Nikos Mavrogiannopoulos | | * Author: Nikos Mavrogiannopoulos | |
| * | | * | |
| * This file is part of GnuTLS. | | * This file is part of GnuTLS. | |
| * | | * | |
| * The GnuTLS is free software; you can redistribute it and/or | | * The GnuTLS is free software; you can redistribute it and/or | |
| * modify it under the terms of the GNU Lesser General Public License | | * modify it under the terms of the GNU Lesser General Public License | |
| * as published by the Free Software Foundation; either version 3 of | | * as published by the Free Software Foundation; either version 3 of | |
| * the License, or (at your option) any later version. | | * the License, or (at your option) any later version. | |
| * | | * | |
| | | | |
| skipping to change at line 127 | | skipping to change at line 127 | |
| gnutls_pubkey_import_ecc_x962 (gnutls_pubkey_t key, | | gnutls_pubkey_import_ecc_x962 (gnutls_pubkey_t key, | |
| const gnutls_datum_t * parameters, | | const gnutls_datum_t * parameters, | |
| const gnutls_datum_t * ecpoint); | | const gnutls_datum_t * ecpoint); | |
| | | | |
| int | | int | |
| gnutls_pubkey_import_ecc_raw (gnutls_pubkey_t key, | | gnutls_pubkey_import_ecc_raw (gnutls_pubkey_t key, | |
| gnutls_ecc_curve_t curve, | | gnutls_ecc_curve_t curve, | |
| const gnutls_datum_t * x, | | const gnutls_datum_t * x, | |
| const gnutls_datum_t * y); | | const gnutls_datum_t * y); | |
| | | | |
|
| | | int | |
| | | gnutls_pubkey_encrypt_data (gnutls_pubkey_t key, unsigned int flags, | |
| | | const gnutls_datum_t * plaintext, | |
| | | gnutls_datum_t * ciphertext); | |
| | | | |
| int gnutls_x509_crt_set_pubkey (gnutls_x509_crt_t crt, gnutls_pubkey_t key)
; | | int gnutls_x509_crt_set_pubkey (gnutls_x509_crt_t crt, gnutls_pubkey_t key)
; | |
| | | | |
| int gnutls_x509_crq_set_pubkey (gnutls_x509_crq_t crq, gnutls_pubkey_t key)
; | | int gnutls_x509_crq_set_pubkey (gnutls_x509_crq_t crq, gnutls_pubkey_t key)
; | |
| | | | |
| #define GNUTLS_PUBKEY_VERIFY_FLAG_TLS_RSA 1 | | #define GNUTLS_PUBKEY_VERIFY_FLAG_TLS_RSA 1 | |
| int | | int | |
| gnutls_pubkey_verify_hash (gnutls_pubkey_t key, unsigned int flags, | | 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); | | const gnutls_datum_t * signature); | |
| int | | int | |
| | | | |
End of changes. 2 change blocks. |
| 1 lines changed or deleted | | 6 lines changed or added | |
|
| compat.h (3.0.11) | | compat.h (3.0.12) | |
| /* | | /* | |
|
| * Copyright (C) 2008-2011 Free Software Foundation, Inc. | | * Copyright (C) 2008-2012 Free Software Foundation, Inc. | |
| * | | * | |
| * Author: Nikos Mavrogiannopoulos | | * Author: Nikos Mavrogiannopoulos | |
| * | | * | |
| * This file is part of GnuTLS. | | * This file is part of GnuTLS. | |
| * | | * | |
| * The GnuTLS is free software; you can redistribute it and/or | | * The GnuTLS is free software; you can redistribute it and/or | |
| * modify it under the terms of the GNU Lesser General Public License | | * modify it under the terms of the GNU Lesser General Public License | |
| * as published by the Free Software Foundation; either version 3 of | | * as published by the Free Software Foundation; either version 3 of | |
| * the License, or (at your option) any later version. | | * the License, or (at your option) any later version. | |
| * | | * | |
| | | | |
| skipping to change at line 195 | | skipping to change at line 195 | |
| (gnutls_certificate_credentials_t cred, | | (gnutls_certificate_credentials_t cred, | |
| gnutls_certificate_client_retrieve_function * | | gnutls_certificate_client_retrieve_function * | |
| func) _GNUTLS_GCC_ATTR_DEPRECATED; | | func) _GNUTLS_GCC_ATTR_DEPRECATED; | |
| void | | void | |
| gnutls_certificate_server_set_retrieve_function | | gnutls_certificate_server_set_retrieve_function | |
| (gnutls_certificate_credentials_t cred, | | (gnutls_certificate_credentials_t cred, | |
| gnutls_certificate_server_retrieve_function * | | gnutls_certificate_server_retrieve_function * | |
| func) _GNUTLS_GCC_ATTR_DEPRECATED; | | func) _GNUTLS_GCC_ATTR_DEPRECATED; | |
| | | | |
| /* External signing callback. No longer supported because it | | /* External signing callback. No longer supported because it | |
|
| * was deprecated by the PKCS #11 API and gnutls_privkey_t. */ | | * was deprecated by the PKCS #11 API or gnutls_privkey_import_ext. */ | |
| typedef int (*gnutls_sign_func) (gnutls_session_t session, | | typedef int (*gnutls_sign_func) (gnutls_session_t session, | |
| void *userdata, | | void *userdata, | |
| gnutls_certificate_type_t cert_type, | | gnutls_certificate_type_t cert_type, | |
| const gnutls_datum_t * cert, | | const gnutls_datum_t * cert, | |
| const gnutls_datum_t * hash, | | const gnutls_datum_t * hash, | |
| gnutls_datum_t * signature); | | gnutls_datum_t * signature); | |
| | | | |
| void | | void | |
| gnutls_sign_callback_set (gnutls_session_t session, | | gnutls_sign_callback_set (gnutls_session_t session, | |
| gnutls_sign_func sign_func, void *userdata) | | gnutls_sign_func sign_func, void *userdata) | |
| | | | |
End of changes. 2 change blocks. |
| 2 lines changed or deleted | | 2 lines changed or added | |
|
| gnutls.h (3.0.11) | | gnutls.h (3.0.12) | |
| /* -*- c -*- | | /* -*- c -*- | |
|
| * Copyright (C) 2000-2011 Free Software Foundation, Inc. | | * Copyright (C) 2000-2012 Free Software Foundation, Inc. | |
| * | | * | |
| * Author: Nikos Mavrogiannopoulos | | * Author: Nikos Mavrogiannopoulos | |
| * | | * | |
| * This file is part of GnuTLS. | | * This file is part of GnuTLS. | |
| * | | * | |
| * The GnuTLS is free software; you can redistribute it and/or | | * The GnuTLS is free software; you can redistribute it and/or | |
| * modify it under the terms of the GNU Lesser General Public License | | * modify it under the terms of the GNU Lesser General Public License | |
| * as published by the Free Software Foundation; either version 3 of | | * as published by the Free Software Foundation; either version 3 of | |
| * the License, or (at your option) any later version. | | * the License, or (at your option) any later version. | |
| * | | * | |
| | | | |
| 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.11" | | #define GNUTLS_VERSION "3.0.12" | |
| | | | |
| #define GNUTLS_VERSION_MAJOR 3 | | #define GNUTLS_VERSION_MAJOR 3 | |
| #define GNUTLS_VERSION_MINOR 0 | | #define GNUTLS_VERSION_MINOR 0 | |
|
| #define GNUTLS_VERSION_PATCH 11 | | #define GNUTLS_VERSION_PATCH 12 | |
| | | | |
|
| #define GNUTLS_VERSION_NUMBER 0x03000b | | #define GNUTLS_VERSION_NUMBER 0x03000c | |
| | | | |
| #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 958 | | skipping to change at line 958 | |
| int gnutls_session_get_id (gnutls_session_t session, void *session_id, | | int gnutls_session_get_id (gnutls_session_t session, void *session_id, | |
| size_t * session_id_size); | | size_t * session_id_size); | |
| | | | |
| int gnutls_session_channel_binding (gnutls_session_t session, | | int gnutls_session_channel_binding (gnutls_session_t session, | |
| gnutls_channel_binding_t cbtype, | | gnutls_channel_binding_t cbtype, | |
| gnutls_datum_t * cb); | | gnutls_datum_t * cb); | |
| | | | |
| /* checks if this session is a resumed one | | /* checks if this session is a resumed one | |
| */ | | */ | |
| int gnutls_session_is_resumed (gnutls_session_t session); | | int gnutls_session_is_resumed (gnutls_session_t session); | |
|
| | | int gnutls_session_resumption_requested (gnutls_session_t session); | |
| | | | |
| typedef int (*gnutls_db_store_func) (void *, gnutls_datum_t key, | | typedef int (*gnutls_db_store_func) (void *, gnutls_datum_t key, | |
| gnutls_datum_t data); | | gnutls_datum_t data); | |
| typedef int (*gnutls_db_remove_func) (void *, gnutls_datum_t key); | | typedef int (*gnutls_db_remove_func) (void *, gnutls_datum_t key); | |
| typedef gnutls_datum_t (*gnutls_db_retr_func) (void *, gnutls_datum_t key
); | | typedef gnutls_datum_t (*gnutls_db_retr_func) (void *, gnutls_datum_t key
); | |
| | | | |
| void gnutls_db_set_cache_expiration (gnutls_session_t session, int second
s); | | void gnutls_db_set_cache_expiration (gnutls_session_t session, int second
s); | |
| | | | |
| void gnutls_db_remove_session (gnutls_session_t session); | | void gnutls_db_remove_session (gnutls_session_t session); | |
| void gnutls_db_set_retrieve_function (gnutls_session_t session, | | void gnutls_db_set_retrieve_function (gnutls_session_t session, | |
| | | | |
| skipping to change at line 1108 | | skipping to change at line 1109 | |
| const char *keyfile, | | const char *keyfile, | |
| gnutls_x509_crt_fmt_t type); | | gnutls_x509_crt_fmt_t type); | |
| int gnutls_certificate_set_x509_key_mem (gnutls_certificate_credentials_t | | int gnutls_certificate_set_x509_key_mem (gnutls_certificate_credentials_t | |
| res, const gnutls_datum_t * cert
, | | res, const gnutls_datum_t * cert
, | |
| const gnutls_datum_t * key, | | const gnutls_datum_t * key, | |
| gnutls_x509_crt_fmt_t type); | | gnutls_x509_crt_fmt_t type); | |
| | | | |
| void gnutls_certificate_send_x509_rdn_sequence (gnutls_session_t session, | | void gnutls_certificate_send_x509_rdn_sequence (gnutls_session_t session, | |
| int status); | | int status); | |
| | | | |
|
| int gnutls_certificate_set_x509_simple_pkcs12_file | | int gnutls_certificate_set_x509_simple_pkcs12_file (gnutls_certificate_cr | |
| (gnutls_certificate_credentials_t res, const char *pkcs12file, | | edentials_t res, const char *pkcs12file, | |
| gnutls_x509_crt_fmt_t type, const char *password); | | gnutls_x509_crt_fmt_t type, const char *password); | |
|
| int gnutls_certificate_set_x509_simple_pkcs12_mem | | int gnutls_certificate_set_x509_simple_pkcs12_mem (gnutls_certificate_cre | |
| (gnutls_certificate_credentials_t res, const gnutls_datum_t * p12blob, | | dentials_t res, const gnutls_datum_t * p12blob, | |
| gnutls_x509_crt_fmt_t type, const char *password); | | gnutls_x509_crt_fmt_t type, const char *password); | |
| | | | |
| /* New functions to allow setting already parsed X.509 stuff. | | /* New functions to allow setting already parsed X.509 stuff. | |
| */ | | */ | |
| | | | |
| int gnutls_certificate_set_x509_key (gnutls_certificate_credentials_t res
, | | int gnutls_certificate_set_x509_key (gnutls_certificate_credentials_t res
, | |
| gnutls_x509_crt_t * cert_list, | | gnutls_x509_crt_t * cert_list, | |
| int cert_list_size, | | int cert_list_size, | |
| gnutls_x509_privkey_t key); | | gnutls_x509_privkey_t key); | |
| int gnutls_certificate_set_x509_trust (gnutls_certificate_credentials_t r
es, | | int gnutls_certificate_set_x509_trust (gnutls_certificate_credentials_t r
es, | |
| | | | |
| skipping to change at line 1271 | | skipping to change at line 1270 | |
| | | | |
| 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); | |
| | | | |
| /* This function returns the hash of the given data. | | /* 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); | |
| | | | |
|
| | | /** | |
| | | * gnutls_random_art_t: | |
| | | * @GNUTLS_RANDOM_ART_OPENSSH: OpenSSH-style random art. | |
| | | * | |
| | | * Enumeration of different random art types. | |
| | | */ | |
| typedef enum gnutls_random_art | | typedef enum gnutls_random_art | |
| { | | { | |
| GNUTLS_RANDOM_ART_OPENSSH=1, | | GNUTLS_RANDOM_ART_OPENSSH=1, | |
| } gnutls_random_art_t; | | } gnutls_random_art_t; | |
| | | | |
| int gnutls_random_art (gnutls_random_art_t type, | | int gnutls_random_art (gnutls_random_art_t type, | |
|
| const char* key_name, unsigned int key_size, | | const char* key_type, unsigned int key_size, | |
| void * fpr, size_t fpr_size, | | void * fpr, size_t fpr_size, | |
| gnutls_datum_t* art); | | 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; | |
| | | | |
| skipping to change at line 1799 | | skipping to change at line 1804 | |
| #define GNUTLS_E_PKCS11_USER_ERROR -317 | | #define GNUTLS_E_PKCS11_USER_ERROR -317 | |
| | | | |
| #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_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. 10 change blocks. |
| 9 lines changed or deleted | | 17 lines changed or added | |
|
| x509.h (3.0.11) | | x509.h (3.0.12) | |
| /* | | /* | |
|
| * Copyright (C) 2003-2011 Free Software Foundation, Inc. | | * Copyright (C) 2003-2012 Free Software Foundation, Inc. | |
| * | | * | |
| * Author: Nikos Mavrogiannopoulos | | * Author: Nikos Mavrogiannopoulos | |
| * | | * | |
| * This file is part of GnuTLS. | | * This file is part of GnuTLS. | |
| * | | * | |
| * The GnuTLS is free software; you can redistribute it and/or | | * The GnuTLS is free software; you can redistribute it and/or | |
| * modify it under the terms of the GNU Lesser General Public License | | * modify it under the terms of the GNU Lesser General Public License | |
| * as published by the Free Software Foundation; either version 3 of | | * as published by the Free Software Foundation; either version 3 of | |
| * the License, or (at your option) any later version. | | * the License, or (at your option) any later version. | |
| * | | * | |
| | | | |
| skipping to change at line 298 | | skipping to change at line 298 | |
| unsigned int usage); | | unsigned int usage); | |
| | | | |
| 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); | |
| | | | |
| 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 | |
| | | 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, | |
| void *buf, size_t * buf_size, | | void *buf, size_t * buf_size, | |
| 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, | |
| | | | |
End of changes. 2 change blocks. |
| 1 lines changed or deleted | | 5 lines changed or added | |
|