summaryrefslogtreecommitdiff
path: root/lib/includes
diff options
context:
space:
mode:
authorZoltan Fridrich <zfridric@redhat.com>2023-01-27 15:03:53 +0100
committerZoltan Fridrich <zfridric@redhat.com>2023-01-27 15:11:28 +0100
commit50e0c39fc9b8e0ae493f42a3046db5e70f8ea044 (patch)
tree36d6eb0dde4d81527a07017d6df7d1dd4b7e436e /lib/includes
parent21288eb0ce9d27f00c4f8ac8048b22f4003f65ac (diff)
downloadgnutls-50e0c39fc9b8e0ae493f42a3046db5e70f8ea044.tar.gz
Indent code
Co-authored-by: Simon Josefsson <simon@josefsson.org> Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
Diffstat (limited to 'lib/includes')
-rw-r--r--lib/includes/gnutls/abstract.h419
-rw-r--r--lib/includes/gnutls/compat.h139
-rw-r--r--lib/includes/gnutls/crypto.h241
-rw-r--r--lib/includes/gnutls/dtls.h8
-rw-r--r--lib/includes/gnutls/gnutls.h.in1675
-rw-r--r--lib/includes/gnutls/gnutlsxx.h105
-rw-r--r--lib/includes/gnutls/ocsp.h53
-rw-r--r--lib/includes/gnutls/openpgp.h324
-rw-r--r--lib/includes/gnutls/pkcs11.h284
-rw-r--r--lib/includes/gnutls/pkcs12.h42
-rw-r--r--lib/includes/gnutls/pkcs7.h65
-rw-r--r--lib/includes/gnutls/self-test.h12
-rw-r--r--lib/includes/gnutls/socket.h16
-rw-r--r--lib/includes/gnutls/system-keys.h25
-rw-r--r--lib/includes/gnutls/tpm.h14
-rw-r--r--lib/includes/gnutls/urls.h26
-rw-r--r--lib/includes/gnutls/x509-ext.h184
-rw-r--r--lib/includes/gnutls/x509.h919
18 files changed, 2225 insertions, 2326 deletions
diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h
index c9f8067c13..4b4a718416 100644
--- a/lib/includes/gnutls/abstract.h
+++ b/lib/includes/gnutls/abstract.h
@@ -22,13 +22,13 @@
*/
#ifndef GNUTLS_ABSTRACT_H
-#define GNUTLS_ABSTRACT_H
+# define GNUTLS_ABSTRACT_H
-#include <gnutls/gnutls.h>
-#include <gnutls/x509.h>
-#include <gnutls/pkcs11.h>
-#include <gnutls/openpgp.h>
-#include <gnutls/tpm.h>
+# include <gnutls/gnutls.h>
+# include <gnutls/x509.h>
+# include <gnutls/pkcs11.h>
+# include <gnutls/openpgp.h>
+# include <gnutls/tpm.h>
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -38,7 +38,7 @@ extern "C" {
/* Public key operations */
-#define GNUTLS_PUBKEY_VERIFY_FLAG_TLS_RSA GNUTLS_PUBKEY_VERIFY_FLAG_TLS1_RSA
+# define GNUTLS_PUBKEY_VERIFY_FLAG_TLS_RSA GNUTLS_PUBKEY_VERIFY_FLAG_TLS1_RSA
/**
* gnutls_pubkey_flags:
* @GNUTLS_PUBKEY_DISABLE_CALLBACKS: The following flag disables call to PIN callbacks. Only
@@ -62,24 +62,23 @@ typedef enum gnutls_abstract_export_flags {
GNUTLS_EXPORT_FLAG_NO_LZ = 1
} gnutls_abstract_export_flags_t;
-#define GNUTLS_PUBKEY_VERIFY_FLAG_TLS1_RSA GNUTLS_VERIFY_USE_TLS1_RSA
+# define GNUTLS_PUBKEY_VERIFY_FLAG_TLS1_RSA GNUTLS_VERIFY_USE_TLS1_RSA
-typedef int (*gnutls_privkey_sign_func) (gnutls_privkey_t key,
- void *userdata,
- const gnutls_datum_t *raw_data,
- gnutls_datum_t * signature);
+typedef int (*gnutls_privkey_sign_func)(gnutls_privkey_t key,
+ void *userdata,
+ const gnutls_datum_t * raw_data,
+ gnutls_datum_t * signature);
+typedef int (*gnutls_privkey_decrypt_func)(gnutls_privkey_t key,
+ void *userdata,
+ const gnutls_datum_t * ciphertext,
+ gnutls_datum_t * plaintext);
-typedef int (*gnutls_privkey_decrypt_func) (gnutls_privkey_t key,
+typedef int (*gnutls_privkey_decrypt_func2)(gnutls_privkey_t key,
void *userdata,
- const gnutls_datum_t *ciphertext,
- gnutls_datum_t * plaintext);
-
-typedef int (*gnutls_privkey_decrypt_func2) (gnutls_privkey_t key,
- void *userdata,
- const gnutls_datum_t *ciphertext,
- unsigned char * plaintext,
- size_t plaintext_size);
+ const gnutls_datum_t * ciphertext,
+ unsigned char *plaintext,
+ size_t plaintext_size);
/* to be called to sign pre-hashed data. The input will be
* the output of the hash (such as SHA256) corresponding to
@@ -87,46 +86,46 @@ typedef int (*gnutls_privkey_decrypt_func2) (gnutls_privkey_t key,
* will be provided when RSA PKCS#1 DigestInfo structure is provided
* as data (when this is called from a TLS 1.0 or 1.1 session).
*/
-typedef int (*gnutls_privkey_sign_hash_func) (gnutls_privkey_t key,
- gnutls_sign_algorithm_t algo,
- void *userdata,
- unsigned int flags,
- const gnutls_datum_t *hash,
- gnutls_datum_t * signature);
+typedef int (*gnutls_privkey_sign_hash_func)(gnutls_privkey_t key,
+ gnutls_sign_algorithm_t algo,
+ void *userdata,
+ unsigned int flags,
+ const gnutls_datum_t * hash,
+ gnutls_datum_t * signature);
/* to be called to sign data. The input data will be
* the data to be signed (and hashed), with the provided
* signature algorithm. This function is used for algorithms
* like ed25519 which cannot take pre-hashed data as input.
*/
-typedef int (*gnutls_privkey_sign_data_func) (gnutls_privkey_t key,
- gnutls_sign_algorithm_t algo,
- void *userdata,
- unsigned int flags,
- const gnutls_datum_t *data,
- gnutls_datum_t * signature);
-
-typedef void (*gnutls_privkey_deinit_func) (gnutls_privkey_t key,
- void *userdata);
+typedef int (*gnutls_privkey_sign_data_func)(gnutls_privkey_t key,
+ gnutls_sign_algorithm_t algo,
+ void *userdata,
+ unsigned int flags,
+ const gnutls_datum_t * data,
+ gnutls_datum_t * signature);
+typedef void (*gnutls_privkey_deinit_func)(gnutls_privkey_t key,
+ void *userdata);
-#define GNUTLS_SIGN_ALGO_TO_FLAGS(sig) (unsigned int)((sig)<<20)
-#define GNUTLS_FLAGS_TO_SIGN_ALGO(flags) (unsigned int)((flags)>>20)
+# define GNUTLS_SIGN_ALGO_TO_FLAGS(sig) (unsigned int)((sig)<<20)
+# define GNUTLS_FLAGS_TO_SIGN_ALGO(flags) (unsigned int)((flags)>>20)
/* Should return the public key algorithm (gnutls_pk_algorithm_t) */
-#define GNUTLS_PRIVKEY_INFO_PK_ALGO 1
+# define GNUTLS_PRIVKEY_INFO_PK_ALGO 1
/* Should return the preferred signature algorithm (gnutls_sign_algorithm_t) or 0. */
-#define GNUTLS_PRIVKEY_INFO_SIGN_ALGO (1<<1)
+# define GNUTLS_PRIVKEY_INFO_SIGN_ALGO (1<<1)
/* Should return true (1) or false (0) if the provided sign algorithm
* (obtained with GNUTLS_FLAGS_TO_SIGN_ALGO) is supported.
*/
-#define GNUTLS_PRIVKEY_INFO_HAVE_SIGN_ALGO (1<<2)
+# define GNUTLS_PRIVKEY_INFO_HAVE_SIGN_ALGO (1<<2)
/* Should return the number of bits of the public key algorithm (required for RSA-PSS)
* It is the value that should be returned by gnutls_pubkey_get_pk_algorithm() */
-#define GNUTLS_PRIVKEY_INFO_PK_ALGO_BITS (1<<3)
+# define GNUTLS_PRIVKEY_INFO_PK_ALGO_BITS (1<<3)
/* returns information on the public key associated with userdata */
-typedef int (*gnutls_privkey_info_func) (gnutls_privkey_t key, unsigned int flags, void *userdata);
+typedef int (*gnutls_privkey_info_func)(gnutls_privkey_t key,
+ unsigned int flags, void *userdata);
int gnutls_pubkey_init(gnutls_pubkey_t * key);
void gnutls_pubkey_deinit(gnutls_pubkey_t key);
@@ -134,33 +133,26 @@ void gnutls_pubkey_deinit(gnutls_pubkey_t key);
int gnutls_pubkey_verify_params(gnutls_pubkey_t key);
void gnutls_pubkey_set_pin_function(gnutls_pubkey_t key,
- gnutls_pin_callback_t fn,
- void *userdata);
+ gnutls_pin_callback_t fn, void *userdata);
-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_set_spki(gnutls_pubkey_t key,
- const gnutls_x509_spki_t spki,
- unsigned int flags);
+ const gnutls_x509_spki_t spki, unsigned int flags);
int
gnutls_pubkey_get_spki(gnutls_pubkey_t key,
- const gnutls_x509_spki_t spki,
- unsigned int flags);
+ const gnutls_x509_spki_t spki, unsigned int flags);
int gnutls_pubkey_import_x509(gnutls_pubkey_t key,
gnutls_x509_crt_t crt, unsigned int flags);
int gnutls_pubkey_import_x509_crq(gnutls_pubkey_t key,
- gnutls_x509_crq_t crq,
- unsigned int flags);
+ gnutls_x509_crq_t crq, unsigned int flags);
int gnutls_pubkey_import_pkcs11(gnutls_pubkey_t key,
- gnutls_pkcs11_obj_t obj,
- unsigned int flags);
+ gnutls_pkcs11_obj_t obj, unsigned int flags);
int gnutls_pubkey_import_openpgp(gnutls_pubkey_t key,
- gnutls_openpgp_crt_t crt,
- unsigned int flags);
+ gnutls_openpgp_crt_t crt, unsigned int flags);
int gnutls_pubkey_import_openpgp_raw(gnutls_pubkey_t pkey,
const gnutls_datum_t * data,
@@ -197,7 +189,7 @@ int gnutls_pubkey_get_preferred_hash_algorithm(gnutls_pubkey_t key,
gnutls_digest_algorithm_t
* hash, unsigned int *mand);
-#define gnutls_pubkey_get_pk_rsa_raw gnutls_pubkey_export_rsa_raw
+# define gnutls_pubkey_get_pk_rsa_raw gnutls_pubkey_export_rsa_raw
int gnutls_pubkey_export_rsa_raw(gnutls_pubkey_t key,
gnutls_datum_t * m, gnutls_datum_t * e);
@@ -205,22 +197,22 @@ int gnutls_pubkey_export_rsa_raw2(gnutls_pubkey_t key,
gnutls_datum_t * m, gnutls_datum_t * e,
unsigned flags);
-#define gnutls_pubkey_get_pk_dsa_raw gnutls_pubkey_export_dsa_raw
+# define gnutls_pubkey_get_pk_dsa_raw gnutls_pubkey_export_dsa_raw
int gnutls_pubkey_export_dsa_raw(gnutls_pubkey_t key,
gnutls_datum_t * p,
gnutls_datum_t * q,
gnutls_datum_t * g, gnutls_datum_t * y);
int gnutls_pubkey_export_dsa_raw2(gnutls_pubkey_t key,
- gnutls_datum_t * p,
- gnutls_datum_t * q,
- gnutls_datum_t * g, gnutls_datum_t * y,
- unsigned flags);
+ gnutls_datum_t * p,
+ gnutls_datum_t * q,
+ gnutls_datum_t * g, gnutls_datum_t * y,
+ unsigned flags);
int gnutls_pubkey_export_ecc_raw2(gnutls_pubkey_t key,
- gnutls_ecc_curve_t * curve,
- gnutls_datum_t * x, gnutls_datum_t * y,
- unsigned flags);
+ gnutls_ecc_curve_t * curve,
+ gnutls_datum_t * x, gnutls_datum_t * y,
+ unsigned flags);
int gnutls_pubkey_export_gost_raw2(gnutls_pubkey_t key,
gnutls_ecc_curve_t * curve,
@@ -229,34 +221,33 @@ int gnutls_pubkey_export_gost_raw2(gnutls_pubkey_t key,
gnutls_datum_t * x, gnutls_datum_t * y,
unsigned int flags);
-#define gnutls_pubkey_get_pk_ecc_raw gnutls_pubkey_export_ecc_raw
+# define gnutls_pubkey_get_pk_ecc_raw gnutls_pubkey_export_ecc_raw
int gnutls_pubkey_export_ecc_raw(gnutls_pubkey_t key,
gnutls_ecc_curve_t * curve,
gnutls_datum_t * x, gnutls_datum_t * y);
-#define gnutls_pubkey_get_pk_ecc_x962 gnutls_pubkey_export_ecc_x962
+# define gnutls_pubkey_get_pk_ecc_x962 gnutls_pubkey_export_ecc_x962
int gnutls_pubkey_export_ecc_x962(gnutls_pubkey_t key,
gnutls_datum_t * parameters,
gnutls_datum_t * ecpoint);
int gnutls_pubkey_export(gnutls_pubkey_t key,
gnutls_x509_crt_fmt_t format,
- void *output_data, size_t * output_data_size);
+ void *output_data, size_t *output_data_size);
int gnutls_pubkey_export2(gnutls_pubkey_t key,
- gnutls_x509_crt_fmt_t format,
- gnutls_datum_t * out);
+ gnutls_x509_crt_fmt_t format, gnutls_datum_t * out);
int gnutls_pubkey_get_key_id(gnutls_pubkey_t key,
unsigned int flags,
unsigned char *output_data,
- size_t * output_data_size);
+ size_t *output_data_size);
int
gnutls_pubkey_get_openpgp_key_id(gnutls_pubkey_t key,
unsigned int flags,
unsigned char *output_data,
- size_t * output_data_size,
+ size_t *output_data_size,
unsigned int *subkey);
int gnutls_pubkey_get_key_usage(gnutls_pubkey_t key, unsigned int *usage);
@@ -266,8 +257,7 @@ int gnutls_pubkey_import(gnutls_pubkey_t key,
const gnutls_datum_t * data,
gnutls_x509_crt_fmt_t format);
-
-#define gnutls_pubkey_import_pkcs11_url(key, url, flags) gnutls_pubkey_import_url(key, url, flags)
+# define gnutls_pubkey_import_pkcs11_url(key, url, flags) gnutls_pubkey_import_url(key, url, flags)
int gnutls_pubkey_import_dsa_raw(gnutls_pubkey_t key,
const gnutls_datum_t * p,
@@ -291,11 +281,11 @@ gnutls_pubkey_import_ecc_raw(gnutls_pubkey_t key,
int
gnutls_pubkey_import_gost_raw(gnutls_pubkey_t key,
- gnutls_ecc_curve_t curve,
- gnutls_digest_algorithm_t digest,
- gnutls_gost_paramset_t paramset,
- const gnutls_datum_t * x,
- const gnutls_datum_t * y);
+ gnutls_ecc_curve_t curve,
+ gnutls_digest_algorithm_t digest,
+ gnutls_gost_paramset_t paramset,
+ const gnutls_datum_t * x,
+ const gnutls_datum_t * y);
int
gnutls_pubkey_encrypt_data(gnutls_pubkey_t key,
@@ -328,42 +318,42 @@ void gnutls_privkey_deinit(gnutls_privkey_t key);
/* macros to allow specifying a subgroup and group size in gnutls_privkey_generate()
* and gnutls_x509_privkey_generate() */
-#define GNUTLS_SUBGROUP_TO_BITS(group, subgroup) (unsigned int)((subgroup<<16)|(group))
-#define GNUTLS_BITS_TO_SUBGROUP(bits) ((bits >> 16) & 0xFFFF)
-#define GNUTLS_BITS_TO_GROUP(bits) (bits & 0xFFFF)
-#define GNUTLS_BITS_HAVE_SUBGROUP(bits) ((bits) & 0xFFFF0000)
+# define GNUTLS_SUBGROUP_TO_BITS(group, subgroup) (unsigned int)((subgroup<<16)|(group))
+# define GNUTLS_BITS_TO_SUBGROUP(bits) ((bits >> 16) & 0xFFFF)
+# define GNUTLS_BITS_TO_GROUP(bits) (bits & 0xFFFF)
+# define GNUTLS_BITS_HAVE_SUBGROUP(bits) ((bits) & 0xFFFF0000)
int
-gnutls_privkey_generate (gnutls_privkey_t key,
- gnutls_pk_algorithm_t algo, unsigned int bits,
- unsigned int flags);
+gnutls_privkey_generate(gnutls_privkey_t key,
+ gnutls_pk_algorithm_t algo, unsigned int bits,
+ unsigned int flags);
int
gnutls_privkey_generate2(gnutls_privkey_t pkey,
gnutls_pk_algorithm_t algo, unsigned int bits,
- unsigned int flags, const gnutls_keygen_data_st *data, unsigned data_size);
+ unsigned int flags, const gnutls_keygen_data_st * data,
+ unsigned data_size);
int
gnutls_privkey_set_spki(gnutls_privkey_t key,
- const gnutls_x509_spki_t spki,
- unsigned int flags);
+ const gnutls_x509_spki_t spki, unsigned int flags);
int
gnutls_privkey_get_spki(gnutls_privkey_t key,
- const gnutls_x509_spki_t spki,
- unsigned int flags);
+ const gnutls_x509_spki_t spki, unsigned int flags);
-int gnutls_privkey_verify_seed(gnutls_privkey_t key, gnutls_digest_algorithm_t, const void *seed, size_t seed_size);
-int gnutls_privkey_get_seed(gnutls_privkey_t key, gnutls_digest_algorithm_t*, void *seed, size_t *seed_size);
+int gnutls_privkey_verify_seed(gnutls_privkey_t key, gnutls_digest_algorithm_t,
+ const void *seed, size_t seed_size);
+int gnutls_privkey_get_seed(gnutls_privkey_t key, gnutls_digest_algorithm_t *,
+ void *seed, size_t *seed_size);
int gnutls_privkey_verify_params(gnutls_privkey_t key);
void gnutls_privkey_set_flags(gnutls_privkey_t key, unsigned int flags);
-void gnutls_privkey_set_pin_function (gnutls_privkey_t key,
- gnutls_pin_callback_t fn, void *userdata);
+void gnutls_privkey_set_pin_function(gnutls_privkey_t key,
+ gnutls_pin_callback_t fn, void *userdata);
-int gnutls_privkey_get_pk_algorithm(gnutls_privkey_t key,
- unsigned int *bits);
+int gnutls_privkey_get_pk_algorithm(gnutls_privkey_t key, unsigned int *bits);
gnutls_privkey_type_t gnutls_privkey_get_type(gnutls_privkey_t key);
int gnutls_privkey_status(gnutls_privkey_t key);
@@ -411,19 +401,18 @@ int gnutls_privkey_import_pkcs11(gnutls_privkey_t pkey,
gnutls_pkcs11_privkey_t key,
unsigned int flags);
int gnutls_privkey_import_x509(gnutls_privkey_t pkey,
- gnutls_x509_privkey_t key,
- unsigned int flags);
+ gnutls_x509_privkey_t key, unsigned int flags);
int gnutls_privkey_import_openpgp(gnutls_privkey_t pkey,
gnutls_openpgp_privkey_t key,
unsigned int flags);
int gnutls_privkey_export_x509(gnutls_privkey_t pkey,
- gnutls_x509_privkey_t * key);
+ gnutls_x509_privkey_t * key);
int gnutls_privkey_export_openpgp(gnutls_privkey_t pkey,
- gnutls_openpgp_privkey_t * key);
+ gnutls_openpgp_privkey_t * key);
int
gnutls_privkey_export_pkcs11(gnutls_privkey_t pkey,
- gnutls_pkcs11_privkey_t *key);
+ gnutls_pkcs11_privkey_t * key);
int gnutls_privkey_import_openpgp_raw(gnutls_privkey_t pkey,
const gnutls_datum_t * data,
@@ -435,33 +424,30 @@ int gnutls_privkey_import_openpgp_raw(gnutls_privkey_t pkey,
int gnutls_privkey_import_x509_raw(gnutls_privkey_t pkey,
const gnutls_datum_t * data,
gnutls_x509_crt_fmt_t format,
- const char *password,
- unsigned int flags);
+ const char *password, unsigned int flags);
int
gnutls_privkey_import_tpm_raw(gnutls_privkey_t pkey,
const gnutls_datum_t * fdata,
gnutls_tpmkey_fmt_t format,
const char *srk_password,
- const char *key_password,
- unsigned int flags);
+ const char *key_password, unsigned int flags);
int
gnutls_privkey_import_tpm_url(gnutls_privkey_t pkey,
const char *url,
const char *srk_password,
- const char *key_password,
- unsigned int flags);
+ const char *key_password, unsigned int flags);
int gnutls_privkey_import_url(gnutls_privkey_t key,
const char *url, unsigned int flags);
-#if 0
+# if 0
/* for documentation purposes */
int gnutls_privkey_import_pkcs11_url(gnutls_privkey_t key, const char *url);
-#endif
+# endif
-#define gnutls_privkey_import_pkcs11_url(key, url) gnutls_privkey_import_url(key, url, 0)
+# define gnutls_privkey_import_pkcs11_url(key, url) gnutls_privkey_import_url(key, url, 0)
int
gnutls_privkey_import_ext(gnutls_privkey_t pkey,
@@ -483,53 +469,52 @@ gnutls_privkey_import_ext2(gnutls_privkey_t pkey,
int
gnutls_privkey_import_ext3(gnutls_privkey_t pkey,
- void *userdata,
- gnutls_privkey_sign_func sign_func,
- gnutls_privkey_decrypt_func decrypt_func,
- gnutls_privkey_deinit_func deinit_func,
- gnutls_privkey_info_func info_func,
- unsigned int flags);
+ void *userdata,
+ gnutls_privkey_sign_func sign_func,
+ gnutls_privkey_decrypt_func decrypt_func,
+ gnutls_privkey_deinit_func deinit_func,
+ gnutls_privkey_info_func info_func,
+ unsigned int flags);
int
gnutls_privkey_import_ext4(gnutls_privkey_t pkey,
- void *userdata,
- gnutls_privkey_sign_data_func sign_data_func,
- gnutls_privkey_sign_hash_func sign_hash_func,
- gnutls_privkey_decrypt_func decrypt_func,
- gnutls_privkey_deinit_func deinit_func,
- gnutls_privkey_info_func info_func,
- unsigned int flags);
+ void *userdata,
+ gnutls_privkey_sign_data_func sign_data_func,
+ gnutls_privkey_sign_hash_func sign_hash_func,
+ gnutls_privkey_decrypt_func decrypt_func,
+ gnutls_privkey_deinit_func deinit_func,
+ gnutls_privkey_info_func info_func,
+ unsigned int flags);
int gnutls_privkey_import_dsa_raw(gnutls_privkey_t key,
- const gnutls_datum_t * p,
- const gnutls_datum_t * q,
- const gnutls_datum_t * g,
- const gnutls_datum_t * y,
- const gnutls_datum_t * x);
+ const gnutls_datum_t * p,
+ const gnutls_datum_t * q,
+ const gnutls_datum_t * g,
+ const gnutls_datum_t * y,
+ const gnutls_datum_t * x);
int gnutls_privkey_import_rsa_raw(gnutls_privkey_t key,
- const gnutls_datum_t * m,
- const gnutls_datum_t * e,
- const gnutls_datum_t * d,
- const gnutls_datum_t * p,
- const gnutls_datum_t * q,
- const gnutls_datum_t * u,
- const gnutls_datum_t * e1,
- const gnutls_datum_t * e2);
+ const gnutls_datum_t * m,
+ const gnutls_datum_t * e,
+ const gnutls_datum_t * d,
+ const gnutls_datum_t * p,
+ const gnutls_datum_t * q,
+ const gnutls_datum_t * u,
+ const gnutls_datum_t * e1,
+ const gnutls_datum_t * e2);
int gnutls_privkey_import_ecc_raw(gnutls_privkey_t key,
- gnutls_ecc_curve_t curve,
- const gnutls_datum_t * x,
- const gnutls_datum_t * y,
- const gnutls_datum_t * k);
+ gnutls_ecc_curve_t curve,
+ const gnutls_datum_t * x,
+ const gnutls_datum_t * y,
+ const gnutls_datum_t * k);
int gnutls_privkey_import_gost_raw(gnutls_privkey_t key,
- gnutls_ecc_curve_t curve,
- gnutls_digest_algorithm_t digest,
- gnutls_gost_paramset_t paramset,
- const gnutls_datum_t * x,
- const gnutls_datum_t * y,
- const gnutls_datum_t * k);
-
+ gnutls_ecc_curve_t curve,
+ gnutls_digest_algorithm_t digest,
+ gnutls_gost_paramset_t paramset,
+ const gnutls_datum_t * x,
+ const gnutls_datum_t * y,
+ const gnutls_datum_t * k);
int gnutls_privkey_sign_data(gnutls_privkey_t signer,
gnutls_digest_algorithm_t hash,
@@ -543,7 +528,7 @@ int gnutls_privkey_sign_data2(gnutls_privkey_t signer,
const gnutls_datum_t * data,
gnutls_datum_t * signature);
-#define gnutls_privkey_sign_raw_data(key, flags, data, sig) \
+# define gnutls_privkey_sign_raw_data(key, flags, data, sig) \
gnutls_privkey_sign_hash ( key, 0, GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA, data, sig)
int gnutls_privkey_sign_hash(gnutls_privkey_t signer,
@@ -566,62 +551,57 @@ int gnutls_privkey_decrypt_data(gnutls_privkey_t key,
int gnutls_privkey_decrypt_data2(gnutls_privkey_t key,
unsigned int flags,
const gnutls_datum_t * ciphertext,
- unsigned char * plaintext,
- size_t plaintext_size);
+ unsigned char *plaintext,
+ size_t plaintext_size);
int
gnutls_privkey_export_rsa_raw(gnutls_privkey_t key,
- gnutls_datum_t * m, gnutls_datum_t * e,
- gnutls_datum_t * d, gnutls_datum_t * p,
- gnutls_datum_t * q, gnutls_datum_t * u,
- gnutls_datum_t * e1,
- gnutls_datum_t * e2);
+ gnutls_datum_t * m, gnutls_datum_t * e,
+ gnutls_datum_t * d, gnutls_datum_t * p,
+ gnutls_datum_t * q, gnutls_datum_t * u,
+ gnutls_datum_t * e1, gnutls_datum_t * e2);
int
gnutls_privkey_export_rsa_raw2(gnutls_privkey_t key,
- gnutls_datum_t * m, gnutls_datum_t * e,
- gnutls_datum_t * d, gnutls_datum_t * p,
- gnutls_datum_t * q, gnutls_datum_t * u,
- gnutls_datum_t * e1,
- gnutls_datum_t * e2, unsigned flags);
+ gnutls_datum_t * m, gnutls_datum_t * e,
+ gnutls_datum_t * d, gnutls_datum_t * p,
+ gnutls_datum_t * q, gnutls_datum_t * u,
+ gnutls_datum_t * e1,
+ gnutls_datum_t * e2, unsigned flags);
int
gnutls_privkey_export_dsa_raw(gnutls_privkey_t key,
- gnutls_datum_t * p, gnutls_datum_t * q,
- gnutls_datum_t * g, gnutls_datum_t * y,
- gnutls_datum_t * x);
+ gnutls_datum_t * p, gnutls_datum_t * q,
+ gnutls_datum_t * g, gnutls_datum_t * y,
+ gnutls_datum_t * x);
int
gnutls_privkey_export_dsa_raw2(gnutls_privkey_t key,
- gnutls_datum_t * p, gnutls_datum_t * q,
- gnutls_datum_t * g, gnutls_datum_t * y,
- gnutls_datum_t * x, unsigned flags);
+ gnutls_datum_t * p, gnutls_datum_t * q,
+ gnutls_datum_t * g, gnutls_datum_t * y,
+ gnutls_datum_t * x, unsigned flags);
int
gnutls_privkey_export_ecc_raw(gnutls_privkey_t key,
- gnutls_ecc_curve_t * curve,
- gnutls_datum_t * x,
- gnutls_datum_t * y,
- gnutls_datum_t * k);
+ gnutls_ecc_curve_t * curve,
+ gnutls_datum_t * x,
+ gnutls_datum_t * y, gnutls_datum_t * k);
int
gnutls_privkey_export_ecc_raw2(gnutls_privkey_t key,
- gnutls_ecc_curve_t * curve,
- gnutls_datum_t * x,
- gnutls_datum_t * y,
- gnutls_datum_t * k,
- unsigned flags);
+ gnutls_ecc_curve_t * curve,
+ gnutls_datum_t * x,
+ gnutls_datum_t * y,
+ gnutls_datum_t * k, unsigned flags);
int
gnutls_privkey_export_gost_raw2(gnutls_privkey_t key,
- gnutls_ecc_curve_t * curve,
- gnutls_digest_algorithm_t * digest,
- gnutls_gost_paramset_t * paramset,
- gnutls_datum_t * x,
- gnutls_datum_t * y,
- gnutls_datum_t * k,
- unsigned flags);
-
+ gnutls_ecc_curve_t * curve,
+ gnutls_digest_algorithm_t * digest,
+ gnutls_gost_paramset_t * paramset,
+ gnutls_datum_t * x,
+ gnutls_datum_t * y,
+ gnutls_datum_t * k, unsigned flags);
int gnutls_x509_crt_privkey_sign(gnutls_x509_crt_t crt,
gnutls_x509_crt_t issuer,
@@ -655,17 +635,16 @@ typedef struct gnutls_pcert_st {
} gnutls_pcert_st;
/* This flag is unused/ignored */
-#define GNUTLS_PCERT_NO_CERT 1
+# define GNUTLS_PCERT_NO_CERT 1
int gnutls_pcert_import_x509(gnutls_pcert_st * pcert,
gnutls_x509_crt_t crt, unsigned int flags);
int gnutls_pcert_import_x509_list(gnutls_pcert_st * pcert,
- gnutls_x509_crt_t *crt, unsigned *ncrt,
+ gnutls_x509_crt_t * crt, unsigned *ncrt,
unsigned int flags);
-int gnutls_pcert_export_x509(gnutls_pcert_st * pcert,
- gnutls_x509_crt_t * crt);
+int gnutls_pcert_export_x509(gnutls_pcert_st * pcert, gnutls_x509_crt_t * crt);
int
gnutls_pcert_list_import_x509_raw(gnutls_pcert_st * pcerts,
@@ -674,7 +653,7 @@ gnutls_pcert_list_import_x509_raw(gnutls_pcert_st * pcerts,
gnutls_x509_crt_fmt_t format,
unsigned int flags);
-int gnutls_pcert_list_import_x509_file(gnutls_pcert_st *pcert_list,
+int gnutls_pcert_list_import_x509_file(gnutls_pcert_st * pcert_list,
unsigned *pcert_list_size,
const char *file,
gnutls_x509_crt_fmt_t format,
@@ -695,21 +674,20 @@ int gnutls_pcert_import_openpgp_raw(gnutls_pcert_st * pcert,
unsigned int flags);
int gnutls_pcert_import_openpgp(gnutls_pcert_st * pcert,
- gnutls_openpgp_crt_t crt,
- unsigned int flags);
+ gnutls_openpgp_crt_t crt, unsigned int flags);
int gnutls_pcert_export_openpgp(gnutls_pcert_st * pcert,
- gnutls_openpgp_crt_t * crt);
+ gnutls_openpgp_crt_t * crt);
void gnutls_pcert_deinit(gnutls_pcert_st * pcert);
-int gnutls_pcert_import_rawpk(gnutls_pcert_st* pcert,
- gnutls_pubkey_t key, unsigned int flags);
+int gnutls_pcert_import_rawpk(gnutls_pcert_st * pcert,
+ gnutls_pubkey_t key, unsigned int flags);
-int gnutls_pcert_import_rawpk_raw(gnutls_pcert_st* pcert,
- const gnutls_datum_t* rawpubkey,
- gnutls_x509_crt_fmt_t format,
- unsigned int key_usage, unsigned int flags);
+int gnutls_pcert_import_rawpk_raw(gnutls_pcert_st * pcert,
+ const gnutls_datum_t * rawpubkey,
+ gnutls_x509_crt_fmt_t format,
+ unsigned int key_usage, unsigned int flags);
/* For certificate credentials */
/* This is the same as gnutls_certificate_retrieve_function()
@@ -717,21 +695,20 @@ int gnutls_pcert_import_rawpk_raw(gnutls_pcert_st* pcert,
* within the library.
*/
typedef int gnutls_certificate_retrieve_function2(gnutls_session_t,
- const gnutls_datum_t *req_ca_rdn,
- int nreqs,
- const gnutls_pk_algorithm_t *pk_algos,
- int pk_algos_length,
- gnutls_pcert_st**,
- unsigned int *pcert_length,
- gnutls_privkey_t *privkey);
-
+ const gnutls_datum_t *
+ req_ca_rdn, int nreqs,
+ const gnutls_pk_algorithm_t *
+ pk_algos, int pk_algos_length,
+ gnutls_pcert_st **,
+ unsigned int *pcert_length,
+ gnutls_privkey_t * privkey);
void gnutls_certificate_set_retrieve_function2
(gnutls_certificate_credentials_t cred,
- gnutls_certificate_retrieve_function2 *func);
+ gnutls_certificate_retrieve_function2 * func);
struct gnutls_cert_retr_st {
- unsigned version; /* set to 1 */
+ unsigned version; /* set to 1 */
gnutls_certificate_credentials_t cred;
const gnutls_datum_t *req_ca_rdn;
unsigned nreqs;
@@ -744,22 +721,20 @@ struct gnutls_cert_retr_st {
/* When the callback sets this value, gnutls will deinitialize the given
* values after use */
-#define GNUTLS_CERT_RETR_DEINIT_ALL 1
-
-typedef int gnutls_certificate_retrieve_function3(
- gnutls_session_t,
- const struct gnutls_cert_retr_st *info,
- gnutls_pcert_st **certs,
- unsigned int *certs_length,
- gnutls_ocsp_data_st **ocsp,
- unsigned int *ocsp_length,
- gnutls_privkey_t *privkey,
- unsigned int *flags);
+# define GNUTLS_CERT_RETR_DEINIT_ALL 1
+typedef int gnutls_certificate_retrieve_function3(gnutls_session_t, const struct
+ gnutls_cert_retr_st *info,
+ gnutls_pcert_st ** certs,
+ unsigned int *certs_length,
+ gnutls_ocsp_data_st ** ocsp,
+ unsigned int *ocsp_length,
+ gnutls_privkey_t * privkey,
+ unsigned int *flags);
void gnutls_certificate_set_retrieve_function3
(gnutls_certificate_credentials_t cred,
- gnutls_certificate_retrieve_function3 *func);
+ gnutls_certificate_retrieve_function3 * func);
int
gnutls_certificate_set_key(gnutls_certificate_credentials_t res,
@@ -779,4 +754,4 @@ gnutls_pubkey_print(gnutls_pubkey_t pubkey,
#endif
/* *INDENT-ON* */
-#endif /* GNUTLS_ABSTRACT_H */
+#endif /* GNUTLS_ABSTRACT_H */
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index 2779ca9f3a..1fe33c839a 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -23,7 +23,7 @@
/* Typedefs for more compatibility with older GnuTLS. */
#ifndef GNUTLS_COMPAT_H
-#define GNUTLS_COMPAT_H
+# define GNUTLS_COMPAT_H
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -31,21 +31,21 @@ extern "C" {
#endif
/* *INDENT-ON* */
-#ifdef __GNUC__
+# ifdef __GNUC__
-#define _GNUTLS_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+# define _GNUTLS_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-#if !defined GNUTLS_INTERNAL_BUILD
-#if _GNUTLS_GCC_VERSION >= 30100
-#define _GNUTLS_GCC_ATTR_DEPRECATED __attribute__ ((__deprecated__))
-#endif
-#endif
+# if !defined GNUTLS_INTERNAL_BUILD
+# if _GNUTLS_GCC_VERSION >= 30100
+# define _GNUTLS_GCC_ATTR_DEPRECATED __attribute__ ((__deprecated__))
+# endif
+# endif
-#endif /* __GNUC__ */
+# endif /* __GNUC__ */
-#ifndef _GNUTLS_GCC_ATTR_DEPRECATED
-#define _GNUTLS_GCC_ATTR_DEPRECATED
-#endif
+# ifndef _GNUTLS_GCC_ATTR_DEPRECATED
+# define _GNUTLS_GCC_ATTR_DEPRECATED
+# endif
/* gnutls_connection_end_t was made redundant in 2.99.0 */
typedef unsigned int gnutls_connection_end_t _GNUTLS_GCC_ATTR_DEPRECATED;
@@ -53,31 +53,25 @@ typedef unsigned int gnutls_connection_end_t _GNUTLS_GCC_ATTR_DEPRECATED;
/* Stuff deprecated in 2.x */
typedef gnutls_cipher_algorithm_t gnutls_cipher_algorithm
_GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_kx_algorithm_t gnutls_kx_algorithm
- _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_mac_algorithm_t gnutls_mac_algorithm
- _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_kx_algorithm_t gnutls_kx_algorithm _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_mac_algorithm_t gnutls_mac_algorithm _GNUTLS_GCC_ATTR_DEPRECATED;
typedef gnutls_digest_algorithm_t gnutls_digest_algorithm
_GNUTLS_GCC_ATTR_DEPRECATED;
typedef gnutls_compression_method_t gnutls_compression_method
_GNUTLS_GCC_ATTR_DEPRECATED;
typedef gnutls_connection_end_t gnutls_connection_end
_GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_x509_crt_fmt_t gnutls_x509_crt_fmt
- _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_pk_algorithm_t gnutls_pk_algorithm
- _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_x509_crt_fmt_t gnutls_x509_crt_fmt _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_pk_algorithm_t gnutls_pk_algorithm _GNUTLS_GCC_ATTR_DEPRECATED;
typedef gnutls_sign_algorithm_t gnutls_sign_algorithm
_GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_close_request_t gnutls_close_request
- _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_close_request_t gnutls_close_request _GNUTLS_GCC_ATTR_DEPRECATED;
typedef gnutls_certificate_request_t gnutls_certificate_request
_GNUTLS_GCC_ATTR_DEPRECATED;
typedef gnutls_certificate_status_t gnutls_certificate_status
_GNUTLS_GCC_ATTR_DEPRECATED;
typedef gnutls_session_t gnutls_session _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_alert_level_t gnutls_alert_level
- _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_alert_level_t gnutls_alert_level _GNUTLS_GCC_ATTR_DEPRECATED;
typedef gnutls_alert_description_t gnutls_alert_description
_GNUTLS_GCC_ATTR_DEPRECATED;
typedef gnutls_x509_subject_alt_name_t gnutls_x509_subject_alt_name
@@ -87,8 +81,7 @@ typedef gnutls_openpgp_privkey_t gnutls_openpgp_privkey
typedef gnutls_openpgp_keyring_t gnutls_openpgp_keyring
_GNUTLS_GCC_ATTR_DEPRECATED;
typedef gnutls_x509_crt_t gnutls_x509_crt _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_x509_privkey_t gnutls_x509_privkey
- _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_x509_privkey_t gnutls_x509_privkey _GNUTLS_GCC_ATTR_DEPRECATED;
typedef gnutls_x509_crl_t gnutls_x509_crl _GNUTLS_GCC_ATTR_DEPRECATED;
typedef gnutls_x509_crq_t gnutls_x509_crq _GNUTLS_GCC_ATTR_DEPRECATED;
typedef gnutls_certificate_credentials_t
@@ -103,62 +96,59 @@ typedef gnutls_srp_server_credentials_t
gnutls_srp_server_credentials _GNUTLS_GCC_ATTR_DEPRECATED;
typedef gnutls_dh_params_t gnutls_dh_params _GNUTLS_GCC_ATTR_DEPRECATED;
typedef gnutls_rsa_params_t gnutls_rsa_params _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_params_type_t gnutls_params_type
- _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_params_type_t gnutls_params_type _GNUTLS_GCC_ATTR_DEPRECATED;
typedef gnutls_credentials_type_t gnutls_credentials_type
_GNUTLS_GCC_ATTR_DEPRECATED;
typedef gnutls_certificate_type_t gnutls_certificate_type
_GNUTLS_GCC_ATTR_DEPRECATED;
typedef gnutls_datum_t gnutls_datum _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_transport_ptr_t gnutls_transport_ptr
- _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_transport_ptr_t gnutls_transport_ptr _GNUTLS_GCC_ATTR_DEPRECATED;
/* Old verification flags */
-#define GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT (0)
+# define GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT (0)
/* Old SRP alerts removed in 2.1.x because the TLS-SRP RFC was
modified to use the PSK alert. */
-#define GNUTLS_A_MISSING_SRP_USERNAME GNUTLS_A_UNKNOWN_PSK_IDENTITY
-#define GNUTLS_A_UNKNOWN_SRP_USERNAME GNUTLS_A_UNKNOWN_PSK_IDENTITY
+# define GNUTLS_A_MISSING_SRP_USERNAME GNUTLS_A_UNKNOWN_PSK_IDENTITY
+# define GNUTLS_A_UNKNOWN_SRP_USERNAME GNUTLS_A_UNKNOWN_PSK_IDENTITY
/* OpenPGP stuff renamed in 2.1.x. */
-#define GNUTLS_OPENPGP_KEY GNUTLS_OPENPGP_CERT
-#define GNUTLS_OPENPGP_KEY_FINGERPRINT GNUTLS_OPENPGP_CERT_FINGERPRINT
-#define gnutls_openpgp_send_key gnutls_openpgp_send_cert
+# define GNUTLS_OPENPGP_KEY GNUTLS_OPENPGP_CERT
+# define GNUTLS_OPENPGP_KEY_FINGERPRINT GNUTLS_OPENPGP_CERT_FINGERPRINT
+# define gnutls_openpgp_send_key gnutls_openpgp_send_cert
typedef gnutls_openpgp_crt_status_t gnutls_openpgp_key_status_t
_GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_openpgp_crt_t gnutls_openpgp_key_t
- _GNUTLS_GCC_ATTR_DEPRECATED;
-#define gnutls_openpgp_key_init gnutls_openpgp_crt_init
-#define gnutls_openpgp_key_deinit gnutls_openpgp_crt_deinit
-#define gnutls_openpgp_key_import gnutls_openpgp_crt_import
-#define gnutls_openpgp_key_export gnutls_openpgp_crt_export
-#define gnutls_openpgp_key_get_key_usage gnutls_openpgp_crt_get_key_usage
-#define gnutls_openpgp_key_get_fingerprint gnutls_openpgp_crt_get_fingerprint
-#define gnutls_openpgp_key_get_pk_algorithm gnutls_openpgp_crt_get_pk_algorithm
-#define gnutls_openpgp_key_get_name gnutls_openpgp_crt_get_name
-#define gnutls_openpgp_key_get_version gnutls_openpgp_crt_get_version
-#define gnutls_openpgp_key_get_creation_time gnutls_openpgp_crt_get_creation_time
-#define gnutls_openpgp_key_get_expiration_time gnutls_openpgp_crt_get_expiration_time
-#define gnutls_openpgp_key_get_id gnutls_openpgp_crt_get_id
-#define gnutls_openpgp_key_check_hostname gnutls_openpgp_crt_check_hostname
+typedef gnutls_openpgp_crt_t gnutls_openpgp_key_t _GNUTLS_GCC_ATTR_DEPRECATED;
+# define gnutls_openpgp_key_init gnutls_openpgp_crt_init
+# define gnutls_openpgp_key_deinit gnutls_openpgp_crt_deinit
+# define gnutls_openpgp_key_import gnutls_openpgp_crt_import
+# define gnutls_openpgp_key_export gnutls_openpgp_crt_export
+# define gnutls_openpgp_key_get_key_usage gnutls_openpgp_crt_get_key_usage
+# define gnutls_openpgp_key_get_fingerprint gnutls_openpgp_crt_get_fingerprint
+# define gnutls_openpgp_key_get_pk_algorithm gnutls_openpgp_crt_get_pk_algorithm
+# define gnutls_openpgp_key_get_name gnutls_openpgp_crt_get_name
+# define gnutls_openpgp_key_get_version gnutls_openpgp_crt_get_version
+# define gnutls_openpgp_key_get_creation_time gnutls_openpgp_crt_get_creation_time
+# define gnutls_openpgp_key_get_expiration_time gnutls_openpgp_crt_get_expiration_time
+# define gnutls_openpgp_key_get_id gnutls_openpgp_crt_get_id
+# define gnutls_openpgp_key_check_hostname gnutls_openpgp_crt_check_hostname
/* OpenPGP stuff renamed in 2.3.x. */
-#define gnutls_openpgp_crt_get_id gnutls_openpgp_crt_get_key_id
+# define gnutls_openpgp_crt_get_id gnutls_openpgp_crt_get_key_id
/* New better names renamed in 2.3.x, add these for backwards
compatibility with old poor names.*/
-#define GNUTLS_X509_CRT_FULL GNUTLS_CRT_PRINT_FULL
-#define GNUTLS_X509_CRT_ONELINE GNUTLS_CRT_PRINT_ONELINE
-#define GNUTLS_X509_CRT_UNSIGNED_FULL GNUTLS_CRT_PRINT_UNSIGNED_FULL
+# define GNUTLS_X509_CRT_FULL GNUTLS_CRT_PRINT_FULL
+# define GNUTLS_X509_CRT_ONELINE GNUTLS_CRT_PRINT_ONELINE
+# define GNUTLS_X509_CRT_UNSIGNED_FULL GNUTLS_CRT_PRINT_UNSIGNED_FULL
/* Namespace problems. */
-#define LIBGNUTLS_VERSION GNUTLS_VERSION
-#define LIBGNUTLS_VERSION_MAJOR GNUTLS_VERSION_MAJOR
-#define LIBGNUTLS_VERSION_MINOR GNUTLS_VERSION_MINOR
-#define LIBGNUTLS_VERSION_PATCH GNUTLS_VERSION_PATCH
-#define LIBGNUTLS_VERSION_NUMBER GNUTLS_VERSION_NUMBER
-#define LIBGNUTLS_EXTRA_VERSION GNUTLS_VERSION
+# define LIBGNUTLS_VERSION GNUTLS_VERSION
+# define LIBGNUTLS_VERSION_MAJOR GNUTLS_VERSION_MAJOR
+# define LIBGNUTLS_VERSION_MINOR GNUTLS_VERSION_MINOR
+# define LIBGNUTLS_VERSION_PATCH GNUTLS_VERSION_PATCH
+# define LIBGNUTLS_VERSION_NUMBER GNUTLS_VERSION_NUMBER
+# define LIBGNUTLS_EXTRA_VERSION GNUTLS_VERSION
/* This is a very dangerous and error-prone function.
* Use gnutls_privkey_sign_hash() instead.
@@ -183,7 +173,7 @@ int gnutls_x509_crt_get_preferred_hash_algorithm(gnutls_x509_crt_t
/* use gnutls_privkey_sign_hash() with the GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA flag */
-#ifdef _ISOC99_SOURCE
+# ifdef _ISOC99_SOURCE
/* we provide older functions for compatibility as inline functions that
* depend on gnutls_session_get_random. */
@@ -208,34 +198,35 @@ static inline const void
gnutls_session_get_random(session, &rnd, NULL); /*doc-skip */
return rnd.data;
}
-#endif
+# endif
void
gnutls_global_set_mem_functions(gnutls_alloc_function alloc_func,
gnutls_alloc_function secure_alloc_func,
gnutls_is_secure_function is_secure_func,
gnutls_realloc_function realloc_func,
- gnutls_free_function free_func) _GNUTLS_GCC_ATTR_DEPRECATED;
+ gnutls_free_function free_func)
+_GNUTLS_GCC_ATTR_DEPRECATED;
/* defined in old headers - unused nevertheless */
-#define GNUTLS_SUPPLEMENTAL_USER_MAPPING_DATA 0
+# define GNUTLS_SUPPLEMENTAL_USER_MAPPING_DATA 0
/* old compression related functions */
gnutls_compression_method_t
gnutls_compression_get(gnutls_session_t session) _GNUTLS_GCC_ATTR_DEPRECATED;
-const char *
-gnutls_compression_get_name(gnutls_compression_method_t
- algorithm) __GNUTLS_CONST__ _GNUTLS_GCC_ATTR_DEPRECATED;
+const char *gnutls_compression_get_name(gnutls_compression_method_t algorithm)
+__GNUTLS_CONST__ _GNUTLS_GCC_ATTR_DEPRECATED;
-gnutls_compression_method_t
- gnutls_compression_get_id(const char *name) __GNUTLS_CONST__ _GNUTLS_GCC_ATTR_DEPRECATED;
+gnutls_compression_method_t gnutls_compression_get_id(const char *name)
+__GNUTLS_CONST__ _GNUTLS_GCC_ATTR_DEPRECATED;
-const gnutls_compression_method_t *
- gnutls_compression_list(void) __GNUTLS_PURE__ _GNUTLS_GCC_ATTR_DEPRECATED;
+const gnutls_compression_method_t *gnutls_compression_list(void)
+__GNUTLS_PURE__ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_priority_compression_list(gnutls_priority_t pcache,
- const unsigned int **list) _GNUTLS_GCC_ATTR_DEPRECATED;
+ const unsigned int **list)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -243,4 +234,4 @@ int gnutls_priority_compression_list(gnutls_priority_t pcache,
#endif
/* *INDENT-ON* */
-#endif /* GNUTLS_COMPAT_H */
+#endif /* GNUTLS_COMPAT_H */
diff --git a/lib/includes/gnutls/crypto.h b/lib/includes/gnutls/crypto.h
index 47b4423ecf..a4a30b13c6 100644
--- a/lib/includes/gnutls/crypto.h
+++ b/lib/includes/gnutls/crypto.h
@@ -21,9 +21,9 @@
*/
#ifndef GNUTLS_CRYPTO_H
-#define GNUTLS_CRYPTO_H
+# define GNUTLS_CRYPTO_H
-#include <gnutls/gnutls.h>
+# include <gnutls/gnutls.h>
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -35,16 +35,14 @@ typedef struct api_cipher_hd_st *gnutls_cipher_hd_t;
int gnutls_cipher_init(gnutls_cipher_hd_t * handle,
gnutls_cipher_algorithm_t cipher,
- const gnutls_datum_t * key,
- const gnutls_datum_t * iv);
+ const gnutls_datum_t * key, const gnutls_datum_t * iv);
int gnutls_cipher_encrypt(const gnutls_cipher_hd_t handle,
void *text, size_t textlen);
int gnutls_cipher_decrypt(const gnutls_cipher_hd_t handle,
void *ciphertext, size_t ciphertextlen);
int gnutls_cipher_decrypt2(gnutls_cipher_hd_t handle,
const void *ciphertext,
- size_t ciphertextlen, void *text,
- size_t textlen);
+ size_t ciphertextlen, void *text, size_t textlen);
int gnutls_cipher_encrypt2(gnutls_cipher_hd_t handle,
const void *text, size_t textlen,
void *ciphertext, size_t ciphertextlen);
@@ -64,25 +62,24 @@ typedef enum gnutls_cipher_flags_t {
int gnutls_cipher_encrypt3(gnutls_cipher_hd_t handle,
const void *ptext, size_t ptext_len,
- void *ctext, size_t *ctext_len,
- unsigned flags);
+ void *ctext, size_t *ctext_len, unsigned flags);
int gnutls_cipher_decrypt3(gnutls_cipher_hd_t handle,
const void *ctext, size_t ctext_len,
- void *ptext, size_t *ptext_len,
- unsigned flags);
+ void *ptext, size_t *ptext_len, unsigned flags);
-void gnutls_cipher_set_iv(gnutls_cipher_hd_t handle, void *iv,
- size_t ivlen);
+void gnutls_cipher_set_iv(gnutls_cipher_hd_t handle, void *iv, size_t ivlen);
-int gnutls_cipher_tag(gnutls_cipher_hd_t handle, void *tag,
- size_t tag_size);
+int gnutls_cipher_tag(gnutls_cipher_hd_t handle, void *tag, size_t tag_size);
int gnutls_cipher_add_auth(gnutls_cipher_hd_t handle,
const void *text, size_t text_size);
void gnutls_cipher_deinit(gnutls_cipher_hd_t handle);
-unsigned gnutls_cipher_get_block_size(gnutls_cipher_algorithm_t algorithm) __GNUTLS_CONST__;
-unsigned gnutls_cipher_get_iv_size(gnutls_cipher_algorithm_t algorithm) __GNUTLS_CONST__;
-unsigned gnutls_cipher_get_tag_size(gnutls_cipher_algorithm_t algorithm) __GNUTLS_CONST__;
+unsigned gnutls_cipher_get_block_size(gnutls_cipher_algorithm_t algorithm)
+ __GNUTLS_CONST__;
+unsigned gnutls_cipher_get_iv_size(gnutls_cipher_algorithm_t algorithm)
+ __GNUTLS_CONST__;
+unsigned gnutls_cipher_get_tag_size(gnutls_cipher_algorithm_t algorithm)
+ __GNUTLS_CONST__;
/* AEAD API
*/
@@ -93,7 +90,7 @@ int gnutls_aead_cipher_init(gnutls_aead_cipher_hd_t * handle,
const gnutls_datum_t * key);
int gnutls_aead_cipher_set_key(gnutls_aead_cipher_hd_t handle,
- const gnutls_datum_t *key);
+ const gnutls_datum_t * key);
int
gnutls_aead_cipher_decrypt(gnutls_aead_cipher_hd_t handle,
@@ -113,23 +110,23 @@ gnutls_aead_cipher_encrypt(gnutls_aead_cipher_hd_t handle,
int
gnutls_aead_cipher_encryptv(gnutls_aead_cipher_hd_t handle,
const void *nonce, size_t nonce_len,
- const giovec_t *auth_iov, int auth_iovcnt,
+ const giovec_t * auth_iov, int auth_iovcnt,
size_t tag_size,
- const giovec_t *iov, int iovcnt,
+ const giovec_t * iov, int iovcnt,
void *ctext, size_t *ctext_len);
int
gnutls_aead_cipher_encryptv2(gnutls_aead_cipher_hd_t handle,
const void *nonce, size_t nonce_len,
- const giovec_t *auth_iov, int auth_iovcnt,
- const giovec_t *iov, int iovcnt,
+ const giovec_t * auth_iov, int auth_iovcnt,
+ const giovec_t * iov, int iovcnt,
void *tag, size_t *tag_size);
int
gnutls_aead_cipher_decryptv2(gnutls_aead_cipher_hd_t handle,
const void *nonce, size_t nonce_len,
- const giovec_t *auth_iov, int auth_iovcnt,
- const giovec_t *iov, int iovcnt,
+ const giovec_t * auth_iov, int auth_iovcnt,
+ const giovec_t * iov, int iovcnt,
void *tag, size_t tag_size);
void gnutls_aead_cipher_deinit(gnutls_aead_cipher_hd_t handle);
@@ -139,20 +136,21 @@ void gnutls_aead_cipher_deinit(gnutls_aead_cipher_hd_t handle);
typedef struct hash_hd_st *gnutls_hash_hd_t;
typedef struct hmac_hd_st *gnutls_hmac_hd_t;
-size_t gnutls_mac_get_nonce_size(gnutls_mac_algorithm_t algorithm) __GNUTLS_CONST__;
-int gnutls_hmac_init(gnutls_hmac_hd_t * dig,
- gnutls_mac_algorithm_t algorithm,
+size_t gnutls_mac_get_nonce_size(gnutls_mac_algorithm_t algorithm)
+ __GNUTLS_CONST__;
+int gnutls_hmac_init(gnutls_hmac_hd_t * dig, gnutls_mac_algorithm_t algorithm,
const void *key, size_t keylen);
-void gnutls_hmac_set_nonce(gnutls_hmac_hd_t handle,
- const void *nonce, size_t nonce_len);
+void gnutls_hmac_set_nonce(gnutls_hmac_hd_t handle, const void *nonce,
+ size_t nonce_len);
int gnutls_hmac(gnutls_hmac_hd_t handle, const void *text, size_t textlen);
void gnutls_hmac_output(gnutls_hmac_hd_t handle, void *digest);
void gnutls_hmac_deinit(gnutls_hmac_hd_t handle, void *digest);
unsigned gnutls_hmac_get_len(gnutls_mac_algorithm_t algorithm) __GNUTLS_CONST__;
-unsigned gnutls_hmac_get_key_size(gnutls_mac_algorithm_t algorithm) __GNUTLS_CONST__;
-int gnutls_hmac_fast(gnutls_mac_algorithm_t algorithm,
- const void *key, size_t keylen,
- const void *text, size_t textlen, void *digest);
+unsigned gnutls_hmac_get_key_size(gnutls_mac_algorithm_t algorithm)
+ __GNUTLS_CONST__;
+int gnutls_hmac_fast(gnutls_mac_algorithm_t algorithm, const void *key,
+ size_t keylen, const void *text, size_t textlen,
+ void *digest);
gnutls_hmac_hd_t gnutls_hmac_copy(gnutls_hmac_hd_t handle);
int gnutls_hash_init(gnutls_hash_hd_t * dig,
@@ -160,32 +158,30 @@ int gnutls_hash_init(gnutls_hash_hd_t * dig,
int gnutls_hash(gnutls_hash_hd_t handle, const void *text, size_t textlen);
void gnutls_hash_output(gnutls_hash_hd_t handle, void *digest);
void gnutls_hash_deinit(gnutls_hash_hd_t handle, void *digest);
-unsigned gnutls_hash_get_len(gnutls_digest_algorithm_t algorithm) __GNUTLS_CONST__;
-int gnutls_hash_fast(gnutls_digest_algorithm_t algorithm,
- const void *text, size_t textlen, void *digest);
+unsigned gnutls_hash_get_len(gnutls_digest_algorithm_t algorithm)
+ __GNUTLS_CONST__;
+int gnutls_hash_fast(gnutls_digest_algorithm_t algorithm, const void *text,
+ size_t textlen, void *digest);
gnutls_hash_hd_t gnutls_hash_copy(gnutls_hash_hd_t handle);
/* KDF API */
int gnutls_hkdf_extract(gnutls_mac_algorithm_t mac,
- const gnutls_datum_t *key,
- const gnutls_datum_t *salt,
- void *output);
+ const gnutls_datum_t * key,
+ const gnutls_datum_t * salt, void *output);
int gnutls_hkdf_expand(gnutls_mac_algorithm_t mac,
- const gnutls_datum_t *key,
- const gnutls_datum_t *info,
+ const gnutls_datum_t * key,
+ const gnutls_datum_t * info,
void *output, size_t length);
int gnutls_pbkdf2(gnutls_mac_algorithm_t mac,
- const gnutls_datum_t *key,
- const gnutls_datum_t *salt,
- unsigned iter_count,
- void *output, size_t length);
+ const gnutls_datum_t * key,
+ const gnutls_datum_t * salt,
+ unsigned iter_count, void *output, size_t length);
/* register ciphers */
-
/**
* gnutls_rnd_level_t:
* @GNUTLS_RND_NONCE: Non-predictable random number. Fatal in parts
@@ -207,37 +203,45 @@ int gnutls_rnd(gnutls_rnd_level_t level, void *data, size_t len);
void gnutls_rnd_refresh(void);
-
/* API to override ciphers and MAC algorithms
*/
-typedef int (*gnutls_cipher_init_func) (gnutls_cipher_algorithm_t, void **ctx, int enc);
-typedef int (*gnutls_cipher_setkey_func) (void *ctx, const void *key, size_t keysize);
+typedef int (*gnutls_cipher_init_func)(gnutls_cipher_algorithm_t, void **ctx,
+ int enc);
+typedef int (*gnutls_cipher_setkey_func)(void *ctx, const void *key,
+ size_t keysize);
/* old style ciphers */
-typedef int (*gnutls_cipher_setiv_func) (void *ctx, const void *iv, size_t ivsize);
-typedef int (*gnutls_cipher_getiv_func) (void *ctx, void *iv, size_t ivsize);
-typedef int (*gnutls_cipher_encrypt_func) (void *ctx, const void *plain, size_t plainsize,
- void *encr, size_t encrsize);
-typedef int (*gnutls_cipher_decrypt_func) (void *ctx, const void *encr, size_t encrsize,
- void *plain, size_t plainsize);
+typedef int (*gnutls_cipher_setiv_func)(void *ctx, const void *iv,
+ size_t ivsize);
+typedef int (*gnutls_cipher_getiv_func)(void *ctx, void *iv, size_t ivsize);
+typedef int (*gnutls_cipher_encrypt_func)(void *ctx, const void *plain,
+ size_t plainsize, void *encr,
+ size_t encrsize);
+typedef int (*gnutls_cipher_decrypt_func)(void *ctx, const void *encr,
+ size_t encrsize, void *plain,
+ size_t plainsize);
/* aead ciphers */
-typedef int (*gnutls_cipher_auth_func) (void *ctx, const void *data, size_t datasize);
-typedef void (*gnutls_cipher_tag_func) (void *ctx, void *tag, size_t tagsize);
-
-typedef int (*gnutls_cipher_aead_encrypt_func) (void *ctx,
- const void *nonce, size_t noncesize,
- const void *auth, size_t authsize,
- size_t tag_size,
- const void *plain, size_t plainsize,
- void *encr, size_t encrsize);
-typedef int (*gnutls_cipher_aead_decrypt_func) (void *ctx,
- const void *nonce, size_t noncesize,
- const void *auth, size_t authsize,
- size_t tag_size,
- const void *encr, size_t encrsize,
- void *plain, size_t plainsize);
-typedef void (*gnutls_cipher_deinit_func) (void *ctx);
+typedef int (*gnutls_cipher_auth_func)(void *ctx, const void *data,
+ size_t datasize);
+typedef void (*gnutls_cipher_tag_func)(void *ctx, void *tag, size_t tagsize);
+
+typedef int (*gnutls_cipher_aead_encrypt_func)(void *ctx,
+ const void *nonce,
+ size_t noncesize,
+ const void *auth,
+ size_t authsize, size_t tag_size,
+ const void *plain,
+ size_t plainsize, void *encr,
+ size_t encrsize);
+typedef int (*gnutls_cipher_aead_decrypt_func)(void *ctx, const void *nonce,
+ size_t noncesize,
+ const void *auth,
+ size_t authsize, size_t tag_size,
+ const void *encr,
+ size_t encrsize, void *plain,
+ size_t plainsize);
+typedef void (*gnutls_cipher_deinit_func)(void *ctx);
int
gnutls_crypto_register_cipher(gnutls_cipher_algorithm_t algorithm,
@@ -248,28 +252,33 @@ gnutls_crypto_register_cipher(gnutls_cipher_algorithm_t algorithm,
gnutls_cipher_encrypt_func encrypt,
gnutls_cipher_decrypt_func decrypt,
gnutls_cipher_deinit_func deinit)
- _GNUTLS_GCC_ATTR_DEPRECATED;
+_GNUTLS_GCC_ATTR_DEPRECATED;
int
gnutls_crypto_register_aead_cipher(gnutls_cipher_algorithm_t algorithm,
- int priority,
- gnutls_cipher_init_func init,
- gnutls_cipher_setkey_func setkey,
- gnutls_cipher_aead_encrypt_func aead_encrypt,
- gnutls_cipher_aead_decrypt_func aead_decrypt,
- gnutls_cipher_deinit_func deinit)
- _GNUTLS_GCC_ATTR_DEPRECATED;
-
-typedef int (*gnutls_mac_init_func) (gnutls_mac_algorithm_t, void **ctx);
-typedef int (*gnutls_mac_setkey_func) (void *ctx, const void *key, size_t keysize);
-typedef int (*gnutls_mac_setnonce_func) (void *ctx, const void *nonce, size_t noncesize);
-typedef int (*gnutls_mac_hash_func) (void *ctx, const void *text, size_t textsize);
-typedef int (*gnutls_mac_output_func) (void *src_ctx, void *digest, size_t digestsize);
-typedef void (*gnutls_mac_deinit_func) (void *ctx);
-typedef int (*gnutls_mac_fast_func) (gnutls_mac_algorithm_t, const void *nonce,
- size_t nonce_size, const void *key, size_t keysize,
- const void *text, size_t textsize, void *digest);
-typedef void *(*gnutls_mac_copy_func) (const void *ctx);
+ int priority,
+ gnutls_cipher_init_func init,
+ gnutls_cipher_setkey_func setkey,
+ gnutls_cipher_aead_encrypt_func aead_encrypt,
+ gnutls_cipher_aead_decrypt_func aead_decrypt,
+ gnutls_cipher_deinit_func deinit)
+_GNUTLS_GCC_ATTR_DEPRECATED;
+
+typedef int (*gnutls_mac_init_func)(gnutls_mac_algorithm_t, void **ctx);
+typedef int (*gnutls_mac_setkey_func)(void *ctx, const void *key,
+ size_t keysize);
+typedef int (*gnutls_mac_setnonce_func)(void *ctx, const void *nonce,
+ size_t noncesize);
+typedef int (*gnutls_mac_hash_func)(void *ctx, const void *text,
+ size_t textsize);
+typedef int (*gnutls_mac_output_func)(void *src_ctx, void *digest,
+ size_t digestsize);
+typedef void (*gnutls_mac_deinit_func)(void *ctx);
+typedef int (*gnutls_mac_fast_func)(gnutls_mac_algorithm_t, const void *nonce,
+ size_t nonce_size, const void *key,
+ size_t keysize, const void *text,
+ size_t textsize, void *digest);
+typedef void *(*gnutls_mac_copy_func)(const void *ctx);
int
gnutls_crypto_register_mac(gnutls_mac_algorithm_t mac,
@@ -281,25 +290,28 @@ gnutls_crypto_register_mac(gnutls_mac_algorithm_t mac,
gnutls_mac_output_func output,
gnutls_mac_deinit_func deinit,
gnutls_mac_fast_func hash_fast)
- _GNUTLS_GCC_ATTR_DEPRECATED;
-
-typedef int (*gnutls_digest_init_func) (gnutls_digest_algorithm_t, void **ctx);
-typedef int (*gnutls_digest_hash_func) (void *ctx, const void *text, size_t textsize);
-typedef int (*gnutls_digest_output_func) (void *src_ctx, void *digest, size_t digestsize);
-typedef void (*gnutls_digest_deinit_func) (void *ctx);
-typedef int (*gnutls_digest_fast_func) (gnutls_digest_algorithm_t,
- const void *text, size_t textsize, void *digest);
-typedef void *(*gnutls_digest_copy_func) (const void *ctx);
+_GNUTLS_GCC_ATTR_DEPRECATED;
+
+typedef int (*gnutls_digest_init_func)(gnutls_digest_algorithm_t, void **ctx);
+typedef int (*gnutls_digest_hash_func)(void *ctx, const void *text,
+ size_t textsize);
+typedef int (*gnutls_digest_output_func)(void *src_ctx, void *digest,
+ size_t digestsize);
+typedef void (*gnutls_digest_deinit_func)(void *ctx);
+typedef int (*gnutls_digest_fast_func)(gnutls_digest_algorithm_t,
+ const void *text, size_t textsize,
+ void *digest);
+typedef void *(*gnutls_digest_copy_func)(const void *ctx);
int
gnutls_crypto_register_digest(gnutls_digest_algorithm_t digest,
- int priority,
- gnutls_digest_init_func init,
- gnutls_digest_hash_func hash,
- gnutls_digest_output_func output,
- gnutls_digest_deinit_func deinit,
- gnutls_digest_fast_func hash_fast)
- _GNUTLS_GCC_ATTR_DEPRECATED;
+ int priority,
+ gnutls_digest_init_func init,
+ gnutls_digest_hash_func hash,
+ gnutls_digest_output_func output,
+ gnutls_digest_deinit_func deinit,
+ gnutls_digest_fast_func hash_fast)
+_GNUTLS_GCC_ATTR_DEPRECATED;
/* RSA-PKCS#1 1.5 helper functions */
int
@@ -309,14 +321,19 @@ gnutls_encode_ber_digest_info(gnutls_digest_algorithm_t hash,
int
gnutls_decode_ber_digest_info(const gnutls_datum_t * info,
- gnutls_digest_algorithm_t *hash,
+ gnutls_digest_algorithm_t * hash,
unsigned char *digest, unsigned int *digest_size);
-int gnutls_decode_rs_value(const gnutls_datum_t * sig_value, gnutls_datum_t *r, gnutls_datum_t *s);
-int gnutls_encode_rs_value(gnutls_datum_t * sig_value, const gnutls_datum_t * r, const gnutls_datum_t * s);
+int gnutls_decode_rs_value(const gnutls_datum_t * sig_value, gnutls_datum_t * r,
+ gnutls_datum_t * s);
+int gnutls_encode_rs_value(gnutls_datum_t * sig_value, const gnutls_datum_t * r,
+ const gnutls_datum_t * s);
-int gnutls_encode_gost_rs_value(gnutls_datum_t * sig_value, const gnutls_datum_t * r, const gnutls_datum_t *s);
-int gnutls_decode_gost_rs_value(const gnutls_datum_t * sig_value, gnutls_datum_t * r, gnutls_datum_t * s);
+int gnutls_encode_gost_rs_value(gnutls_datum_t * sig_value,
+ const gnutls_datum_t * r,
+ const gnutls_datum_t * s);
+int gnutls_decode_gost_rs_value(const gnutls_datum_t * sig_value,
+ gnutls_datum_t * r, gnutls_datum_t * s);
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -324,4 +341,4 @@ int gnutls_decode_gost_rs_value(const gnutls_datum_t * sig_value, gnutls_datum_t
#endif
/* *INDENT-ON* */
-#endif /* GNUTLS_CRYPTO_H */
+#endif /* GNUTLS_CRYPTO_H */
diff --git a/lib/includes/gnutls/dtls.h b/lib/includes/gnutls/dtls.h
index 972ec0a34c..225637e502 100644
--- a/lib/includes/gnutls/dtls.h
+++ b/lib/includes/gnutls/dtls.h
@@ -25,9 +25,9 @@
*/
#ifndef GNUTLS_DTLS_H
-#define GNUTLS_DTLS_H
+# define GNUTLS_DTLS_H
-#include <gnutls/gnutls.h>
+# include <gnutls/gnutls.h>
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -35,7 +35,7 @@ extern "C" {
#endif
/* *INDENT-ON* */
-#define GNUTLS_COOKIE_KEY_SIZE 16
+# define GNUTLS_COOKIE_KEY_SIZE 16
void gnutls_dtls_set_timeouts(gnutls_session_t session,
unsigned int retrans_timeout,
@@ -90,4 +90,4 @@ unsigned int gnutls_record_get_discarded(gnutls_session_t session);
#endif
/* *INDENT-ON* */
-#endif /* GNUTLS_DTLS_H */
+#endif /* GNUTLS_DTLS_H */
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index ac3301dc58..c3ff442cb7 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -34,16 +34,16 @@
*/
#ifndef GNUTLS_GNUTLS_H
-#define GNUTLS_GNUTLS_H
+# define GNUTLS_GNUTLS_H
/* Get ssize_t. */
-#include <sys/types.h>
+# include <sys/types.h>
/* Get size_t. */
-#include <stddef.h>
+# include <stddef.h>
/* Get time_t. */
-#include <time.h>
+# include <time.h>
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -51,37 +51,36 @@ extern "C" {
#endif
/* *INDENT-ON* */
-#define GNUTLS_VERSION "@VERSION@"
+# define GNUTLS_VERSION "@VERSION@"
-#define GNUTLS_VERSION_MAJOR @MAJOR_VERSION@
-#define GNUTLS_VERSION_MINOR @MINOR_VERSION@
-#define GNUTLS_VERSION_PATCH @PATCH_VERSION@
+# define GNUTLS_VERSION_MAJOR @MAJOR_VERSION@
+# define GNUTLS_VERSION_MINOR @MINOR_VERSION@
+# define GNUTLS_VERSION_PATCH @PATCH_VERSION@
-#define GNUTLS_VERSION_NUMBER @NUMBER_VERSION@
+# define GNUTLS_VERSION_NUMBER @NUMBER_VERSION@
-#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_CBC GNUTLS_CIPHER_AES_128_CBC
-#define GNUTLS_CIPHER_ARCFOUR GNUTLS_CIPHER_ARCFOUR_128
+# 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_CBC GNUTLS_CIPHER_AES_128_CBC
+# define GNUTLS_CIPHER_ARCFOUR GNUTLS_CIPHER_ARCFOUR_128
-#if !defined(GNUTLS_INTERNAL_BUILD) && defined(_WIN32)
-# define _SYM_EXPORT __declspec(dllimport)
-#else
-# define _SYM_EXPORT
-#endif
-
-#ifdef __GNUC__
-# define __GNUTLS_CONST__ __attribute__((const))
-# define __GNUTLS_PURE__ __attribute__((pure))
-#else
-# define __GNUTLS_CONST__
-# define __GNUTLS_PURE__
-#endif
+# if !defined(GNUTLS_INTERNAL_BUILD) && defined(_WIN32)
+# define _SYM_EXPORT __declspec(dllimport)
+# else
+# define _SYM_EXPORT
+# endif
+# ifdef __GNUC__
+# define __GNUTLS_CONST__ __attribute__((const))
+# define __GNUTLS_PURE__ __attribute__((pure))
+# else
+# define __GNUTLS_CONST__
+# define __GNUTLS_PURE__
+# 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); \
+# define GNUTLS_SKIP_GLOBAL_INIT int _gnutls_global_init_skip(void); \
int _gnutls_global_init_skip(void) {return 1;}
/**
@@ -279,8 +278,8 @@ typedef enum {
GNUTLS_CRD_IA
} gnutls_credentials_type_t;
-#define GNUTLS_MAC_SHA GNUTLS_MAC_SHA1
-#define GNUTLS_DIG_SHA GNUTLS_DIG_SHA1
+# define GNUTLS_MAC_SHA GNUTLS_MAC_SHA1
+# define GNUTLS_DIG_SHA GNUTLS_DIG_SHA1
/**
* gnutls_mac_algorithm_t:
@@ -330,11 +329,11 @@ typedef enum {
GNUTLS_MAC_SHA384 = 7,
GNUTLS_MAC_SHA512 = 8,
GNUTLS_MAC_SHA224 = 9,
- GNUTLS_MAC_SHA3_224 = 10, /* reserved: no implementation */
- GNUTLS_MAC_SHA3_256 = 11, /* reserved: no implementation */
- GNUTLS_MAC_SHA3_384 = 12, /* reserved: no implementation */
- GNUTLS_MAC_SHA3_512 = 13, /* reserved: no implementation */
- GNUTLS_MAC_MD5_SHA1 = 14, /* reserved: no implementation */
+ GNUTLS_MAC_SHA3_224 = 10, /* reserved: no implementation */
+ GNUTLS_MAC_SHA3_256 = 11, /* reserved: no implementation */
+ GNUTLS_MAC_SHA3_384 = 12, /* reserved: no implementation */
+ GNUTLS_MAC_SHA3_512 = 13, /* reserved: no implementation */
+ GNUTLS_MAC_MD5_SHA1 = 14, /* reserved: no implementation */
GNUTLS_MAC_GOSTR_94 = 15,
GNUTLS_MAC_STREEBOG_256 = 16,
GNUTLS_MAC_STREEBOG_512 = 17,
@@ -408,9 +407,8 @@ typedef enum {
/* exported for other gnutls headers. This is the maximum number of
* algorithms (ciphers, kx or macs).
*/
-#define GNUTLS_MAX_ALGORITHM_NUM 128
-#define GNUTLS_MAX_SESSION_ID_SIZE 32
-
+# define GNUTLS_MAX_ALGORITHM_NUM 128
+# define GNUTLS_MAX_SESSION_ID_SIZE 32
/**
* gnutls_compression_method_t:
@@ -432,7 +430,6 @@ typedef enum {
GNUTLS_COMP_ZSTD = 4
} gnutls_compression_method_t;
-
/**
* gnutls_init_flags_t:
*
@@ -499,46 +496,46 @@ typedef enum {
*/
typedef enum {
GNUTLS_SERVER = 1,
- GNUTLS_CLIENT = (1<<1),
- GNUTLS_DATAGRAM = (1<<2),
- GNUTLS_NONBLOCK = (1<<3),
- GNUTLS_NO_EXTENSIONS = (1<<4),
- GNUTLS_NO_REPLAY_PROTECTION = (1<<5),
- GNUTLS_NO_SIGNAL = (1<<6),
- GNUTLS_ALLOW_ID_CHANGE = (1<<7),
- GNUTLS_ENABLE_FALSE_START = (1<<8),
- GNUTLS_FORCE_CLIENT_CERT = (1<<9),
- GNUTLS_NO_TICKETS = (1<<10),
- GNUTLS_KEY_SHARE_TOP = (1<<11),
- GNUTLS_KEY_SHARE_TOP2 = (1<<12),
- GNUTLS_KEY_SHARE_TOP3 = (1<<13),
- GNUTLS_POST_HANDSHAKE_AUTH = (1<<14),
- GNUTLS_NO_AUTO_REKEY = (1<<15),
- GNUTLS_SAFE_PADDING_CHECK = (1<<16),
- GNUTLS_ENABLE_EARLY_START = (1<<17),
- GNUTLS_ENABLE_RAWPK = (1<<18),
- GNUTLS_AUTO_REAUTH = (1<<19),
- GNUTLS_ENABLE_EARLY_DATA = (1<<20),
- GNUTLS_NO_AUTO_SEND_TICKET = (1<<21),
- GNUTLS_NO_END_OF_EARLY_DATA = (1<<22),
- GNUTLS_NO_TICKETS_TLS12 = (1<<23),
- GNUTLS_NO_STATUS_REQUEST = (1<<24)
+ GNUTLS_CLIENT = (1 << 1),
+ GNUTLS_DATAGRAM = (1 << 2),
+ GNUTLS_NONBLOCK = (1 << 3),
+ GNUTLS_NO_EXTENSIONS = (1 << 4),
+ GNUTLS_NO_REPLAY_PROTECTION = (1 << 5),
+ GNUTLS_NO_SIGNAL = (1 << 6),
+ GNUTLS_ALLOW_ID_CHANGE = (1 << 7),
+ GNUTLS_ENABLE_FALSE_START = (1 << 8),
+ GNUTLS_FORCE_CLIENT_CERT = (1 << 9),
+ GNUTLS_NO_TICKETS = (1 << 10),
+ GNUTLS_KEY_SHARE_TOP = (1 << 11),
+ GNUTLS_KEY_SHARE_TOP2 = (1 << 12),
+ GNUTLS_KEY_SHARE_TOP3 = (1 << 13),
+ GNUTLS_POST_HANDSHAKE_AUTH = (1 << 14),
+ GNUTLS_NO_AUTO_REKEY = (1 << 15),
+ GNUTLS_SAFE_PADDING_CHECK = (1 << 16),
+ GNUTLS_ENABLE_EARLY_START = (1 << 17),
+ GNUTLS_ENABLE_RAWPK = (1 << 18),
+ GNUTLS_AUTO_REAUTH = (1 << 19),
+ GNUTLS_ENABLE_EARLY_DATA = (1 << 20),
+ GNUTLS_NO_AUTO_SEND_TICKET = (1 << 21),
+ GNUTLS_NO_END_OF_EARLY_DATA = (1 << 22),
+ GNUTLS_NO_TICKETS_TLS12 = (1 << 23),
+ GNUTLS_NO_STATUS_REQUEST = (1 << 24)
} gnutls_init_flags_t;
/* compatibility defines (previous versions of gnutls
* used defines instead of enumerated values). */
-#define GNUTLS_SERVER (1)
-#define GNUTLS_CLIENT (1<<1)
-#define GNUTLS_DATAGRAM (1<<2)
-#define GNUTLS_NONBLOCK (1<<3)
-#define GNUTLS_NO_EXTENSIONS (1<<4)
-#define GNUTLS_NO_REPLAY_PROTECTION (1<<5)
-#define GNUTLS_NO_SIGNAL (1<<6)
-#define GNUTLS_ALLOW_ID_CHANGE (1<<7)
-#define GNUTLS_ENABLE_FALSE_START (1<<8)
-#define GNUTLS_FORCE_CLIENT_CERT (1<<9)
-#define GNUTLS_NO_TICKETS (1<<10)
-#define GNUTLS_ENABLE_CERT_TYPE_NEG 0
+# define GNUTLS_SERVER (1)
+# define GNUTLS_CLIENT (1<<1)
+# define GNUTLS_DATAGRAM (1<<2)
+# define GNUTLS_NONBLOCK (1<<3)
+# define GNUTLS_NO_EXTENSIONS (1<<4)
+# define GNUTLS_NO_REPLAY_PROTECTION (1<<5)
+# define GNUTLS_NO_SIGNAL (1<<6)
+# define GNUTLS_ALLOW_ID_CHANGE (1<<7)
+# define GNUTLS_ENABLE_FALSE_START (1<<8)
+# define GNUTLS_FORCE_CLIENT_CERT (1<<9)
+# define GNUTLS_NO_TICKETS (1<<10)
+# define GNUTLS_ENABLE_CERT_TYPE_NEG 0
// Here for compatibility reasons
/**
@@ -681,11 +678,10 @@ typedef enum {
GNUTLS_HANDSHAKE_HELLO_RETRY_REQUEST = 1025,
} gnutls_handshake_description_t;
-#define GNUTLS_HANDSHAKE_ANY ((unsigned int)-1)
+# define GNUTLS_HANDSHAKE_ANY ((unsigned int)-1)
const char
- *gnutls_handshake_description_get_name(gnutls_handshake_description_t
- type);
+*gnutls_handshake_description_get_name(gnutls_handshake_description_t type);
/**
* gnutls_certificate_status_t:
@@ -812,7 +808,7 @@ typedef enum {
GNUTLS_VERSION_UNKNOWN = 0xff /* change it to 0xffff */
} gnutls_protocol_t;
-#define GNUTLS_CRT_RAW GNUTLS_CRT_RAWPK
+# define GNUTLS_CRT_RAW GNUTLS_CRT_RAWPK
/**
* gnutls_certificate_type_t:
@@ -861,10 +857,10 @@ typedef enum gnutls_certificate_print_formats {
GNUTLS_CRT_PRINT_FULL_NUMBERS = 4
} gnutls_certificate_print_formats_t;
-#define GNUTLS_PK_ECC GNUTLS_PK_ECDSA
-#define GNUTLS_PK_EC GNUTLS_PK_ECDSA
+# define GNUTLS_PK_ECC GNUTLS_PK_ECDSA
+# define GNUTLS_PK_EC GNUTLS_PK_ECDSA
-#define GNUTLS_PK_ECDHX GNUTLS_PK_ECDH_X25519
+# define GNUTLS_PK_ECDHX GNUTLS_PK_ECDH_X25519
/**
* gnutls_pk_algorithm_t:
* @GNUTLS_PK_UNKNOWN: Unknown public-key algorithm.
@@ -900,7 +896,6 @@ typedef enum {
GNUTLS_PK_MAX = GNUTLS_PK_EDDSA_ED448
} gnutls_pk_algorithm_t;
-
const char *gnutls_pk_algorithm_get_name(gnutls_pk_algorithm_t algorithm);
/**
@@ -1130,9 +1125,9 @@ typedef enum {
/* macros to allow specifying a specific curve in gnutls_privkey_generate()
* and gnutls_x509_privkey_generate() */
-#define GNUTLS_CURVE_TO_BITS(curve) (unsigned int)(((unsigned int)1<<31)|((unsigned int)(curve)))
-#define GNUTLS_BITS_TO_CURVE(bits) (((unsigned int)(bits)) & 0x7FFFFFFF)
-#define GNUTLS_BITS_ARE_CURVE(bits) (((unsigned int)(bits)) & 0x80000000)
+# define GNUTLS_CURVE_TO_BITS(curve) (unsigned int)(((unsigned int)1<<31)|((unsigned int)(curve)))
+# define GNUTLS_BITS_TO_CURVE(bits) (((unsigned int)(bits)) & 0x7FFFFFFF)
+# define GNUTLS_BITS_ARE_CURVE(bits) (((unsigned int)(bits)) & 0x80000000)
/**
* gnutls_sec_param_t:
@@ -1166,7 +1161,7 @@ typedef enum {
} gnutls_sec_param_t;
/* old name */
-#define GNUTLS_SEC_PARAM_NORMAL GNUTLS_SEC_PARAM_MEDIUM
+# define GNUTLS_SEC_PARAM_NORMAL GNUTLS_SEC_PARAM_MEDIUM
/**
* gnutls_channel_binding_t:
@@ -1248,7 +1243,6 @@ typedef struct gnutls_library_config_st {
const char *value;
} gnutls_library_config_st;
-
typedef struct gnutls_params_st {
gnutls_params_type_t type;
union params {
@@ -1265,7 +1259,7 @@ typedef int gnutls_params_function(gnutls_session_t, gnutls_params_type_t,
int gnutls_init(gnutls_session_t * session, unsigned int flags);
void gnutls_deinit(gnutls_session_t session);
-#define _gnutls_deinit(x) gnutls_deinit(x)
+# define _gnutls_deinit(x) gnutls_deinit(x)
int gnutls_bye(gnutls_session_t session, gnutls_close_request_t how);
@@ -1273,13 +1267,12 @@ int gnutls_handshake(gnutls_session_t session);
int gnutls_reauth(gnutls_session_t session, unsigned int flags);
-#define GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT ((unsigned int)-1)
-#define GNUTLS_INDEFINITE_TIMEOUT ((unsigned int)-2)
-void gnutls_handshake_set_timeout(gnutls_session_t session,
- unsigned int ms);
+# define GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT ((unsigned int)-1)
+# define GNUTLS_INDEFINITE_TIMEOUT ((unsigned int)-2)
+void gnutls_handshake_set_timeout(gnutls_session_t session, unsigned int ms);
int gnutls_rehandshake(gnutls_session_t session);
-#define GNUTLS_KU_PEER 1
+# define GNUTLS_KU_PEER 1
int gnutls_session_key_update(gnutls_session_t session, unsigned flags);
gnutls_alert_description_t gnutls_alert_get(gnutls_session_t session);
@@ -1296,19 +1289,16 @@ const char *gnutls_sec_param_get_name(gnutls_sec_param_t param);
unsigned int gnutls_sec_param_to_pk_bits(gnutls_pk_algorithm_t algo,
gnutls_sec_param_t param);
unsigned int
- gnutls_sec_param_to_symmetric_bits(gnutls_sec_param_t param) __GNUTLS_CONST__;
+gnutls_sec_param_to_symmetric_bits(gnutls_sec_param_t param) __GNUTLS_CONST__;
/* Elliptic curves */
-const char *
- gnutls_ecc_curve_get_name(gnutls_ecc_curve_t curve) __GNUTLS_CONST__;
-const char *
- gnutls_ecc_curve_get_oid(gnutls_ecc_curve_t curve) __GNUTLS_CONST__;
+const char *gnutls_ecc_curve_get_name(gnutls_ecc_curve_t curve)
+ __GNUTLS_CONST__;
+const char *gnutls_ecc_curve_get_oid(gnutls_ecc_curve_t curve) __GNUTLS_CONST__;
-const char *
- gnutls_group_get_name(gnutls_group_t group) __GNUTLS_CONST__;
+const char *gnutls_group_get_name(gnutls_group_t group) __GNUTLS_CONST__;
-int
- gnutls_ecc_curve_get_size(gnutls_ecc_curve_t curve) __GNUTLS_CONST__;
+int gnutls_ecc_curve_get_size(gnutls_ecc_curve_t curve) __GNUTLS_CONST__;
gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
gnutls_group_t gnutls_group_get(gnutls_session_t session);
@@ -1321,8 +1311,7 @@ gnutls_mac_algorithm_t gnutls_mac_get(gnutls_session_t session);
gnutls_digest_algorithm_t gnutls_prf_hash_get(const gnutls_session_t session);
gnutls_digest_algorithm_t
gnutls_early_prf_hash_get(const gnutls_session_t session);
-gnutls_certificate_type_t
-gnutls_certificate_type_get(gnutls_session_t session);
+gnutls_certificate_type_t gnutls_certificate_type_get(gnutls_session_t session);
gnutls_certificate_type_t
gnutls_certificate_type_get2(gnutls_session_t session,
gnutls_ctype_target_t target);
@@ -1335,124 +1324,110 @@ int gnutls_sign_algorithm_get_requested(gnutls_session_t session,
gnutls_sign_algorithm_t * algo);
/* the name of the specified algorithms */
-const char *
- gnutls_cipher_get_name(gnutls_cipher_algorithm_t algorithm) __GNUTLS_CONST__;
-const char *
- gnutls_mac_get_name(gnutls_mac_algorithm_t algorithm) __GNUTLS_CONST__;
-
-const char *
- gnutls_digest_get_name(gnutls_digest_algorithm_t algorithm) __GNUTLS_CONST__;
-const char *
- gnutls_digest_get_oid(gnutls_digest_algorithm_t algorithm) __GNUTLS_CONST__;
-
-const char *
- gnutls_kx_get_name(gnutls_kx_algorithm_t algorithm) __GNUTLS_CONST__;
-const char *
- gnutls_certificate_type_get_name(gnutls_certificate_type_t
- type) __GNUTLS_CONST__;
-const char *
- gnutls_pk_get_name(gnutls_pk_algorithm_t algorithm) __GNUTLS_CONST__;
-const char *
- gnutls_pk_get_oid(gnutls_pk_algorithm_t algorithm) __GNUTLS_CONST__;
-
-const char *
- gnutls_sign_get_name(gnutls_sign_algorithm_t algorithm) __GNUTLS_CONST__;
+const char *gnutls_cipher_get_name(gnutls_cipher_algorithm_t algorithm)
+ __GNUTLS_CONST__;
+const char *gnutls_mac_get_name(gnutls_mac_algorithm_t algorithm)
+ __GNUTLS_CONST__;
+
+const char *gnutls_digest_get_name(gnutls_digest_algorithm_t algorithm)
+ __GNUTLS_CONST__;
+const char *gnutls_digest_get_oid(gnutls_digest_algorithm_t algorithm)
+ __GNUTLS_CONST__;
+
+const char *gnutls_kx_get_name(gnutls_kx_algorithm_t algorithm)
+ __GNUTLS_CONST__;
+const char *gnutls_certificate_type_get_name(gnutls_certificate_type_t type)
+ __GNUTLS_CONST__;
+const char *gnutls_pk_get_name(gnutls_pk_algorithm_t algorithm)
+ __GNUTLS_CONST__;
+const char *gnutls_pk_get_oid(gnutls_pk_algorithm_t algorithm) __GNUTLS_CONST__;
+
+const char *gnutls_sign_get_name(gnutls_sign_algorithm_t algorithm)
+ __GNUTLS_CONST__;
const char *gnutls_sign_get_oid(gnutls_sign_algorithm_t sign) __GNUTLS_CONST__;
-const char *
- gnutls_gost_paramset_get_name(gnutls_gost_paramset_t param) __GNUTLS_CONST__;
-const char *
- gnutls_gost_paramset_get_oid(gnutls_gost_paramset_t param) __GNUTLS_CONST__;
+const char *gnutls_gost_paramset_get_name(gnutls_gost_paramset_t param)
+ __GNUTLS_CONST__;
+const char *gnutls_gost_paramset_get_oid(gnutls_gost_paramset_t param)
+ __GNUTLS_CONST__;
size_t
- gnutls_cipher_get_key_size(gnutls_cipher_algorithm_t algorithm) __GNUTLS_CONST__;
-size_t
- gnutls_mac_get_key_size(gnutls_mac_algorithm_t algorithm) __GNUTLS_CONST__;
+gnutls_cipher_get_key_size(gnutls_cipher_algorithm_t algorithm)
+__GNUTLS_CONST__;
+size_t gnutls_mac_get_key_size(gnutls_mac_algorithm_t algorithm)
+ __GNUTLS_CONST__;
-unsigned gnutls_sign_is_secure(gnutls_sign_algorithm_t algorithm) __GNUTLS_CONST__;
+unsigned gnutls_sign_is_secure(gnutls_sign_algorithm_t algorithm)
+ __GNUTLS_CONST__;
/* It is possible that a signature algorithm is ok to use for short-lived
* data (e.g., to sign a TLS session), but not for data that are long-lived
* like certificates. This flag is about checking the security of the algorithm
* for long-lived data. */
-#define GNUTLS_SIGN_FLAG_SECURE_FOR_CERTS 1
-unsigned gnutls_sign_is_secure2(gnutls_sign_algorithm_t algorithm, unsigned int flags) __GNUTLS_CONST__;
+# define GNUTLS_SIGN_FLAG_SECURE_FOR_CERTS 1
+unsigned gnutls_sign_is_secure2(gnutls_sign_algorithm_t algorithm,
+ unsigned int flags) __GNUTLS_CONST__;
gnutls_digest_algorithm_t
- gnutls_sign_get_hash_algorithm(gnutls_sign_algorithm_t sign) __GNUTLS_CONST__;
+gnutls_sign_get_hash_algorithm(gnutls_sign_algorithm_t sign) __GNUTLS_CONST__;
gnutls_pk_algorithm_t
- gnutls_sign_get_pk_algorithm(gnutls_sign_algorithm_t sign) __GNUTLS_CONST__;
+gnutls_sign_get_pk_algorithm(gnutls_sign_algorithm_t sign) __GNUTLS_CONST__;
gnutls_sign_algorithm_t
- gnutls_pk_to_sign(gnutls_pk_algorithm_t pk,
+gnutls_pk_to_sign(gnutls_pk_algorithm_t pk,
gnutls_digest_algorithm_t hash) __GNUTLS_CONST__;
unsigned
-gnutls_sign_supports_pk_algorithm(gnutls_sign_algorithm_t sign, gnutls_pk_algorithm_t pk) __GNUTLS_CONST__;
+gnutls_sign_supports_pk_algorithm(gnutls_sign_algorithm_t sign,
+ gnutls_pk_algorithm_t pk) __GNUTLS_CONST__;
-#define gnutls_sign_algorithm_get_name gnutls_sign_get_name
+# define gnutls_sign_algorithm_get_name gnutls_sign_get_name
gnutls_mac_algorithm_t gnutls_mac_get_id(const char *name) __GNUTLS_CONST__;
-gnutls_digest_algorithm_t gnutls_digest_get_id(const char *name) __GNUTLS_CONST__;
+gnutls_digest_algorithm_t gnutls_digest_get_id(const char *name)
+ __GNUTLS_CONST__;
gnutls_cipher_algorithm_t
- gnutls_cipher_get_id(const char *name) __GNUTLS_CONST__;
+gnutls_cipher_get_id(const char *name) __GNUTLS_CONST__;
-gnutls_kx_algorithm_t
- gnutls_kx_get_id(const char *name) __GNUTLS_CONST__;
-gnutls_protocol_t
- gnutls_protocol_get_id(const char *name) __GNUTLS_CONST__;
+gnutls_kx_algorithm_t gnutls_kx_get_id(const char *name) __GNUTLS_CONST__;
+gnutls_protocol_t gnutls_protocol_get_id(const char *name) __GNUTLS_CONST__;
gnutls_certificate_type_t
- gnutls_certificate_type_get_id(const char *name) __GNUTLS_CONST__;
-gnutls_pk_algorithm_t
- gnutls_pk_get_id(const char *name) __GNUTLS_CONST__;
-gnutls_sign_algorithm_t
- gnutls_sign_get_id(const char *name) __GNUTLS_CONST__;
-gnutls_ecc_curve_t gnutls_ecc_curve_get_id(const char *name) __GNUTLS_CONST__;
-gnutls_pk_algorithm_t gnutls_ecc_curve_get_pk(gnutls_ecc_curve_t curve) __GNUTLS_CONST__;
+gnutls_certificate_type_get_id(const char *name) __GNUTLS_CONST__;
+gnutls_pk_algorithm_t gnutls_pk_get_id(const char *name) __GNUTLS_CONST__;
+gnutls_sign_algorithm_t gnutls_sign_get_id(const char *name) __GNUTLS_CONST__;
+gnutls_ecc_curve_t gnutls_ecc_curve_get_id(const char *name) __GNUTLS_CONST__;
+gnutls_pk_algorithm_t gnutls_ecc_curve_get_pk(gnutls_ecc_curve_t curve)
+ __GNUTLS_CONST__;
gnutls_group_t gnutls_group_get_id(const char *name);
gnutls_digest_algorithm_t
- gnutls_oid_to_digest(const char *oid) __GNUTLS_CONST__;
-gnutls_mac_algorithm_t
- gnutls_oid_to_mac(const char *oid) __GNUTLS_CONST__;
-gnutls_pk_algorithm_t
- gnutls_oid_to_pk(const char *oid) __GNUTLS_CONST__;
-gnutls_sign_algorithm_t
- gnutls_oid_to_sign(const char *oid) __GNUTLS_CONST__;
-gnutls_ecc_curve_t
- gnutls_oid_to_ecc_curve(const char *oid) __GNUTLS_CONST__;
+gnutls_oid_to_digest(const char *oid) __GNUTLS_CONST__;
+gnutls_mac_algorithm_t gnutls_oid_to_mac(const char *oid) __GNUTLS_CONST__;
+gnutls_pk_algorithm_t gnutls_oid_to_pk(const char *oid) __GNUTLS_CONST__;
+gnutls_sign_algorithm_t gnutls_oid_to_sign(const char *oid) __GNUTLS_CONST__;
+gnutls_ecc_curve_t gnutls_oid_to_ecc_curve(const char *oid) __GNUTLS_CONST__;
gnutls_gost_paramset_t
- gnutls_oid_to_gost_paramset(const char *oid) __GNUTLS_CONST__;
+gnutls_oid_to_gost_paramset(const char *oid) __GNUTLS_CONST__;
/* list supported algorithms */
-const gnutls_ecc_curve_t *
- gnutls_ecc_curve_list(void) __GNUTLS_PURE__;
-const gnutls_group_t *
- gnutls_group_list(void) __GNUTLS_PURE__;
-const gnutls_cipher_algorithm_t *
- gnutls_cipher_list(void) __GNUTLS_PURE__;
-const gnutls_mac_algorithm_t *
- gnutls_mac_list(void) __GNUTLS_PURE__;
-const gnutls_digest_algorithm_t *
- gnutls_digest_list(void) __GNUTLS_PURE__;
-const gnutls_protocol_t *
- gnutls_protocol_list(void) __GNUTLS_PURE__;
-const gnutls_certificate_type_t *
- gnutls_certificate_type_list(void) __GNUTLS_PURE__;
-const gnutls_kx_algorithm_t *
- gnutls_kx_list(void) __GNUTLS_PURE__;
-const gnutls_pk_algorithm_t *
- gnutls_pk_list(void) __GNUTLS_PURE__;
-const gnutls_sign_algorithm_t *
- gnutls_sign_list(void) __GNUTLS_PURE__;
-const char *
- gnutls_cipher_suite_info(size_t idx,
- unsigned char *cs_id,
- gnutls_kx_algorithm_t * kx,
- gnutls_cipher_algorithm_t * cipher,
- gnutls_mac_algorithm_t * mac,
- gnutls_protocol_t * min_version);
+const gnutls_ecc_curve_t *gnutls_ecc_curve_list(void) __GNUTLS_PURE__;
+const gnutls_group_t *gnutls_group_list(void) __GNUTLS_PURE__;
+const gnutls_cipher_algorithm_t *gnutls_cipher_list(void) __GNUTLS_PURE__;
+const gnutls_mac_algorithm_t *gnutls_mac_list(void) __GNUTLS_PURE__;
+const gnutls_digest_algorithm_t *gnutls_digest_list(void) __GNUTLS_PURE__;
+const gnutls_protocol_t *gnutls_protocol_list(void) __GNUTLS_PURE__;
+const gnutls_certificate_type_t *gnutls_certificate_type_list(void)
+ __GNUTLS_PURE__;
+const gnutls_kx_algorithm_t *gnutls_kx_list(void) __GNUTLS_PURE__;
+const gnutls_pk_algorithm_t *gnutls_pk_list(void) __GNUTLS_PURE__;
+const gnutls_sign_algorithm_t *gnutls_sign_list(void) __GNUTLS_PURE__;
+const char *gnutls_cipher_suite_info(size_t idx,
+ unsigned char *cs_id,
+ gnutls_kx_algorithm_t * kx,
+ gnutls_cipher_algorithm_t * cipher,
+ gnutls_mac_algorithm_t * mac,
+ gnutls_protocol_t * min_version);
/* functions for run-time enablement of algorithms */
int gnutls_ecc_curve_set_enabled(gnutls_ecc_curve_t curve,
@@ -1470,8 +1445,8 @@ int gnutls_error_is_fatal(int error) __GNUTLS_CONST__;
int gnutls_error_to_alert(int err, int *level);
void gnutls_perror(int error);
-const char * gnutls_strerror(int error) __GNUTLS_CONST__;
-const char * gnutls_strerror_name(int error) __GNUTLS_CONST__;
+const char *gnutls_strerror(int error) __GNUTLS_CONST__;
+const char *gnutls_strerror_name(int error) __GNUTLS_CONST__;
/* Semi-internal functions.
*/
@@ -1487,7 +1462,7 @@ gnutls_handshake_get_last_in(gnutls_session_t session);
/* Record layer functions.
*/
-#define GNUTLS_HEARTBEAT_WAIT 1
+# define GNUTLS_HEARTBEAT_WAIT 1
int gnutls_heartbeat_ping(gnutls_session_t session, size_t data_size,
unsigned int max_tries, unsigned int flags);
int gnutls_heartbeat_pong(gnutls_session_t session, unsigned int flags);
@@ -1496,22 +1471,21 @@ void gnutls_record_set_timeout(gnutls_session_t session, unsigned int ms);
void gnutls_record_disable_padding(gnutls_session_t session);
void gnutls_record_cork(gnutls_session_t session);
-#define GNUTLS_RECORD_WAIT 1
+# define GNUTLS_RECORD_WAIT 1
int gnutls_record_uncork(gnutls_session_t session, unsigned int flags);
size_t gnutls_record_discard_queued(gnutls_session_t session);
int
gnutls_record_get_state(gnutls_session_t session,
unsigned read,
- gnutls_datum_t *mac_key,
- gnutls_datum_t *IV,
- gnutls_datum_t *cipher_key,
+ gnutls_datum_t * mac_key,
+ gnutls_datum_t * IV,
+ gnutls_datum_t * cipher_key,
unsigned char seq_number[8]);
int
gnutls_record_set_state(gnutls_session_t session,
- unsigned read,
- const unsigned char seq_number[8]);
+ unsigned read, const unsigned char seq_number[8]);
typedef struct {
size_t low;
@@ -1531,35 +1505,35 @@ ssize_t gnutls_record_send_range(gnutls_session_t session,
const void *data, size_t data_size,
const gnutls_range_st * range);
ssize_t gnutls_record_send_file(gnutls_session_t session, int fd,
- off_t *offset, size_t count);
+ off_t * offset, size_t count);
ssize_t gnutls_record_recv(gnutls_session_t session, void *data,
size_t data_size);
typedef struct mbuffer_st *gnutls_packet_t;
ssize_t
-gnutls_record_recv_packet(gnutls_session_t session,
- gnutls_packet_t *packet);
+gnutls_record_recv_packet(gnutls_session_t session, gnutls_packet_t * packet);
-void gnutls_packet_get(gnutls_packet_t packet, gnutls_datum_t *data, unsigned char *sequence);
+void gnutls_packet_get(gnutls_packet_t packet, gnutls_datum_t * data,
+ unsigned char *sequence);
void gnutls_packet_deinit(gnutls_packet_t packet);
-#define gnutls_read gnutls_record_recv
-#define gnutls_write gnutls_record_send
+# define gnutls_read gnutls_record_recv
+# define gnutls_write gnutls_record_send
ssize_t gnutls_record_recv_seq(gnutls_session_t session, void *data,
size_t data_size, unsigned char *seq);
size_t gnutls_record_overhead_size(gnutls_session_t session);
size_t
- gnutls_est_record_overhead_size(gnutls_protocol_t version,
- gnutls_cipher_algorithm_t cipher,
- gnutls_mac_algorithm_t mac,
- gnutls_compression_method_t comp,
- unsigned int flags) __GNUTLS_CONST__;
+gnutls_est_record_overhead_size(gnutls_protocol_t version,
+ gnutls_cipher_algorithm_t cipher,
+ gnutls_mac_algorithm_t mac,
+ gnutls_compression_method_t comp,
+ unsigned int flags) __GNUTLS_CONST__;
void gnutls_session_enable_compatibility_mode(gnutls_session_t session);
-#define gnutls_record_set_max_empty_records(session, x)
+# define gnutls_record_set_max_empty_records(session, x)
unsigned gnutls_record_can_use_length_hiding(gnutls_session_t session);
@@ -1573,12 +1547,11 @@ size_t gnutls_record_check_pending(gnutls_session_t session);
size_t gnutls_record_check_corked(gnutls_session_t session);
size_t gnutls_record_get_max_early_data_size(gnutls_session_t session);
-int gnutls_record_set_max_early_data_size(gnutls_session_t session, size_t size);
+int gnutls_record_set_max_early_data_size(gnutls_session_t session,
+ size_t size);
ssize_t gnutls_record_send_early_data(gnutls_session_t session,
- const void *data,
- size_t length);
-ssize_t gnutls_record_recv_early_data(gnutls_session_t session,
- void *data,
+ const void *data, size_t length);
+ssize_t gnutls_record_recv_early_data(gnutls_session_t session, void *data,
size_t data_size);
void gnutls_session_force_valid(gnutls_session_t session);
@@ -1586,12 +1559,11 @@ void gnutls_session_force_valid(gnutls_session_t session);
int gnutls_prf(gnutls_session_t session,
size_t label_size, const char *label,
int server_random_first,
- size_t extra_size, const char *extra,
- size_t outsize, char *out);
+ size_t extra_size, const char *extra, size_t outsize, char *out);
int gnutls_prf_rfc5705(gnutls_session_t session,
- size_t label_size, const char *label,
- size_t context_size, const char *context,
- size_t outsize, char *out);
+ size_t label_size, const char *label,
+ size_t context_size, const char *context,
+ size_t outsize, char *out);
int gnutls_prf_early(gnutls_session_t session,
size_t label_size, const char *label,
size_t context_size, const char *context,
@@ -1617,7 +1589,7 @@ int gnutls_server_name_set(gnutls_session_t session,
const void *name, size_t name_length);
int gnutls_server_name_get(gnutls_session_t session,
- void *data, size_t * data_length,
+ void *data, size_t *data_length,
unsigned int *type, unsigned int indx);
unsigned int gnutls_heartbeat_get_timeout(gnutls_session_t session);
@@ -1625,13 +1597,13 @@ void gnutls_heartbeat_set_timeouts(gnutls_session_t session,
unsigned int retrans_timeout,
unsigned int total_timeout);
-#define GNUTLS_HB_PEER_ALLOWED_TO_SEND (1)
-#define GNUTLS_HB_PEER_NOT_ALLOWED_TO_SEND (1<<1)
+# define GNUTLS_HB_PEER_ALLOWED_TO_SEND (1)
+# define GNUTLS_HB_PEER_NOT_ALLOWED_TO_SEND (1<<1)
/* Heartbeat */
void gnutls_heartbeat_enable(gnutls_session_t session, unsigned int type);
-#define GNUTLS_HB_LOCAL_ALLOWED_TO_SEND (1<<2)
+# define GNUTLS_HB_LOCAL_ALLOWED_TO_SEND (1<<2)
unsigned gnutls_heartbeat_allowed(gnutls_session_t session, unsigned int type);
/* Safe renegotiation */
@@ -1659,18 +1631,18 @@ unsigned gnutls_session_etm_status(gnutls_session_t session);
*/
typedef enum {
GNUTLS_SFLAGS_SAFE_RENEGOTIATION = 1,
- GNUTLS_SFLAGS_EXT_MASTER_SECRET = 1<<1,
- GNUTLS_SFLAGS_ETM = 1<<2,
- GNUTLS_SFLAGS_HB_LOCAL_SEND = 1<<3,
- GNUTLS_SFLAGS_HB_PEER_SEND = 1<<4,
- GNUTLS_SFLAGS_FALSE_START = 1<<5,
- GNUTLS_SFLAGS_RFC7919 = 1<<6,
- GNUTLS_SFLAGS_SESSION_TICKET = 1<<7,
- GNUTLS_SFLAGS_POST_HANDSHAKE_AUTH = 1<<8,
- GNUTLS_SFLAGS_EARLY_START = 1<<9,
- GNUTLS_SFLAGS_EARLY_DATA = 1<<10,
- GNUTLS_SFLAGS_CLI_REQUESTED_OCSP = 1<<11,
- GNUTLS_SFLAGS_SERV_REQUESTED_OCSP = 1<<12
+ GNUTLS_SFLAGS_EXT_MASTER_SECRET = 1 << 1,
+ GNUTLS_SFLAGS_ETM = 1 << 2,
+ GNUTLS_SFLAGS_HB_LOCAL_SEND = 1 << 3,
+ GNUTLS_SFLAGS_HB_PEER_SEND = 1 << 4,
+ GNUTLS_SFLAGS_FALSE_START = 1 << 5,
+ GNUTLS_SFLAGS_RFC7919 = 1 << 6,
+ GNUTLS_SFLAGS_SESSION_TICKET = 1 << 7,
+ GNUTLS_SFLAGS_POST_HANDSHAKE_AUTH = 1 << 8,
+ GNUTLS_SFLAGS_EARLY_START = 1 << 9,
+ GNUTLS_SFLAGS_EARLY_DATA = 1 << 10,
+ GNUTLS_SFLAGS_CLI_REQUESTED_OCSP = 1 << 11,
+ GNUTLS_SFLAGS_SERV_REQUESTED_OCSP = 1 << 12
} gnutls_session_flags_t;
unsigned gnutls_session_get_flags(gnutls_session_t session);
@@ -1694,7 +1666,8 @@ int gnutls_session_ticket_enable_client(gnutls_session_t session);
int gnutls_session_ticket_enable_server(gnutls_session_t session,
const gnutls_datum_t * key);
-int gnutls_session_ticket_send(gnutls_session_t session, unsigned nr, unsigned flags);
+int gnutls_session_ticket_send(gnutls_session_t session, unsigned nr,
+ unsigned flags);
/* SRTP, RFC 5764 */
@@ -1721,8 +1694,7 @@ typedef enum {
int gnutls_srtp_set_profile(gnutls_session_t session,
gnutls_srtp_profile_t profile);
int gnutls_srtp_set_profile_direct(gnutls_session_t session,
- const char *profiles,
- const char **err_pos);
+ const char *profiles, const char **err_pos);
int gnutls_srtp_get_selected_profile(gnutls_session_t session,
gnutls_srtp_profile_t * profile);
@@ -1737,16 +1709,15 @@ int gnutls_srtp_get_keys(gnutls_session_t session,
gnutls_datum_t * server_key,
gnutls_datum_t * server_salt);
-int gnutls_srtp_set_mki(gnutls_session_t session,
- const gnutls_datum_t * mki);
+int gnutls_srtp_set_mki(gnutls_session_t session, const gnutls_datum_t * mki);
int gnutls_srtp_get_mki(gnutls_session_t session, gnutls_datum_t * mki);
/* COMPRESS_CERTIFICATE extension, RFC8879 */
gnutls_compression_method_t
gnutls_compress_certificate_get_selected_method(gnutls_session_t session);
int gnutls_compress_certificate_set_methods(gnutls_session_t session,
- const gnutls_compression_method_t * methods,
- size_t methods_len);
+ const gnutls_compression_method_t *
+ methods, size_t methods_len);
/* ALPN TLS extension */
@@ -1761,10 +1732,10 @@ int gnutls_compress_certificate_set_methods(gnutls_session_t session,
*/
typedef enum {
GNUTLS_ALPN_MANDATORY = 1,
- GNUTLS_ALPN_SERVER_PRECEDENCE = (1<<1)
+ GNUTLS_ALPN_SERVER_PRECEDENCE = (1 << 1)
} gnutls_alpn_flags_t;
-#define GNUTLS_ALPN_MAND GNUTLS_ALPN_MANDATORY
+# define GNUTLS_ALPN_MAND GNUTLS_ALPN_MANDATORY
int gnutls_alpn_get_selected_protocol(gnutls_session_t session,
gnutls_datum_t * protocol);
int gnutls_alpn_set_protocols(gnutls_session_t session,
@@ -1773,8 +1744,7 @@ int gnutls_alpn_set_protocols(gnutls_session_t session,
int gnutls_key_generate(gnutls_datum_t * key, unsigned int key_size);
-
-#define GNUTLS_PRIORITY_INIT_DEF_APPEND 1
+# define GNUTLS_PRIORITY_INIT_DEF_APPEND 1
int gnutls_priority_init(gnutls_priority_t * priority_cache,
const char *priorities, const char **err_pos);
int gnutls_priority_init2(gnutls_priority_t * priority_cache,
@@ -1785,23 +1755,20 @@ int gnutls_priority_get_cipher_suite_index(gnutls_priority_t pcache,
unsigned int idx,
unsigned int *sidx);
-#define GNUTLS_PRIORITY_LIST_INIT_KEYWORDS 1
-#define GNUTLS_PRIORITY_LIST_SPECIAL 2
-const char *
-gnutls_priority_string_list(unsigned iter, unsigned int flags);
+# define GNUTLS_PRIORITY_LIST_INIT_KEYWORDS 1
+# define GNUTLS_PRIORITY_LIST_SPECIAL 2
+const char *gnutls_priority_string_list(unsigned iter, unsigned int flags);
-int gnutls_priority_set(gnutls_session_t session,
- gnutls_priority_t priority);
+int gnutls_priority_set(gnutls_session_t session, gnutls_priority_t priority);
int gnutls_priority_set_direct(gnutls_session_t session,
- const char *priorities,
- const char **err_pos);
+ const char *priorities, const char **err_pos);
int gnutls_priority_certificate_type_list(gnutls_priority_t pcache,
const unsigned int **list);
int gnutls_priority_certificate_type_list2(gnutls_priority_t pcache,
- const unsigned int **list,
- gnutls_ctype_target_t target);
+ const unsigned int **list,
+ gnutls_ctype_target_t target);
int gnutls_priority_sign_list(gnutls_priority_t pcache,
const unsigned int **list);
int gnutls_priority_protocol_list(gnutls_priority_t pcache,
@@ -1809,8 +1776,7 @@ int gnutls_priority_protocol_list(gnutls_priority_t pcache,
int gnutls_priority_ecc_curve_list(gnutls_priority_t pcache,
const unsigned int **list);
int
-gnutls_priority_group_list(gnutls_priority_t pcache,
- const unsigned int **list);
+gnutls_priority_group_list(gnutls_priority_t pcache, const unsigned int **list);
int gnutls_priority_kx_list(gnutls_priority_t pcache,
const unsigned int **list);
@@ -1824,45 +1790,43 @@ const char *gnutls_get_system_config_file(void);
int gnutls_set_default_priority(gnutls_session_t session);
int gnutls_set_default_priority_append(gnutls_session_t session,
const char *add_prio,
- const char **err_pos,
- unsigned flags);
+ const char **err_pos, unsigned flags);
/* Returns the name of a cipher suite */
-const char *
- gnutls_cipher_suite_get_name(gnutls_kx_algorithm_t kx_algorithm,
- gnutls_cipher_algorithm_t cipher_algorithm,
- gnutls_mac_algorithm_t mac_algorithm) __GNUTLS_CONST__;
+const char *gnutls_cipher_suite_get_name(gnutls_kx_algorithm_t kx_algorithm,
+ gnutls_cipher_algorithm_t
+ cipher_algorithm,
+ gnutls_mac_algorithm_t mac_algorithm)
+ __GNUTLS_CONST__;
-const char *
-gnutls_ciphersuite_get(gnutls_session_t session) __GNUTLS_CONST__;
+const char *gnutls_ciphersuite_get(gnutls_session_t session) __GNUTLS_CONST__;
/* get the currently used protocol version */
gnutls_protocol_t gnutls_protocol_get_version(gnutls_session_t session);
-const char *
- gnutls_protocol_get_name(gnutls_protocol_t version) __GNUTLS_CONST__;
-
+const char *gnutls_protocol_get_name(gnutls_protocol_t version)
+ __GNUTLS_CONST__;
/* get/set session
*/
int gnutls_session_set_data(gnutls_session_t session,
- const void *session_data,
- size_t session_data_size);
+ const void *session_data, size_t session_data_size);
int gnutls_session_get_data(gnutls_session_t session, void *session_data,
- size_t * session_data_size);
-int gnutls_session_get_data2(gnutls_session_t session,
- gnutls_datum_t * data);
+ size_t *session_data_size);
+int gnutls_session_get_data2(gnutls_session_t session, gnutls_datum_t * data);
void gnutls_session_get_random(gnutls_session_t session,
gnutls_datum_t * client,
gnutls_datum_t * server);
void gnutls_session_get_master_secret(gnutls_session_t session,
- gnutls_datum_t * secret);
+ gnutls_datum_t * secret);
char *gnutls_session_get_desc(gnutls_session_t session);
typedef int gnutls_certificate_verify_function(gnutls_session_t);
-void gnutls_session_set_verify_function(gnutls_session_t session, gnutls_certificate_verify_function * func);
+void gnutls_session_set_verify_function(gnutls_session_t session,
+ gnutls_certificate_verify_function *
+ func);
/**
* gnutls_vdata_types_t:
@@ -1901,7 +1865,7 @@ typedef struct {
} gnutls_typed_vdata_st;
void gnutls_session_set_verify_cert(gnutls_session_t session,
- const char *hostname, unsigned flags);
+ const char *hostname, unsigned flags);
void
gnutls_session_set_verify_cert2(gnutls_session_t session,
@@ -1921,14 +1885,13 @@ int gnutls_session_set_premaster(gnutls_session_t session,
const gnutls_datum_t * session_id);
/* returns the session ID */
-#define GNUTLS_MAX_SESSION_ID 32
+# define GNUTLS_MAX_SESSION_ID 32
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_get_id2(gnutls_session_t session,
gnutls_datum_t * session_id);
-int gnutls_session_set_id(gnutls_session_t session,
- const gnutls_datum_t * sid);
+int gnutls_session_set_id(gnutls_session_t session, const gnutls_datum_t * sid);
int gnutls_session_channel_binding(gnutls_session_t session,
gnutls_channel_binding_t cbtype,
@@ -1939,9 +1902,9 @@ int gnutls_session_channel_binding(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,
- gnutls_datum_t data);
-typedef int (*gnutls_db_remove_func) (void *, gnutls_datum_t key);
+typedef int (*gnutls_db_store_func)(void *, gnutls_datum_t key,
+ gnutls_datum_t data);
+typedef int (*gnutls_db_remove_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 seconds);
@@ -1974,38 +1937,39 @@ time_t gnutls_db_check_entry_expire_time(gnutls_datum_t * entry);
*
* Returns: Non zero on error.
*/
-#define GNUTLS_HOOK_POST (1)
-#define GNUTLS_HOOK_PRE (0)
-#define GNUTLS_HOOK_BOTH (-1)
-
-typedef int (*gnutls_handshake_hook_func) (gnutls_session_t,
- unsigned int htype,
- unsigned when,
- unsigned int incoming,
- const gnutls_datum_t *msg);
+# define GNUTLS_HOOK_POST (1)
+# define GNUTLS_HOOK_PRE (0)
+# define GNUTLS_HOOK_BOTH (-1)
+
+typedef int (*gnutls_handshake_hook_func)(gnutls_session_t,
+ unsigned int htype,
+ unsigned when,
+ unsigned int incoming,
+ const gnutls_datum_t * msg);
void gnutls_handshake_set_hook_function(gnutls_session_t session,
unsigned int htype, int when,
gnutls_handshake_hook_func func);
-#define gnutls_handshake_post_client_hello_func gnutls_handshake_simple_hook_func
-typedef int (*gnutls_handshake_simple_hook_func) (gnutls_session_t);
+# define gnutls_handshake_post_client_hello_func gnutls_handshake_simple_hook_func
+typedef int (*gnutls_handshake_simple_hook_func)(gnutls_session_t);
void
gnutls_handshake_set_post_client_hello_function(gnutls_session_t session,
- gnutls_handshake_simple_hook_func func);
+ gnutls_handshake_simple_hook_func
+ func);
void gnutls_handshake_set_max_packet_length(gnutls_session_t session,
size_t max);
/* returns libgnutls version (call it with a NULL argument)
*/
-const char * gnutls_check_version(const char *req_version) __GNUTLS_CONST__;
+const char *gnutls_check_version(const char *req_version) __GNUTLS_CONST__;
/* A macro which will allow optimizing out calls to gnutls_check_version()
* when the version being compiled with is sufficient.
* Used as:
* if (gnutls_check_version_numerc(3,3,16)) {
*/
-#define gnutls_check_version_numeric(a,b,c) \
+# define gnutls_check_version_numeric(a,b,c) \
((GNUTLS_VERSION_MAJOR >= (a)) && \
((GNUTLS_VERSION_NUMBER >= ( ((a) << 16) + ((b) << 8) + (c) )) || \
gnutls_check_version(#a "." #b "." #c)))
@@ -2020,7 +1984,7 @@ int gnutls_credentials_set(gnutls_session_t session,
gnutls_credentials_type_t type, void *cred);
int gnutls_credentials_get(gnutls_session_t session,
gnutls_credentials_type_t type, void **cred);
-#define gnutls_cred_set gnutls_credentials_set
+# define gnutls_cred_set gnutls_credentials_set
/* x.509 types */
@@ -2045,59 +2009,49 @@ typedef struct gnutls_x509_crq_int *gnutls_x509_crq_t;
struct gnutls_openpgp_keyring_int;
typedef struct gnutls_openpgp_keyring_int *gnutls_openpgp_keyring_t;
-
/* Credential structures - used in gnutls_credentials_set(); */
struct gnutls_certificate_credentials_st;
typedef struct gnutls_certificate_credentials_st
*gnutls_certificate_credentials_t;
-typedef gnutls_certificate_credentials_t
- gnutls_certificate_server_credentials;
-typedef gnutls_certificate_credentials_t
- gnutls_certificate_client_credentials;
+typedef gnutls_certificate_credentials_t gnutls_certificate_server_credentials;
+typedef gnutls_certificate_credentials_t gnutls_certificate_client_credentials;
typedef struct gnutls_anon_server_credentials_st
*gnutls_anon_server_credentials_t;
typedef struct gnutls_anon_client_credentials_st
*gnutls_anon_client_credentials_t;
-void gnutls_anon_free_server_credentials(gnutls_anon_server_credentials_t
- sc);
+void gnutls_anon_free_server_credentials(gnutls_anon_server_credentials_t sc);
int
-gnutls_anon_allocate_server_credentials(gnutls_anon_server_credentials_t
- * sc);
+gnutls_anon_allocate_server_credentials(gnutls_anon_server_credentials_t * sc);
void gnutls_anon_set_server_dh_params(gnutls_anon_server_credentials_t res,
gnutls_dh_params_t dh_params);
int
gnutls_anon_set_server_known_dh_params(gnutls_anon_server_credentials_t res,
- gnutls_sec_param_t sec_param);
+ gnutls_sec_param_t sec_param);
void
gnutls_anon_set_server_params_function(gnutls_anon_server_credentials_t
res, gnutls_params_function * func);
-void
-gnutls_anon_free_client_credentials(gnutls_anon_client_credentials_t sc);
+void gnutls_anon_free_client_credentials(gnutls_anon_client_credentials_t sc);
int
-gnutls_anon_allocate_client_credentials(gnutls_anon_client_credentials_t
- * sc);
+gnutls_anon_allocate_client_credentials(gnutls_anon_client_credentials_t * sc);
/* CERTFILE is an x509 certificate in PEM form.
* KEYFILE is a pkcs-1 private key in PEM form (for RSA keys).
*/
-void
-gnutls_certificate_free_credentials(gnutls_certificate_credentials_t sc);
+void gnutls_certificate_free_credentials(gnutls_certificate_credentials_t sc);
int
-gnutls_certificate_allocate_credentials(gnutls_certificate_credentials_t
- * res);
+gnutls_certificate_allocate_credentials(gnutls_certificate_credentials_t * res);
int
gnutls_certificate_get_issuer(gnutls_certificate_credentials_t sc,
gnutls_x509_crt_t cert,
- gnutls_x509_crt_t * issuer,
- unsigned int flags);
+ gnutls_x509_crt_t * issuer, unsigned int flags);
int gnutls_certificate_get_crt_raw(gnutls_certificate_credentials_t sc,
unsigned idx1, unsigned idx2,
@@ -2131,9 +2085,9 @@ gnutls_certificate_get_verify_flags(gnutls_certificate_credentials_t res);
*/
typedef enum gnutls_certificate_flags {
GNUTLS_CERTIFICATE_SKIP_KEY_CERT_MATCH = 1,
- GNUTLS_CERTIFICATE_API_V2 = (1<<1),
- GNUTLS_CERTIFICATE_SKIP_OCSP_RESPONSE_CHECK = (1<<2),
- GNUTLS_CERTIFICATE_VERIFY_CRLS = (1<<3)
+ GNUTLS_CERTIFICATE_API_V2 = (1 << 1),
+ GNUTLS_CERTIFICATE_SKIP_OCSP_RESPONSE_CHECK = (1 << 2),
+ GNUTLS_CERTIFICATE_VERIFY_CRLS = (1 << 3)
} gnutls_certificate_flags;
void gnutls_certificate_set_flags(gnutls_certificate_credentials_t,
@@ -2144,8 +2098,7 @@ void gnutls_certificate_set_verify_limits(gnutls_certificate_credentials_t
unsigned int max_depth);
int
-gnutls_certificate_set_x509_system_trust(gnutls_certificate_credentials_t
- cred);
+gnutls_certificate_set_x509_system_trust(gnutls_certificate_credentials_t cred);
int
gnutls_certificate_set_x509_trust_file(gnutls_certificate_credentials_t
@@ -2179,8 +2132,7 @@ gnutls_certificate_set_x509_key_file2(gnutls_certificate_credentials_t
res, const char *certfile,
const char *keyfile,
gnutls_x509_crt_fmt_t type,
- const char *pass,
- unsigned int flags);
+ const char *pass, unsigned int flags);
int gnutls_certificate_set_x509_key_mem(gnutls_certificate_credentials_t
res, const gnutls_datum_t * cert,
@@ -2191,20 +2143,17 @@ int gnutls_certificate_set_x509_key_mem2(gnutls_certificate_credentials_t
res, const gnutls_datum_t * cert,
const gnutls_datum_t * key,
gnutls_x509_crt_fmt_t type,
- const char *pass,
- unsigned int flags);
+ const char *pass, unsigned int flags);
void gnutls_certificate_send_x509_rdn_sequence(gnutls_session_t session,
int status);
-int
-gnutls_certificate_set_x509_simple_pkcs12_file
-(gnutls_certificate_credentials_t res, const char *pkcs12file,
- gnutls_x509_crt_fmt_t type, const char *password);
-int
-gnutls_certificate_set_x509_simple_pkcs12_mem
-(gnutls_certificate_credentials_t res, const gnutls_datum_t * p12blob,
- gnutls_x509_crt_fmt_t type, const char *password);
+int gnutls_certificate_set_x509_simple_pkcs12_file
+ (gnutls_certificate_credentials_t res, const char *pkcs12file,
+ gnutls_x509_crt_fmt_t type, const char *password);
+int gnutls_certificate_set_x509_simple_pkcs12_mem
+ (gnutls_certificate_credentials_t res, const gnutls_datum_t * p12blob,
+ gnutls_x509_crt_fmt_t type, const char *password);
/* New functions to allow setting already parsed X.509 stuff.
*/
@@ -2221,44 +2170,39 @@ int gnutls_certificate_set_x509_crl(gnutls_certificate_credentials_t res,
int crl_list_size);
int gnutls_certificate_get_x509_key(gnutls_certificate_credentials_t res,
- unsigned index,
- gnutls_x509_privkey_t *key);
+ unsigned index,
+ gnutls_x509_privkey_t * key);
int gnutls_certificate_get_x509_crt(gnutls_certificate_credentials_t res,
- unsigned index,
- gnutls_x509_crt_t **crt_list,
- unsigned *crt_list_size);
+ unsigned index,
+ gnutls_x509_crt_t ** crt_list,
+ unsigned *crt_list_size);
/* OCSP status request extension, RFC 6066 */
typedef int (*gnutls_status_request_ocsp_func)
- (gnutls_session_t session, void *ptr, gnutls_datum_t *ocsp_response);
+ (gnutls_session_t session, void *ptr, gnutls_datum_t * ocsp_response);
-void
-gnutls_certificate_set_ocsp_status_request_function
-(gnutls_certificate_credentials_t res,
-gnutls_status_request_ocsp_func ocsp_func, void *ptr);
+void gnutls_certificate_set_ocsp_status_request_function
+ (gnutls_certificate_credentials_t res,
+ gnutls_status_request_ocsp_func ocsp_func, void *ptr);
-int
-gnutls_certificate_set_ocsp_status_request_function2
-(gnutls_certificate_credentials_t res, unsigned idx,
-gnutls_status_request_ocsp_func ocsp_func, void *ptr);
+int gnutls_certificate_set_ocsp_status_request_function2
+ (gnutls_certificate_credentials_t res, unsigned idx,
+ gnutls_status_request_ocsp_func ocsp_func, void *ptr);
-int
-gnutls_certificate_set_ocsp_status_request_file
-(gnutls_certificate_credentials_t res, const char *response_file,
- unsigned idx);
+int gnutls_certificate_set_ocsp_status_request_file
+ (gnutls_certificate_credentials_t res, const char *response_file,
+ unsigned idx);
-int
-gnutls_certificate_set_ocsp_status_request_file2
-(gnutls_certificate_credentials_t res, const char *response_file,
- unsigned idx, gnutls_x509_crt_fmt_t fmt);
+int gnutls_certificate_set_ocsp_status_request_file2
+ (gnutls_certificate_credentials_t res, const char *response_file,
+ unsigned idx, gnutls_x509_crt_fmt_t fmt);
-int
-gnutls_certificate_set_ocsp_status_request_mem
-(gnutls_certificate_credentials_t res, const gnutls_datum_t *resp,
- unsigned idx, gnutls_x509_crt_fmt_t fmt);
+int gnutls_certificate_set_ocsp_status_request_mem
+ (gnutls_certificate_credentials_t res, const gnutls_datum_t * resp,
+ unsigned idx, gnutls_x509_crt_fmt_t fmt);
typedef struct gnutls_ocsp_data_st {
- unsigned int version; /* must be zero */
+ unsigned int version; /* must be zero */
gnutls_datum_t response;
time_t exptime;
unsigned char padding[32];
@@ -2266,9 +2210,7 @@ typedef struct gnutls_ocsp_data_st {
time_t
gnutls_certificate_get_ocsp_expiration(gnutls_certificate_credentials_t sc,
- unsigned idx,
- int oidx,
- unsigned flags);
+ unsigned idx, int oidx, unsigned flags);
int gnutls_ocsp_status_request_enable_client(gnutls_session_t session,
gnutls_datum_t * responder_id,
@@ -2279,37 +2221,35 @@ int gnutls_ocsp_status_request_enable_client(gnutls_session_t session,
int gnutls_ocsp_status_request_get(gnutls_session_t session,
gnutls_datum_t * response);
-#define GNUTLS_OCSP_SR_IS_AVAIL 1
+# define GNUTLS_OCSP_SR_IS_AVAIL 1
unsigned gnutls_ocsp_status_request_is_checked(gnutls_session_t session,
unsigned int flags);
int
gnutls_ocsp_status_request_get2(gnutls_session_t session,
- unsigned idx,
- gnutls_datum_t * response);
+ unsigned idx, gnutls_datum_t * response);
/* RAW public key functions (RFC7250) */
int gnutls_certificate_set_rawpk_key_mem(gnutls_certificate_credentials_t cred,
- const gnutls_datum_t* spki,
- const gnutls_datum_t* pkey,
- gnutls_x509_crt_fmt_t format,
- const char* pass,
- unsigned int key_usage,
- const char **names,
- unsigned int names_length,
- unsigned int flags);
+ const gnutls_datum_t * spki,
+ const gnutls_datum_t * pkey,
+ gnutls_x509_crt_fmt_t format,
+ const char *pass,
+ unsigned int key_usage,
+ const char **names,
+ unsigned int names_length,
+ unsigned int flags);
int gnutls_certificate_set_rawpk_key_file(gnutls_certificate_credentials_t cred,
- const char* rawpkfile,
- const char* privkeyfile,
- gnutls_x509_crt_fmt_t format,
- const char *pass,
- unsigned int key_usage,
- const char **names,
- unsigned int names_length,
- unsigned int privkey_flags,
- unsigned int pkcs11_flags);
-
+ const char *rawpkfile,
+ const char *privkeyfile,
+ gnutls_x509_crt_fmt_t format,
+ const char *pass,
+ unsigned int key_usage,
+ const char **names,
+ unsigned int names_length,
+ unsigned int privkey_flags,
+ unsigned int pkcs11_flags);
/* global state functions
*/
@@ -2329,21 +2269,20 @@ const gnutls_library_config_st *gnutls_get_library_config(void);
*/
typedef time_t(*gnutls_time_func) (time_t * t);
-typedef int (*mutex_init_func) (void **mutex);
-typedef int (*mutex_lock_func) (void **mutex);
-typedef int (*mutex_unlock_func) (void **mutex);
-typedef int (*mutex_deinit_func) (void **mutex);
+typedef int (*mutex_init_func)(void **mutex);
+typedef int (*mutex_lock_func)(void **mutex);
+typedef int (*mutex_unlock_func)(void **mutex);
+typedef int (*mutex_deinit_func)(void **mutex);
void gnutls_global_set_mutex(mutex_init_func init,
mutex_deinit_func deinit,
- mutex_lock_func lock,
- mutex_unlock_func unlock);
+ mutex_lock_func lock, mutex_unlock_func unlock);
-typedef void *(*gnutls_alloc_function) (size_t);
-typedef void *(*gnutls_calloc_function) (size_t, size_t);
-typedef int (*gnutls_is_secure_function) (const void *);
-typedef void (*gnutls_free_function) (void *);
-typedef void *(*gnutls_realloc_function) (void *, size_t);
+typedef void *(*gnutls_alloc_function)(size_t);
+typedef void *(*gnutls_calloc_function)(size_t, size_t);
+typedef int (*gnutls_is_secure_function)(const void *);
+typedef void (*gnutls_free_function)(void *);
+typedef void *(*gnutls_realloc_function)(void *, size_t);
void gnutls_global_set_time_function(gnutls_time_func time_func);
@@ -2353,11 +2292,11 @@ extern _SYM_EXPORT gnutls_realloc_function gnutls_realloc;
extern _SYM_EXPORT gnutls_calloc_function gnutls_calloc;
extern _SYM_EXPORT gnutls_free_function gnutls_free;
-#ifdef GNUTLS_INTERNAL_BUILD
-#define gnutls_free(a) gnutls_free((void *) (a)), a=NULL
-#endif
+# ifdef GNUTLS_INTERNAL_BUILD
+# define gnutls_free(a) gnutls_free((void *) (a)), a=NULL
+# endif
-extern _SYM_EXPORT char *(*gnutls_strdup) (const char *);
+extern _SYM_EXPORT char *(*gnutls_strdup)(const char *);
/* a variant of memset that doesn't get optimized out */
void gnutls_memset(void *data, int c, size_t size);
@@ -2365,8 +2304,8 @@ void gnutls_memset(void *data, int c, size_t size);
/* constant time memcmp */
int gnutls_memcmp(const void *s1, const void *s2, size_t n);
-typedef void (*gnutls_log_func) (int, const char *);
-typedef void (*gnutls_audit_log_func) (gnutls_session_t, const char *);
+typedef void (*gnutls_log_func)(int, const char *);
+typedef void (*gnutls_audit_log_func)(gnutls_session_t, const char *);
void gnutls_global_set_log_function(gnutls_log_func log_func);
void gnutls_global_set_audit_log_function(gnutls_audit_log_func log_func);
void gnutls_global_set_log_level(int level);
@@ -2383,10 +2322,11 @@ void gnutls_global_set_log_level(int level);
* Returns: Non zero on error.
* Since: 3.6.13
*/
-typedef int (*gnutls_keylog_func) (gnutls_session_t session,
- const char *label,
- const gnutls_datum_t *secret);
-gnutls_keylog_func gnutls_session_get_keylog_function(const gnutls_session_t session);
+typedef int (*gnutls_keylog_func)(gnutls_session_t session,
+ const char *label,
+ const gnutls_datum_t * secret);
+gnutls_keylog_func gnutls_session_get_keylog_function(const gnutls_session_t
+ session);
void gnutls_session_set_keylog_function(gnutls_session_t session,
gnutls_keylog_func func);
@@ -2397,7 +2337,8 @@ void gnutls_dh_params_deinit(gnutls_dh_params_t dh_params);
int gnutls_dh_params_import_raw(gnutls_dh_params_t dh_params,
const gnutls_datum_t * prime,
const gnutls_datum_t * generator);
-int gnutls_dh_params_import_dsa(gnutls_dh_params_t dh_params, gnutls_x509_privkey_t key);
+int gnutls_dh_params_import_dsa(gnutls_dh_params_t dh_params,
+ gnutls_x509_privkey_t key);
int gnutls_dh_params_import_raw2(gnutls_dh_params_t dh_params,
const gnutls_datum_t * prime,
const gnutls_datum_t * generator,
@@ -2409,50 +2350,45 @@ int gnutls_dh_params_import_raw3(gnutls_dh_params_t dh_params,
int gnutls_dh_params_import_pkcs3(gnutls_dh_params_t params,
const gnutls_datum_t * pkcs3_params,
gnutls_x509_crt_fmt_t format);
-int gnutls_dh_params_generate2(gnutls_dh_params_t params,
- unsigned int bits);
+int gnutls_dh_params_generate2(gnutls_dh_params_t params, unsigned int bits);
int gnutls_dh_params_export_pkcs3(gnutls_dh_params_t params,
gnutls_x509_crt_fmt_t format,
unsigned char *params_data,
- size_t * params_data_size);
+ size_t *params_data_size);
int gnutls_dh_params_export2_pkcs3(gnutls_dh_params_t params,
gnutls_x509_crt_fmt_t format,
gnutls_datum_t * out);
int gnutls_dh_params_export_raw(gnutls_dh_params_t params,
gnutls_datum_t * prime,
- gnutls_datum_t * generator,
- unsigned int *bits);
+ gnutls_datum_t * generator, unsigned int *bits);
int gnutls_dh_params_cpy(gnutls_dh_params_t dst, gnutls_dh_params_t src);
-
-
/* Session stuff
*/
/* *INDENT-OFF* */
@DEFINE_IOVEC_T@
/* *INDENT-ON* */
-typedef ssize_t(*gnutls_pull_func) (gnutls_transport_ptr_t, void *,
- size_t);
+typedef ssize_t(*gnutls_pull_func) (gnutls_transport_ptr_t, void *, size_t);
typedef ssize_t(*gnutls_push_func) (gnutls_transport_ptr_t, const void *,
size_t);
int gnutls_system_recv_timeout(gnutls_transport_ptr_t ptr, unsigned int ms);
-typedef int (*gnutls_pull_timeout_func) (gnutls_transport_ptr_t,
- unsigned int ms);
+typedef int (*gnutls_pull_timeout_func)(gnutls_transport_ptr_t,
+ unsigned int ms);
typedef ssize_t(*gnutls_vec_push_func) (gnutls_transport_ptr_t,
const giovec_t * iov, int iovcnt);
-typedef int (*gnutls_errno_func) (gnutls_transport_ptr_t);
+typedef int (*gnutls_errno_func)(gnutls_transport_ptr_t);
-#if 0
+# if 0
/* This will be defined as macro. */
- void gnutls_transport_set_int (gnutls_session_t session, int r);
-#endif
+void gnutls_transport_set_int(gnutls_session_t session, int r);
+# endif
void gnutls_transport_set_int2(gnutls_session_t session, int r, int s);
-#define gnutls_transport_set_int(s, i) gnutls_transport_set_int2(s, i, i)
+# define gnutls_transport_set_int(s, i) gnutls_transport_set_int2(s, i, i)
void gnutls_transport_get_int2(gnutls_session_t session, int *r, int *s);
int gnutls_transport_get_int(gnutls_session_t session);
@@ -2476,8 +2412,7 @@ void gnutls_transport_set_pull_function(gnutls_session_t session,
gnutls_pull_func pull_func);
void gnutls_transport_set_pull_timeout_function(gnutls_session_t session,
- gnutls_pull_timeout_func
- func);
+ gnutls_pull_timeout_func func);
void gnutls_transport_set_errno_function(gnutls_session_t session,
gnutls_errno_func errno_func);
@@ -2496,7 +2431,7 @@ void gnutls_openpgp_send_cert(gnutls_session_t session,
*/
int gnutls_fingerprint(gnutls_digest_algorithm_t algo,
const gnutls_datum_t * data, void *result,
- size_t * result_size);
+ size_t *result_size);
/**
* gnutls_random_art_t:
@@ -2513,9 +2448,11 @@ int gnutls_random_art(gnutls_random_art_t type,
void *fpr, size_t fpr_size, gnutls_datum_t * art);
/* IDNA */
-#define GNUTLS_IDNA_FORCE_2008 (1<<1)
-int gnutls_idna_map(const char * input, unsigned ilen, gnutls_datum_t *out, unsigned flags);
-int gnutls_idna_reverse_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsigned flags);
+# define GNUTLS_IDNA_FORCE_2008 (1<<1)
+int gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t * out,
+ unsigned flags);
+int gnutls_idna_reverse_map(const char *input, unsigned ilen,
+ gnutls_datum_t * out, unsigned flags);
/* SRP
*/
@@ -2525,35 +2462,29 @@ typedef struct gnutls_srp_server_credentials_st
typedef struct gnutls_srp_client_credentials_st
*gnutls_srp_client_credentials_t;
-void
-gnutls_srp_free_client_credentials(gnutls_srp_client_credentials_t sc);
+void gnutls_srp_free_client_credentials(gnutls_srp_client_credentials_t sc);
int
-gnutls_srp_allocate_client_credentials(gnutls_srp_client_credentials_t *
- sc);
+gnutls_srp_allocate_client_credentials(gnutls_srp_client_credentials_t * sc);
int gnutls_srp_set_client_credentials(gnutls_srp_client_credentials_t res,
const char *username,
const char *password);
-void
-gnutls_srp_free_server_credentials(gnutls_srp_server_credentials_t sc);
+void gnutls_srp_free_server_credentials(gnutls_srp_server_credentials_t sc);
int
-gnutls_srp_allocate_server_credentials(gnutls_srp_server_credentials_t *
- sc);
+gnutls_srp_allocate_server_credentials(gnutls_srp_server_credentials_t * sc);
int gnutls_srp_set_server_credentials_file(gnutls_srp_server_credentials_t
res, const char *password_file,
const char *password_conf_file);
const char *gnutls_srp_server_get_username(gnutls_session_t session);
-void gnutls_srp_set_prime_bits(gnutls_session_t session,
- unsigned int bits);
+void gnutls_srp_set_prime_bits(gnutls_session_t session, unsigned int bits);
int gnutls_srp_verifier(const char *username,
const char *password,
const gnutls_datum_t * salt,
const gnutls_datum_t * generator,
- const gnutls_datum_t * prime,
- gnutls_datum_t * res);
+ const gnutls_datum_t * prime, gnutls_datum_t * res);
/* The static parameters defined in draft-ietf-tls-srp-05
* Those should be used as input to gnutls_srp_verifier().
@@ -2627,17 +2558,17 @@ gnutls_srp_set_client_credentials_function(gnutls_srp_client_credentials_t
* func);
int gnutls_srp_base64_encode(const gnutls_datum_t * data, char *result,
- size_t * result_size);
+ size_t *result_size);
int gnutls_srp_base64_encode2(const gnutls_datum_t * data,
- gnutls_datum_t * result);
+ gnutls_datum_t * result);
int gnutls_srp_base64_decode(const gnutls_datum_t * b64_data, char *result,
- size_t * result_size);
+ size_t *result_size);
int gnutls_srp_base64_decode2(const gnutls_datum_t * b64_data,
- gnutls_datum_t * result);
+ gnutls_datum_t * result);
-#define gnutls_srp_base64_encode_alloc gnutls_srp_base64_encode2
-#define gnutls_srp_base64_decode_alloc gnutls_srp_base64_decode2
+# define gnutls_srp_base64_encode_alloc gnutls_srp_base64_encode2
+# define gnutls_srp_base64_decode_alloc gnutls_srp_base64_decode2
void
gnutls_srp_set_server_fake_salt_seed(gnutls_srp_server_credentials_t
@@ -2663,25 +2594,21 @@ typedef enum gnutls_psk_key_flags {
GNUTLS_PSK_KEY_HEX
} gnutls_psk_key_flags;
-void
-gnutls_psk_free_client_credentials(gnutls_psk_client_credentials_t sc);
+void gnutls_psk_free_client_credentials(gnutls_psk_client_credentials_t sc);
int
-gnutls_psk_allocate_client_credentials(gnutls_psk_client_credentials_t *
- sc);
+gnutls_psk_allocate_client_credentials(gnutls_psk_client_credentials_t * sc);
int gnutls_psk_set_client_credentials(gnutls_psk_client_credentials_t res,
const char *username,
const gnutls_datum_t * key,
gnutls_psk_key_flags flags);
int gnutls_psk_set_client_credentials2(gnutls_psk_client_credentials_t res,
- const gnutls_datum_t *username,
- const gnutls_datum_t *key,
+ const gnutls_datum_t * username,
+ const gnutls_datum_t * key,
gnutls_psk_key_flags flags);
-void
-gnutls_psk_free_server_credentials(gnutls_psk_server_credentials_t sc);
+void gnutls_psk_free_server_credentials(gnutls_psk_server_credentials_t sc);
int
-gnutls_psk_allocate_server_credentials(gnutls_psk_server_credentials_t *
- sc);
+gnutls_psk_allocate_server_credentials(gnutls_psk_server_credentials_t * sc);
int gnutls_psk_set_server_credentials_file(gnutls_psk_server_credentials_t
res, const char *password_file);
@@ -2691,46 +2618,49 @@ gnutls_psk_set_server_credentials_hint(gnutls_psk_server_credentials_t
const char *gnutls_psk_server_get_username(gnutls_session_t session);
int gnutls_psk_server_get_username2(gnutls_session_t session,
- gnutls_datum_t *out);
+ gnutls_datum_t * out);
const char *gnutls_psk_client_get_hint(gnutls_session_t session);
typedef int gnutls_psk_server_credentials_function(gnutls_session_t,
const char *username,
gnutls_datum_t * key);
typedef int gnutls_psk_server_credentials_function2(gnutls_session_t,
- const gnutls_datum_t *username,
- gnutls_datum_t *key);
-void
-gnutls_psk_set_server_credentials_function(gnutls_psk_server_credentials_t
- cred,
- gnutls_psk_server_credentials_function
- * func);
-void
-gnutls_psk_set_server_credentials_function2(gnutls_psk_server_credentials_t cred,
- gnutls_psk_server_credentials_function2 *func);
+ const gnutls_datum_t *
+ username,
+ gnutls_datum_t * key);
+void gnutls_psk_set_server_credentials_function(gnutls_psk_server_credentials_t
+ cred,
+ gnutls_psk_server_credentials_function
+ * func);
+void gnutls_psk_set_server_credentials_function2(gnutls_psk_server_credentials_t
+ cred,
+ gnutls_psk_server_credentials_function2
+ * func);
typedef int gnutls_psk_client_credentials_function(gnutls_session_t,
char **username,
gnutls_datum_t * key);
typedef int gnutls_psk_client_credentials_function2(gnutls_session_t,
- gnutls_datum_t *username,
- gnutls_datum_t *key);
+ gnutls_datum_t * username,
+ gnutls_datum_t * key);
void
gnutls_psk_set_client_credentials_function(gnutls_psk_client_credentials_t
cred,
gnutls_psk_client_credentials_function
* func);
void
-gnutls_psk_set_client_credentials_function2(gnutls_psk_client_credentials_t cred,
- gnutls_psk_client_credentials_function2 *func);
+gnutls_psk_set_client_credentials_function2(gnutls_psk_client_credentials_t
+ cred,
+ gnutls_psk_client_credentials_function2
+ * func);
int gnutls_hex_encode(const gnutls_datum_t * data, char *result,
- size_t * result_size);
+ size_t *result_size);
int gnutls_hex_decode(const gnutls_datum_t * hex_data, void *result,
- size_t * result_size);
+ size_t *result_size);
-int gnutls_hex_encode2(const gnutls_datum_t * data, gnutls_datum_t *result);
-int gnutls_hex_decode2(const gnutls_datum_t * data, gnutls_datum_t *result);
+int gnutls_hex_encode2(const gnutls_datum_t * data, gnutls_datum_t * result);
+int gnutls_hex_decode2(const gnutls_datum_t * data, gnutls_datum_t * result);
void
gnutls_psk_set_server_dh_params(gnutls_psk_server_credentials_t res,
@@ -2820,15 +2750,12 @@ typedef struct gnutls_retr2_st {
unsigned int deinit_all; /* if non zero all keys will be deinited */
} gnutls_retr2_st;
-
/* Functions that allow auth_info_t structures handling
*/
gnutls_credentials_type_t gnutls_auth_get_type(gnutls_session_t session);
-gnutls_credentials_type_t
-gnutls_auth_server_get_type(gnutls_session_t session);
-gnutls_credentials_type_t
-gnutls_auth_client_get_type(gnutls_session_t session);
+gnutls_credentials_type_t gnutls_auth_server_get_type(gnutls_session_t session);
+gnutls_credentials_type_t gnutls_auth_client_get_type(gnutls_session_t session);
/* DH */
@@ -2839,12 +2766,10 @@ int gnutls_dh_get_prime_bits(gnutls_session_t session);
int gnutls_dh_get_group(gnutls_session_t session, gnutls_datum_t * raw_gen,
gnutls_datum_t * raw_prime);
-int gnutls_dh_get_pubkey(gnutls_session_t session,
- gnutls_datum_t * raw_key);
+int gnutls_dh_get_pubkey(gnutls_session_t session, gnutls_datum_t * raw_key);
/* X509PKI */
-
/* These are set on the credentials structure.
*/
@@ -2864,7 +2789,6 @@ typedef int gnutls_certificate_retrieve_function(gnutls_session_t,
pk_algos_length,
gnutls_retr2_st *);
-
void
gnutls_certificate_set_retrieve_function(gnutls_certificate_credentials_t
cred,
@@ -2883,11 +2807,9 @@ gnutls_certificate_server_set_request(gnutls_session_t session,
/* get data from the session
*/
-const gnutls_datum_t *gnutls_certificate_get_peers(gnutls_session_t
- session, unsigned int
+const gnutls_datum_t *gnutls_certificate_get_peers(gnutls_session_t session, unsigned int
*list_size);
-const gnutls_datum_t *gnutls_certificate_get_ours(gnutls_session_t
- session);
+const gnutls_datum_t *gnutls_certificate_get_ours(gnutls_session_t session);
int gnutls_certificate_get_peers_subkey_id(gnutls_session_t session,
gnutls_datum_t * id);
@@ -2905,8 +2827,7 @@ int gnutls_certificate_verify_peers3(gnutls_session_t session,
int
gnutls_certificate_verify_peers(gnutls_session_t session,
gnutls_typed_vdata_st * data,
- unsigned int elements,
- unsigned int *status);
+ unsigned int elements, unsigned int *status);
int gnutls_certificate_verification_status_print(unsigned int status,
gnutls_certificate_type_t
@@ -2915,40 +2836,39 @@ int gnutls_certificate_verification_status_print(unsigned int status,
unsigned int flags);
int gnutls_pem_base64_encode(const char *msg, const gnutls_datum_t * data,
- char *result, size_t * result_size);
+ char *result, size_t *result_size);
int gnutls_pem_base64_decode(const char *header,
const gnutls_datum_t * b64_data,
- unsigned char *result, size_t * result_size);
+ unsigned char *result, size_t *result_size);
int gnutls_pem_base64_encode2(const char *msg,
- const gnutls_datum_t * data,
- gnutls_datum_t * result);
+ const gnutls_datum_t * data,
+ gnutls_datum_t * result);
int gnutls_pem_base64_decode2(const char *header,
- const gnutls_datum_t * b64_data,
- gnutls_datum_t * result);
+ const gnutls_datum_t * b64_data,
+ gnutls_datum_t * result);
-int gnutls_base64_encode2(const gnutls_datum_t * data,
- gnutls_datum_t * result);
+int gnutls_base64_encode2(const gnutls_datum_t * data, gnutls_datum_t * result);
int gnutls_base64_decode2(const gnutls_datum_t * b64_data,
gnutls_datum_t * result);
-#define gnutls_pem_base64_encode_alloc gnutls_pem_base64_encode2
-#define gnutls_pem_base64_decode_alloc gnutls_pem_base64_decode2
+# define gnutls_pem_base64_encode_alloc gnutls_pem_base64_encode2
+# define gnutls_pem_base64_decode_alloc gnutls_pem_base64_decode2
/* key_usage will be an OR of the following values:
*/
/* when the key is to be used for signing: */
-#define GNUTLS_KEY_DIGITAL_SIGNATURE 128
-#define GNUTLS_KEY_NON_REPUDIATION 64
+# define GNUTLS_KEY_DIGITAL_SIGNATURE 128
+# define GNUTLS_KEY_NON_REPUDIATION 64
/* when the key is to be used for encryption: */
-#define GNUTLS_KEY_KEY_ENCIPHERMENT 32
-#define GNUTLS_KEY_DATA_ENCIPHERMENT 16
-#define GNUTLS_KEY_KEY_AGREEMENT 8
-#define GNUTLS_KEY_KEY_CERT_SIGN 4
-#define GNUTLS_KEY_CRL_SIGN 2
-#define GNUTLS_KEY_ENCIPHER_ONLY 1
-#define GNUTLS_KEY_DECIPHER_ONLY 32768
+# define GNUTLS_KEY_KEY_ENCIPHERMENT 32
+# define GNUTLS_KEY_DATA_ENCIPHERMENT 16
+# define GNUTLS_KEY_KEY_AGREEMENT 8
+# define GNUTLS_KEY_KEY_CERT_SIGN 4
+# define GNUTLS_KEY_CRL_SIGN 2
+# define GNUTLS_KEY_ENCIPHER_ONLY 1
+# define GNUTLS_KEY_DECIPHER_ONLY 32768
void
gnutls_certificate_set_params_function(gnutls_certificate_credentials_t
@@ -2959,41 +2879,38 @@ void gnutls_psk_set_params_function(gnutls_psk_server_credentials_t res,
gnutls_params_function * func);
int gnutls_hex2bin(const char *hex_data, size_t hex_size,
- void *bin_data, size_t * bin_size);
+ void *bin_data, size_t *bin_size);
/* Trust on first use (or ssh like) functions */
/* stores the provided information to a database
*/
-typedef int (*gnutls_tdb_store_func) (const char *db_name,
- const char *host,
- const char *service,
- time_t expiration,
- const gnutls_datum_t * pubkey);
-
-typedef int (*gnutls_tdb_store_commitment_func) (const char *db_name,
- const char *host,
- const char *service,
- time_t expiration,
- gnutls_digest_algorithm_t
- hash_algo,
- const gnutls_datum_t *
- hash);
+typedef int (*gnutls_tdb_store_func)(const char *db_name,
+ const char *host,
+ const char *service,
+ time_t expiration,
+ const gnutls_datum_t * pubkey);
+
+typedef int (*gnutls_tdb_store_commitment_func)(const char *db_name,
+ const char *host,
+ const char *service,
+ time_t expiration,
+ gnutls_digest_algorithm_t
+ hash_algo,
+ const gnutls_datum_t * hash);
/* searches for the provided host/service pair that match the
* provided public key in the database. */
-typedef int (*gnutls_tdb_verify_func) (const char *db_name,
- const char *host,
- const char *service,
- const gnutls_datum_t * pubkey);
-
+typedef int (*gnutls_tdb_verify_func)(const char *db_name,
+ const char *host,
+ const char *service,
+ const gnutls_datum_t * pubkey);
struct gnutls_tdb_int;
typedef struct gnutls_tdb_int *gnutls_tdb_t;
int gnutls_tdb_init(gnutls_tdb_t * tdb);
-void gnutls_tdb_set_store_func(gnutls_tdb_t tdb,
- gnutls_tdb_store_func store);
+void gnutls_tdb_set_store_func(gnutls_tdb_t tdb, gnutls_tdb_store_func store);
void gnutls_tdb_set_store_commitment_func(gnutls_tdb_t tdb,
gnutls_tdb_store_commitment_func
cstore);
@@ -3009,7 +2926,7 @@ int gnutls_verify_stored_pubkey(const char *db_name,
const gnutls_datum_t * cert,
unsigned int flags);
-#define GNUTLS_SCOMMIT_FLAG_ALLOW_BROKEN 1
+# define GNUTLS_SCOMMIT_FLAG_ALLOW_BROKEN 1
int gnutls_store_commitment(const char *db_name,
gnutls_tdb_t tdb,
const char *host,
@@ -3053,12 +2970,12 @@ typedef enum {
GNUTLS_PIN_WRONG = (1 << 5)
} gnutls_pin_flag_t;
-#define GNUTLS_PKCS11_PIN_USER GNUTLS_PIN_USER
-#define GNUTLS_PKCS11_PIN_SO GNUTLS_PIN_SO
-#define GNUTLS_PKCS11_PIN_FINAL_TRY GNUTLS_PIN_FINAL_TRY
-#define GNUTLS_PKCS11_PIN_COUNT_LOW GNUTLS_PIN_COUNT_LOW
-#define GNUTLS_PKCS11_PIN_CONTEXT_SPECIFIC GNUTLS_PIN_CONTEXT_SPECIFIC
-#define GNUTLS_PKCS11_PIN_WRONG GNUTLS_PIN_WRONG
+# define GNUTLS_PKCS11_PIN_USER GNUTLS_PIN_USER
+# define GNUTLS_PKCS11_PIN_SO GNUTLS_PIN_SO
+# define GNUTLS_PKCS11_PIN_FINAL_TRY GNUTLS_PIN_FINAL_TRY
+# define GNUTLS_PKCS11_PIN_COUNT_LOW GNUTLS_PIN_COUNT_LOW
+# define GNUTLS_PKCS11_PIN_CONTEXT_SPECIFIC GNUTLS_PIN_CONTEXT_SPECIFIC
+# define GNUTLS_PKCS11_PIN_WRONG GNUTLS_PIN_WRONG
/**
* gnutls_pin_callback_t:
@@ -3093,11 +3010,11 @@ typedef enum {
*
* Since: 2.12.0
**/
-typedef int (*gnutls_pin_callback_t) (void *userdata, int attempt,
- const char *token_url,
- const char *token_label,
- unsigned int flags,
- char *pin, size_t pin_max);
+typedef int (*gnutls_pin_callback_t)(void *userdata, int attempt,
+ const char *token_url,
+ const char *token_label,
+ unsigned int flags,
+ char *pin, size_t pin_max);
void gnutls_certificate_set_pin_function(gnutls_certificate_credentials_t,
gnutls_pin_callback_t fn,
@@ -3106,11 +3023,13 @@ void gnutls_certificate_set_pin_function(gnutls_certificate_credentials_t,
/* Public string related functions */
typedef struct gnutls_buffer_st *gnutls_buffer_t;
-int gnutls_buffer_append_data(gnutls_buffer_t, const void *data, size_t data_size);
+int gnutls_buffer_append_data(gnutls_buffer_t, const void *data,
+ size_t data_size);
-#define GNUTLS_UTF8_IGNORE_ERRS 1
-int gnutls_utf8_password_normalize(const unsigned char *password, unsigned password_len,
- gnutls_datum_t *out, unsigned flags);
+# define GNUTLS_UTF8_IGNORE_ERRS 1
+int gnutls_utf8_password_normalize(const unsigned char *password,
+ unsigned password_len, gnutls_datum_t * out,
+ unsigned flags);
/* Public extensions related functions */
@@ -3123,26 +3042,27 @@ int gnutls_ext_get_data(gnutls_session_t session, unsigned type,
unsigned gnutls_ext_get_current_msg(gnutls_session_t session);
-typedef int (*gnutls_ext_recv_func) (gnutls_session_t session,
- const unsigned char *data,
- size_t len);
+typedef int (*gnutls_ext_recv_func)(gnutls_session_t session,
+ const unsigned char *data, size_t len);
-typedef int (*gnutls_ext_send_func) (gnutls_session_t session,
- gnutls_buffer_t extdata);
+typedef int (*gnutls_ext_send_func)(gnutls_session_t session,
+ gnutls_buffer_t extdata);
-typedef void (*gnutls_ext_deinit_data_func) (gnutls_ext_priv_data_t data);
+typedef void (*gnutls_ext_deinit_data_func)(gnutls_ext_priv_data_t data);
-typedef int (*gnutls_ext_pack_func) (gnutls_ext_priv_data_t data,
- gnutls_buffer_t packed_data);
+typedef int (*gnutls_ext_pack_func)(gnutls_ext_priv_data_t data,
+ gnutls_buffer_t packed_data);
-typedef int (*gnutls_ext_unpack_func) (gnutls_buffer_t packed_data,
- gnutls_ext_priv_data_t *data);
+typedef int (*gnutls_ext_unpack_func)(gnutls_buffer_t packed_data,
+ gnutls_ext_priv_data_t * data);
-#define GNUTLS_EXT_RAW_FLAG_TLS_CLIENT_HELLO 1
-#define GNUTLS_EXT_RAW_FLAG_DTLS_CLIENT_HELLO (1<<1)
-typedef int (*gnutls_ext_raw_process_func)(void *ctx, unsigned tls_id, const unsigned char *data, unsigned data_size);
+# define GNUTLS_EXT_RAW_FLAG_TLS_CLIENT_HELLO 1
+# define GNUTLS_EXT_RAW_FLAG_DTLS_CLIENT_HELLO (1<<1)
+typedef int (*gnutls_ext_raw_process_func)(void *ctx, unsigned tls_id,
+ const unsigned char *data,
+ unsigned data_size);
int gnutls_ext_raw_parse(void *ctx, gnutls_ext_raw_process_func cb,
- const gnutls_datum_t *data, unsigned int flags);
+ const gnutls_datum_t * data, unsigned int flags);
/**
* gnutls_ext_parse_type_t:
@@ -3158,12 +3078,12 @@ int gnutls_ext_raw_parse(void *ctx, gnutls_ext_raw_process_func cb,
*
*/
typedef enum {
- GNUTLS_EXT_ANY = 0,
- GNUTLS_EXT_APPLICATION = 1,
- GNUTLS_EXT_TLS = 2,
- GNUTLS_EXT_MANDATORY = 3,
- GNUTLS_EXT_NONE = 4,
- GNUTLS_EXT_VERSION_NEG = 5
+ GNUTLS_EXT_ANY = 0,
+ GNUTLS_EXT_APPLICATION = 1,
+ GNUTLS_EXT_TLS = 2,
+ GNUTLS_EXT_MANDATORY = 3,
+ GNUTLS_EXT_NONE = 4,
+ GNUTLS_EXT_VERSION_NEG = 5
} gnutls_ext_parse_type_t;
/**
@@ -3181,28 +3101,35 @@ typedef enum {
* Enumeration of different TLS extension registration flags.
*/
typedef enum {
- GNUTLS_EXT_FLAG_OVERRIDE_INTERNAL = 1,
- GNUTLS_EXT_FLAG_CLIENT_HELLO = (1<<1),
- GNUTLS_EXT_FLAG_TLS12_SERVER_HELLO = (1<<2),
- GNUTLS_EXT_FLAG_TLS13_SERVER_HELLO = (1<<3),
- GNUTLS_EXT_FLAG_EE = (1<<4), /* ENCRYPTED */
- GNUTLS_EXT_FLAG_HRR = (1<<5),
- GNUTLS_EXT_FLAG_IGNORE_CLIENT_REQUEST = (1<<6),
- GNUTLS_EXT_FLAG_TLS = (1<<7),
- GNUTLS_EXT_FLAG_DTLS = (1<<8)
+ GNUTLS_EXT_FLAG_OVERRIDE_INTERNAL = 1,
+ GNUTLS_EXT_FLAG_CLIENT_HELLO = (1 << 1),
+ GNUTLS_EXT_FLAG_TLS12_SERVER_HELLO = (1 << 2),
+ GNUTLS_EXT_FLAG_TLS13_SERVER_HELLO = (1 << 3),
+ GNUTLS_EXT_FLAG_EE = (1 << 4), /* ENCRYPTED */
+ GNUTLS_EXT_FLAG_HRR = (1 << 5),
+ GNUTLS_EXT_FLAG_IGNORE_CLIENT_REQUEST = (1 << 6),
+ GNUTLS_EXT_FLAG_TLS = (1 << 7),
+ GNUTLS_EXT_FLAG_DTLS = (1 << 8)
} gnutls_ext_flags_t;
/* Register a custom tls extension
*/
-int gnutls_ext_register(const char *name, int type, gnutls_ext_parse_type_t parse_point,
- gnutls_ext_recv_func recv_func, gnutls_ext_send_func send_func,
- gnutls_ext_deinit_data_func deinit_func, gnutls_ext_pack_func pack_func,
- gnutls_ext_unpack_func unpack_func);
-
-int gnutls_session_ext_register(gnutls_session_t, const char *name, int type, gnutls_ext_parse_type_t parse_point,
- gnutls_ext_recv_func recv_func, gnutls_ext_send_func send_func,
- gnutls_ext_deinit_data_func deinit_func, gnutls_ext_pack_func pack_func,
- gnutls_ext_unpack_func unpack_func, unsigned flags);
+int gnutls_ext_register(const char *name, int type,
+ gnutls_ext_parse_type_t parse_point,
+ gnutls_ext_recv_func recv_func,
+ gnutls_ext_send_func send_func,
+ gnutls_ext_deinit_data_func deinit_func,
+ gnutls_ext_pack_func pack_func,
+ gnutls_ext_unpack_func unpack_func);
+
+int gnutls_session_ext_register(gnutls_session_t, const char *name, int type,
+ gnutls_ext_parse_type_t parse_point,
+ gnutls_ext_recv_func recv_func,
+ gnutls_ext_send_func send_func,
+ gnutls_ext_deinit_data_func deinit_func,
+ gnutls_ext_pack_func pack_func,
+ gnutls_ext_unpack_func unpack_func,
+ unsigned flags);
const char *gnutls_ext_get_name(unsigned int ext);
const char *gnutls_ext_get_name2(gnutls_session_t session, unsigned int tls_id,
@@ -3210,46 +3137,51 @@ const char *gnutls_ext_get_name2(gnutls_session_t session, unsigned int tls_id,
/* Public supplemental data related functions */
-typedef int (*gnutls_supp_recv_func) (gnutls_session_t session,
- const unsigned char * data, size_t data_size);
-typedef int (*gnutls_supp_send_func) (gnutls_session_t session,
- gnutls_buffer_t buf);
+typedef int (*gnutls_supp_recv_func)(gnutls_session_t session,
+ const unsigned char *data,
+ size_t data_size);
+typedef int (*gnutls_supp_send_func)(gnutls_session_t session,
+ gnutls_buffer_t buf);
int gnutls_supplemental_register(const char *name,
- gnutls_supplemental_data_format_type_t type,
- gnutls_supp_recv_func supp_recv_func,
- gnutls_supp_send_func supp_send_func);
-
-int gnutls_session_supplemental_register(gnutls_session_t session, const char *name,
- gnutls_supplemental_data_format_type_t type,
- gnutls_supp_recv_func supp_recv_func,
- gnutls_supp_send_func supp_send_func,
- unsigned int flags);
+ gnutls_supplemental_data_format_type_t type,
+ gnutls_supp_recv_func supp_recv_func,
+ gnutls_supp_send_func supp_send_func);
+
+int gnutls_session_supplemental_register(gnutls_session_t session,
+ const char *name,
+ gnutls_supplemental_data_format_type_t
+ type,
+ gnutls_supp_recv_func supp_recv_func,
+ gnutls_supp_send_func supp_send_func,
+ unsigned int flags);
-void gnutls_supplemental_recv(gnutls_session_t session, unsigned do_recv_supplemental);
+void gnutls_supplemental_recv(gnutls_session_t session,
+ unsigned do_recv_supplemental);
-void gnutls_supplemental_send(gnutls_session_t session, unsigned do_send_supplemental);
+void gnutls_supplemental_send(gnutls_session_t session,
+ unsigned do_send_supplemental);
/* Anti-replay related functions */
typedef struct gnutls_anti_replay_st *gnutls_anti_replay_t;
-int gnutls_anti_replay_init(gnutls_anti_replay_t *anti_replay);
+int gnutls_anti_replay_init(gnutls_anti_replay_t * anti_replay);
void gnutls_anti_replay_deinit(gnutls_anti_replay_t anti_replay);
void gnutls_anti_replay_set_window(gnutls_anti_replay_t anti_replay,
unsigned int window);
void gnutls_anti_replay_enable(gnutls_session_t session,
gnutls_anti_replay_t anti_replay);
-typedef int (*gnutls_db_add_func) (void *, time_t exp_time, const gnutls_datum_t *key,
- const gnutls_datum_t *data);
+typedef int (*gnutls_db_add_func)(void *, time_t exp_time,
+ const gnutls_datum_t * key,
+ const gnutls_datum_t * data);
void gnutls_anti_replay_set_add_function(gnutls_anti_replay_t,
gnutls_db_add_func add_func);
void gnutls_anti_replay_set_ptr(gnutls_anti_replay_t, void *ptr);
-
/**
* gnutls_record_encryption_level_t:
* @GNUTLS_ENCRYPTION_LEVEL_INITIAL: initial level that doesn't involve any
@@ -3285,10 +3217,11 @@ typedef enum {
* Returns: Non zero on error.
* Since: 3.7.0
*/
-typedef int (*gnutls_handshake_read_func) (gnutls_session_t session,
- gnutls_record_encryption_level_t level,
- gnutls_handshake_description_t htype,
- const void *data, size_t data_size);
+typedef int (*gnutls_handshake_read_func)(gnutls_session_t session,
+ gnutls_record_encryption_level_t
+ level,
+ gnutls_handshake_description_t htype,
+ const void *data, size_t data_size);
void
gnutls_handshake_set_read_function(gnutls_session_t session,
@@ -3313,11 +3246,11 @@ gnutls_handshake_write(gnutls_session_t session,
* Returns: Non zero on error.
* Since: 3.7.0
*/
-typedef int (*gnutls_handshake_secret_func) (gnutls_session_t session,
- gnutls_record_encryption_level_t level,
- const void *secret_read,
- const void *secret_write,
- size_t secret_size);
+typedef int (*gnutls_handshake_secret_func)(gnutls_session_t session,
+ gnutls_record_encryption_level_t
+ level, const void *secret_read,
+ const void *secret_write,
+ size_t secret_size);
void
gnutls_handshake_set_secret_function(gnutls_session_t session,
@@ -3336,10 +3269,10 @@ gnutls_handshake_set_secret_function(gnutls_session_t session,
* Returns: Non zero on error.
* Since: 3.7.0
*/
-typedef int (*gnutls_alert_read_func) (gnutls_session_t session,
- gnutls_record_encryption_level_t level,
- gnutls_alert_level_t alert_level,
- gnutls_alert_description_t alert_desc);
+typedef int (*gnutls_alert_read_func)(gnutls_session_t session,
+ gnutls_record_encryption_level_t level,
+ gnutls_alert_level_t alert_level,
+ gnutls_alert_description_t alert_desc);
void
gnutls_alert_set_read_function(gnutls_session_t session,
@@ -3365,30 +3298,30 @@ unsigned gnutls_fips140_mode_enabled(void);
* Enumeration of different operational modes under FIPS140-2.
*/
typedef enum gnutls_fips_mode_t {
- GNUTLS_FIPS140_DISABLED = 0,
- GNUTLS_FIPS140_STRICT = 1,
- GNUTLS_FIPS140_SELFTESTS = 2,
- GNUTLS_FIPS140_LAX = 3,
- GNUTLS_FIPS140_LOG = 4
+ GNUTLS_FIPS140_DISABLED = 0,
+ GNUTLS_FIPS140_STRICT = 1,
+ GNUTLS_FIPS140_SELFTESTS = 2,
+ GNUTLS_FIPS140_LAX = 3,
+ GNUTLS_FIPS140_LOG = 4
} gnutls_fips_mode_t;
-#define GNUTLS_FIPS140_SET_MODE_THREAD 1
+# define GNUTLS_FIPS140_SET_MODE_THREAD 1
void gnutls_fips140_set_mode(gnutls_fips_mode_t mode, unsigned flags);
-#define GNUTLS_FIPS140_SET_LAX_MODE() do { \
+# define GNUTLS_FIPS140_SET_LAX_MODE() do { \
if (gnutls_fips140_mode_enabled()) \
gnutls_fips140_set_mode(GNUTLS_FIPS140_LAX, GNUTLS_FIPS140_SET_MODE_THREAD); \
} while(0)
-#define GNUTLS_FIPS140_SET_STRICT_MODE() do { \
+# define GNUTLS_FIPS140_SET_STRICT_MODE() do { \
if (gnutls_fips140_mode_enabled()) \
gnutls_fips140_set_mode(GNUTLS_FIPS140_STRICT, GNUTLS_FIPS140_SET_MODE_THREAD); \
} while(0)
typedef struct gnutls_fips140_context_st *gnutls_fips140_context_t;
-int gnutls_fips140_context_init(gnutls_fips140_context_t *context);
+int gnutls_fips140_context_init(gnutls_fips140_context_t * context);
void gnutls_fips140_context_deinit(gnutls_fips140_context_t context);
/**
@@ -3413,10 +3346,10 @@ void gnutls_fips140_context_deinit(gnutls_fips140_context_t context);
* Since: 3.7.3
*/
typedef enum {
- GNUTLS_FIPS140_OP_INITIAL,
- GNUTLS_FIPS140_OP_APPROVED,
- GNUTLS_FIPS140_OP_NOT_APPROVED,
- GNUTLS_FIPS140_OP_ERROR
+ GNUTLS_FIPS140_OP_INITIAL,
+ GNUTLS_FIPS140_OP_APPROVED,
+ GNUTLS_FIPS140_OP_NOT_APPROVED,
+ GNUTLS_FIPS140_OP_ERROR
} gnutls_fips140_operation_state_t;
gnutls_fips140_operation_state_t
@@ -3444,7 +3377,6 @@ typedef enum {
GNUTLS_KTLS_DUPLEX = GNUTLS_KTLS_RECV | GNUTLS_KTLS_SEND,
} gnutls_transport_ktls_enable_flags_t;
-
gnutls_transport_ktls_enable_flags_t
gnutls_transport_is_ktls_enabled(gnutls_session_t session);
@@ -3452,254 +3384,255 @@ gnutls_transport_is_ktls_enabled(gnutls_session_t session);
* comments.
*/
-#define GNUTLS_E_SUCCESS 0
-#define GNUTLS_E_UNKNOWN_COMPRESSION_ALGORITHM -3
-#define GNUTLS_E_UNKNOWN_CIPHER_TYPE -6
-#define GNUTLS_E_LARGE_PACKET -7
-#define GNUTLS_E_UNSUPPORTED_VERSION_PACKET -8 /* GNUTLS_A_PROTOCOL_VERSION */
-#define GNUTLS_E_TLS_PACKET_DECODING_ERROR GNUTLS_E_UNEXPECTED_PACKET_LENGTH
-#define GNUTLS_E_UNEXPECTED_PACKET_LENGTH -9 /* GNUTLS_A_DECODE_ERROR */
-#define GNUTLS_E_INVALID_SESSION -10
-#define GNUTLS_E_FATAL_ALERT_RECEIVED -12
-#define GNUTLS_E_UNEXPECTED_PACKET -15 /* GNUTLS_A_UNEXPECTED_MESSAGE */
-#define GNUTLS_E_WARNING_ALERT_RECEIVED -16
-#define GNUTLS_E_ERROR_IN_FINISHED_PACKET -18
-#define GNUTLS_E_UNEXPECTED_HANDSHAKE_PACKET -19
-#define GNUTLS_E_UNKNOWN_CIPHER_SUITE -21 /* GNUTLS_A_HANDSHAKE_FAILURE */
-#define GNUTLS_E_UNWANTED_ALGORITHM -22
-#define GNUTLS_E_MPI_SCAN_FAILED -23
-#define GNUTLS_E_DECRYPTION_FAILED -24 /* GNUTLS_A_DECRYPTION_FAILED, GNUTLS_A_BAD_RECORD_MAC */
-#define GNUTLS_E_MEMORY_ERROR -25
-#define GNUTLS_E_DECOMPRESSION_FAILED -26 /* GNUTLS_A_DECOMPRESSION_FAILURE */
-#define GNUTLS_E_COMPRESSION_FAILED -27
-#define GNUTLS_E_AGAIN -28
-#define GNUTLS_E_EXPIRED -29
-#define GNUTLS_E_DB_ERROR -30
-#define GNUTLS_E_SRP_PWD_ERROR GNUTLS_E_KEYFILE_ERROR
-#define GNUTLS_E_KEYFILE_ERROR -31
-#define GNUTLS_E_INSUFFICIENT_CREDENTIALS -32
-#define GNUTLS_E_INSUFICIENT_CREDENTIALS GNUTLS_E_INSUFFICIENT_CREDENTIALS /* for backwards compatibility only */
-#define GNUTLS_E_INSUFFICIENT_CRED GNUTLS_E_INSUFFICIENT_CREDENTIALS
-#define GNUTLS_E_INSUFICIENT_CRED GNUTLS_E_INSUFFICIENT_CREDENTIALS /* for backwards compatibility only */
-
-#define GNUTLS_E_HASH_FAILED -33
-#define GNUTLS_E_BASE64_DECODING_ERROR -34
-
-#define GNUTLS_E_MPI_PRINT_FAILED -35
-#define GNUTLS_E_REHANDSHAKE -37 /* GNUTLS_A_NO_RENEGOTIATION */
-#define GNUTLS_E_GOT_APPLICATION_DATA -38
-#define GNUTLS_E_RECORD_LIMIT_REACHED -39
-#define GNUTLS_E_ENCRYPTION_FAILED -40
-
-#define GNUTLS_E_PK_ENCRYPTION_FAILED -44
-#define GNUTLS_E_PK_DECRYPTION_FAILED -45
-#define GNUTLS_E_PK_SIGN_FAILED -46
-#define GNUTLS_E_X509_UNSUPPORTED_CRITICAL_EXTENSION -47
-#define GNUTLS_E_KEY_USAGE_VIOLATION -48
-#define GNUTLS_E_NO_CERTIFICATE_FOUND -49 /* GNUTLS_A_BAD_CERTIFICATE */
-#define GNUTLS_E_INVALID_REQUEST -50
-#define GNUTLS_E_SHORT_MEMORY_BUFFER -51
-#define GNUTLS_E_INTERRUPTED -52
-#define GNUTLS_E_PUSH_ERROR -53
-#define GNUTLS_E_PULL_ERROR -54
-#define GNUTLS_E_RECEIVED_ILLEGAL_PARAMETER -55 /* GNUTLS_A_ILLEGAL_PARAMETER */
-#define GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE -56
-#define GNUTLS_E_PKCS1_WRONG_PAD -57
-#define GNUTLS_E_RECEIVED_ILLEGAL_EXTENSION -58
-#define GNUTLS_E_INTERNAL_ERROR -59
-#define GNUTLS_E_DH_PRIME_UNACCEPTABLE -63
-#define GNUTLS_E_FILE_ERROR -64
-#define GNUTLS_E_TOO_MANY_EMPTY_PACKETS -78
-#define GNUTLS_E_UNKNOWN_PK_ALGORITHM -80
-#define GNUTLS_E_TOO_MANY_HANDSHAKE_PACKETS -81
-#define GNUTLS_E_RECEIVED_DISALLOWED_NAME -82 /* GNUTLS_A_ILLEGAL_PARAMETER */
-#define GNUTLS_E_CERTIFICATE_REQUIRED -112 /* GNUTLS_A_CERTIFICATE_REQUIRED */
+# define GNUTLS_E_SUCCESS 0
+# define GNUTLS_E_UNKNOWN_COMPRESSION_ALGORITHM -3
+# define GNUTLS_E_UNKNOWN_CIPHER_TYPE -6
+# define GNUTLS_E_LARGE_PACKET -7
+# define GNUTLS_E_UNSUPPORTED_VERSION_PACKET -8 /* GNUTLS_A_PROTOCOL_VERSION */
+# define GNUTLS_E_TLS_PACKET_DECODING_ERROR GNUTLS_E_UNEXPECTED_PACKET_LENGTH
+# define GNUTLS_E_UNEXPECTED_PACKET_LENGTH -9 /* GNUTLS_A_DECODE_ERROR */
+# define GNUTLS_E_INVALID_SESSION -10
+# define GNUTLS_E_FATAL_ALERT_RECEIVED -12
+# define GNUTLS_E_UNEXPECTED_PACKET -15 /* GNUTLS_A_UNEXPECTED_MESSAGE */
+# define GNUTLS_E_WARNING_ALERT_RECEIVED -16
+# define GNUTLS_E_ERROR_IN_FINISHED_PACKET -18
+# define GNUTLS_E_UNEXPECTED_HANDSHAKE_PACKET -19
+# define GNUTLS_E_UNKNOWN_CIPHER_SUITE -21
+ /* GNUTLS_A_HANDSHAKE_FAILURE */
+# define GNUTLS_E_UNWANTED_ALGORITHM -22
+# define GNUTLS_E_MPI_SCAN_FAILED -23
+# define GNUTLS_E_DECRYPTION_FAILED -24 /* GNUTLS_A_DECRYPTION_FAILED, GNUTLS_A_BAD_RECORD_MAC */
+# define GNUTLS_E_MEMORY_ERROR -25
+# define GNUTLS_E_DECOMPRESSION_FAILED -26 /* GNUTLS_A_DECOMPRESSION_FAILURE */
+# define GNUTLS_E_COMPRESSION_FAILED -27
+# define GNUTLS_E_AGAIN -28
+# define GNUTLS_E_EXPIRED -29
+# define GNUTLS_E_DB_ERROR -30
+# define GNUTLS_E_SRP_PWD_ERROR GNUTLS_E_KEYFILE_ERROR
+# define GNUTLS_E_KEYFILE_ERROR -31
+# define GNUTLS_E_INSUFFICIENT_CREDENTIALS -32
+# define GNUTLS_E_INSUFICIENT_CREDENTIALS GNUTLS_E_INSUFFICIENT_CREDENTIALS /* for backwards compatibility only */
+# define GNUTLS_E_INSUFFICIENT_CRED GNUTLS_E_INSUFFICIENT_CREDENTIALS
+# define GNUTLS_E_INSUFICIENT_CRED GNUTLS_E_INSUFFICIENT_CREDENTIALS /* for backwards compatibility only */
+
+# define GNUTLS_E_HASH_FAILED -33
+# define GNUTLS_E_BASE64_DECODING_ERROR -34
+
+# define GNUTLS_E_MPI_PRINT_FAILED -35
+# define GNUTLS_E_REHANDSHAKE -37 /* GNUTLS_A_NO_RENEGOTIATION */
+# define GNUTLS_E_GOT_APPLICATION_DATA -38
+# define GNUTLS_E_RECORD_LIMIT_REACHED -39
+# define GNUTLS_E_ENCRYPTION_FAILED -40
+
+# define GNUTLS_E_PK_ENCRYPTION_FAILED -44
+# define GNUTLS_E_PK_DECRYPTION_FAILED -45
+# define GNUTLS_E_PK_SIGN_FAILED -46
+# define GNUTLS_E_X509_UNSUPPORTED_CRITICAL_EXTENSION -47
+# define GNUTLS_E_KEY_USAGE_VIOLATION -48
+# define GNUTLS_E_NO_CERTIFICATE_FOUND -49 /* GNUTLS_A_BAD_CERTIFICATE */
+# define GNUTLS_E_INVALID_REQUEST -50
+# define GNUTLS_E_SHORT_MEMORY_BUFFER -51
+# define GNUTLS_E_INTERRUPTED -52
+# define GNUTLS_E_PUSH_ERROR -53
+# define GNUTLS_E_PULL_ERROR -54
+# define GNUTLS_E_RECEIVED_ILLEGAL_PARAMETER -55/* GNUTLS_A_ILLEGAL_PARAMETER */
+# define GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE -56
+# define GNUTLS_E_PKCS1_WRONG_PAD -57
+# define GNUTLS_E_RECEIVED_ILLEGAL_EXTENSION -58
+# define GNUTLS_E_INTERNAL_ERROR -59
+# define GNUTLS_E_DH_PRIME_UNACCEPTABLE -63
+# define GNUTLS_E_FILE_ERROR -64
+# define GNUTLS_E_TOO_MANY_EMPTY_PACKETS -78
+# define GNUTLS_E_UNKNOWN_PK_ALGORITHM -80
+# define GNUTLS_E_TOO_MANY_HANDSHAKE_PACKETS -81
+# define GNUTLS_E_RECEIVED_DISALLOWED_NAME -82 /* GNUTLS_A_ILLEGAL_PARAMETER */
+# define GNUTLS_E_CERTIFICATE_REQUIRED -112 /* GNUTLS_A_CERTIFICATE_REQUIRED */
/* returned if you need to generate temporary RSA
* parameters. These are needed for export cipher suites.
*/
-#define GNUTLS_E_NO_TEMPORARY_RSA_PARAMS -84
+# define GNUTLS_E_NO_TEMPORARY_RSA_PARAMS -84
-#define GNUTLS_E_NO_COMPRESSION_ALGORITHMS -86
-#define GNUTLS_E_NO_CIPHER_SUITES -87
+# define GNUTLS_E_NO_COMPRESSION_ALGORITHMS -86
+# define GNUTLS_E_NO_CIPHER_SUITES -87
-#define GNUTLS_E_OPENPGP_GETKEY_FAILED -88
-#define GNUTLS_E_PK_SIG_VERIFY_FAILED -89
+# define GNUTLS_E_OPENPGP_GETKEY_FAILED -88
+# define GNUTLS_E_PK_SIG_VERIFY_FAILED -89
-#define GNUTLS_E_ILLEGAL_SRP_USERNAME -90
-#define GNUTLS_E_SRP_PWD_PARSING_ERROR GNUTLS_E_KEYFILE_PARSING_ERROR
-#define GNUTLS_E_KEYFILE_PARSING_ERROR -91
-#define GNUTLS_E_NO_TEMPORARY_DH_PARAMS -93
+# define GNUTLS_E_ILLEGAL_SRP_USERNAME -90
+# define GNUTLS_E_SRP_PWD_PARSING_ERROR GNUTLS_E_KEYFILE_PARSING_ERROR
+# define GNUTLS_E_KEYFILE_PARSING_ERROR -91
+# define GNUTLS_E_NO_TEMPORARY_DH_PARAMS -93
/* For certificate and key stuff
*/
-#define GNUTLS_E_ASN1_ELEMENT_NOT_FOUND -67
-#define GNUTLS_E_ASN1_IDENTIFIER_NOT_FOUND -68
-#define GNUTLS_E_ASN1_DER_ERROR -69
-#define GNUTLS_E_ASN1_VALUE_NOT_FOUND -70
-#define GNUTLS_E_ASN1_GENERIC_ERROR -71
-#define GNUTLS_E_ASN1_VALUE_NOT_VALID -72
-#define GNUTLS_E_ASN1_TAG_ERROR -73
-#define GNUTLS_E_ASN1_TAG_IMPLICIT -74
-#define GNUTLS_E_ASN1_TYPE_ANY_ERROR -75
-#define GNUTLS_E_ASN1_SYNTAX_ERROR -76
-#define GNUTLS_E_ASN1_DER_OVERFLOW -77
-#define GNUTLS_E_OPENPGP_UID_REVOKED -79
-#define GNUTLS_E_CERTIFICATE_ERROR -43
-#define GNUTLS_E_X509_CERTIFICATE_ERROR GNUTLS_E_CERTIFICATE_ERROR
-#define GNUTLS_E_CERTIFICATE_KEY_MISMATCH -60
-#define GNUTLS_E_UNSUPPORTED_CERTIFICATE_TYPE -61 /* GNUTLS_A_UNSUPPORTED_CERTIFICATE */
-#define GNUTLS_E_X509_UNKNOWN_SAN -62
-#define GNUTLS_E_OPENPGP_FINGERPRINT_UNSUPPORTED -94
-#define GNUTLS_E_X509_UNSUPPORTED_ATTRIBUTE -95
-#define GNUTLS_E_UNKNOWN_HASH_ALGORITHM -96
-#define GNUTLS_E_UNKNOWN_PKCS_CONTENT_TYPE -97
-#define GNUTLS_E_UNKNOWN_PKCS_BAG_TYPE -98
-#define GNUTLS_E_INVALID_PASSWORD -99
-#define GNUTLS_E_MAC_VERIFY_FAILED -100 /* for PKCS #12 MAC */
-#define GNUTLS_E_CONSTRAINT_ERROR -101
-
-#define GNUTLS_E_WARNING_IA_IPHF_RECEIVED -102
-#define GNUTLS_E_WARNING_IA_FPHF_RECEIVED -103
-
-#define GNUTLS_E_IA_VERIFY_FAILED -104
-#define GNUTLS_E_UNKNOWN_ALGORITHM -105
-#define GNUTLS_E_UNSUPPORTED_SIGNATURE_ALGORITHM -106
-#define GNUTLS_E_SAFE_RENEGOTIATION_FAILED -107
-#define GNUTLS_E_UNSAFE_RENEGOTIATION_DENIED -108
-#define GNUTLS_E_UNKNOWN_SRP_USERNAME -109
-#define GNUTLS_E_PREMATURE_TERMINATION -110
-
-#define GNUTLS_E_MALFORMED_CIDR -111
-
-#define GNUTLS_E_BASE64_ENCODING_ERROR -201
-#define GNUTLS_E_INCOMPATIBLE_GCRYPT_LIBRARY -202 /* obsolete */
-#define GNUTLS_E_INCOMPATIBLE_CRYPTO_LIBRARY -202
-#define GNUTLS_E_INCOMPATIBLE_LIBTASN1_LIBRARY -203
-
-#define GNUTLS_E_OPENPGP_KEYRING_ERROR -204
-#define GNUTLS_E_X509_UNSUPPORTED_OID -205
-
-#define GNUTLS_E_RANDOM_FAILED -206
-#define GNUTLS_E_BASE64_UNEXPECTED_HEADER_ERROR -207
-
-#define GNUTLS_E_OPENPGP_SUBKEY_ERROR -208
-
-#define GNUTLS_E_CRYPTO_ALREADY_REGISTERED GNUTLS_E_ALREADY_REGISTERED
-#define GNUTLS_E_ALREADY_REGISTERED -209
-
-#define GNUTLS_E_HANDSHAKE_TOO_LARGE -210
-
-#define GNUTLS_E_CRYPTODEV_IOCTL_ERROR -211
-#define GNUTLS_E_CRYPTODEV_DEVICE_ERROR -212
-
-#define GNUTLS_E_CHANNEL_BINDING_NOT_AVAILABLE -213
-#define GNUTLS_E_BAD_COOKIE -214
-#define GNUTLS_E_OPENPGP_PREFERRED_KEY_ERROR -215
-#define GNUTLS_E_INCOMPAT_DSA_KEY_WITH_TLS_PROTOCOL -216
-#define GNUTLS_E_INSUFFICIENT_SECURITY -217
-
-#define GNUTLS_E_HEARTBEAT_PONG_RECEIVED -292
-#define GNUTLS_E_HEARTBEAT_PING_RECEIVED -293
-
-#define GNUTLS_E_UNRECOGNIZED_NAME -294
+# define GNUTLS_E_ASN1_ELEMENT_NOT_FOUND -67
+# define GNUTLS_E_ASN1_IDENTIFIER_NOT_FOUND -68
+# define GNUTLS_E_ASN1_DER_ERROR -69
+# define GNUTLS_E_ASN1_VALUE_NOT_FOUND -70
+# define GNUTLS_E_ASN1_GENERIC_ERROR -71
+# define GNUTLS_E_ASN1_VALUE_NOT_VALID -72
+# define GNUTLS_E_ASN1_TAG_ERROR -73
+# define GNUTLS_E_ASN1_TAG_IMPLICIT -74
+# define GNUTLS_E_ASN1_TYPE_ANY_ERROR -75
+# define GNUTLS_E_ASN1_SYNTAX_ERROR -76
+# define GNUTLS_E_ASN1_DER_OVERFLOW -77
+# define GNUTLS_E_OPENPGP_UID_REVOKED -79
+# define GNUTLS_E_CERTIFICATE_ERROR -43
+# define GNUTLS_E_X509_CERTIFICATE_ERROR GNUTLS_E_CERTIFICATE_ERROR
+# define GNUTLS_E_CERTIFICATE_KEY_MISMATCH -60
+# define GNUTLS_E_UNSUPPORTED_CERTIFICATE_TYPE -61 /* GNUTLS_A_UNSUPPORTED_CERTIFICATE */
+# define GNUTLS_E_X509_UNKNOWN_SAN -62
+# define GNUTLS_E_OPENPGP_FINGERPRINT_UNSUPPORTED -94
+# define GNUTLS_E_X509_UNSUPPORTED_ATTRIBUTE -95
+# define GNUTLS_E_UNKNOWN_HASH_ALGORITHM -96
+# define GNUTLS_E_UNKNOWN_PKCS_CONTENT_TYPE -97
+# define GNUTLS_E_UNKNOWN_PKCS_BAG_TYPE -98
+# define GNUTLS_E_INVALID_PASSWORD -99
+# define GNUTLS_E_MAC_VERIFY_FAILED -100/* for PKCS #12 MAC */
+# define GNUTLS_E_CONSTRAINT_ERROR -101
+
+# define GNUTLS_E_WARNING_IA_IPHF_RECEIVED -102
+# define GNUTLS_E_WARNING_IA_FPHF_RECEIVED -103
+
+# define GNUTLS_E_IA_VERIFY_FAILED -104
+# define GNUTLS_E_UNKNOWN_ALGORITHM -105
+# define GNUTLS_E_UNSUPPORTED_SIGNATURE_ALGORITHM -106
+# define GNUTLS_E_SAFE_RENEGOTIATION_FAILED -107
+# define GNUTLS_E_UNSAFE_RENEGOTIATION_DENIED -108
+# define GNUTLS_E_UNKNOWN_SRP_USERNAME -109
+# define GNUTLS_E_PREMATURE_TERMINATION -110
+
+# define GNUTLS_E_MALFORMED_CIDR -111
+
+# define GNUTLS_E_BASE64_ENCODING_ERROR -201
+# define GNUTLS_E_INCOMPATIBLE_GCRYPT_LIBRARY -202 /* obsolete */
+# define GNUTLS_E_INCOMPATIBLE_CRYPTO_LIBRARY -202
+# define GNUTLS_E_INCOMPATIBLE_LIBTASN1_LIBRARY -203
+
+# define GNUTLS_E_OPENPGP_KEYRING_ERROR -204
+# define GNUTLS_E_X509_UNSUPPORTED_OID -205
+
+# define GNUTLS_E_RANDOM_FAILED -206
+# define GNUTLS_E_BASE64_UNEXPECTED_HEADER_ERROR -207
+
+# define GNUTLS_E_OPENPGP_SUBKEY_ERROR -208
+
+# define GNUTLS_E_CRYPTO_ALREADY_REGISTERED GNUTLS_E_ALREADY_REGISTERED
+# define GNUTLS_E_ALREADY_REGISTERED -209
+
+# define GNUTLS_E_HANDSHAKE_TOO_LARGE -210
+
+# define GNUTLS_E_CRYPTODEV_IOCTL_ERROR -211
+# define GNUTLS_E_CRYPTODEV_DEVICE_ERROR -212
+
+# define GNUTLS_E_CHANNEL_BINDING_NOT_AVAILABLE -213
+# define GNUTLS_E_BAD_COOKIE -214
+# define GNUTLS_E_OPENPGP_PREFERRED_KEY_ERROR -215
+# define GNUTLS_E_INCOMPAT_DSA_KEY_WITH_TLS_PROTOCOL -216
+# define GNUTLS_E_INSUFFICIENT_SECURITY -217
+
+# define GNUTLS_E_HEARTBEAT_PONG_RECEIVED -292
+# define GNUTLS_E_HEARTBEAT_PING_RECEIVED -293
+
+# define GNUTLS_E_UNRECOGNIZED_NAME -294
/* PKCS11 related */
-#define GNUTLS_E_PKCS11_ERROR -300
-#define GNUTLS_E_PKCS11_LOAD_ERROR -301
-#define GNUTLS_E_PARSING_ERROR -302
-#define GNUTLS_E_PKCS11_PIN_ERROR -303
-
-#define GNUTLS_E_PKCS11_SLOT_ERROR -305
-#define GNUTLS_E_LOCKING_ERROR -306
-#define GNUTLS_E_PKCS11_ATTRIBUTE_ERROR -307
-#define GNUTLS_E_PKCS11_DEVICE_ERROR -308
-#define GNUTLS_E_PKCS11_DATA_ERROR -309
-#define GNUTLS_E_PKCS11_UNSUPPORTED_FEATURE_ERROR -310
-#define GNUTLS_E_PKCS11_KEY_ERROR -311
-#define GNUTLS_E_PKCS11_PIN_EXPIRED -312
-#define GNUTLS_E_PKCS11_PIN_LOCKED -313
-#define GNUTLS_E_PKCS11_SESSION_ERROR -314
-#define GNUTLS_E_PKCS11_SIGNATURE_ERROR -315
-#define GNUTLS_E_PKCS11_TOKEN_ERROR -316
-#define GNUTLS_E_PKCS11_USER_ERROR -317
-
-#define GNUTLS_E_CRYPTO_INIT_FAILED -318
-#define GNUTLS_E_TIMEDOUT -319
-#define GNUTLS_E_USER_ERROR -320
-#define GNUTLS_E_ECC_NO_SUPPORTED_CURVES -321
-#define GNUTLS_E_ECC_UNSUPPORTED_CURVE -322
-#define GNUTLS_E_PKCS11_REQUESTED_OBJECT_NOT_AVAILBLE -323
-#define GNUTLS_E_CERTIFICATE_LIST_UNSORTED -324
-#define GNUTLS_E_ILLEGAL_PARAMETER -325 /* GNUTLS_A_ILLEGAL_PARAMETER */
-#define GNUTLS_E_NO_PRIORITIES_WERE_SET -326
-#define GNUTLS_E_X509_UNSUPPORTED_EXTENSION -327
-#define GNUTLS_E_SESSION_EOF -328
-
-#define GNUTLS_E_TPM_ERROR -329
-#define GNUTLS_E_TPM_KEY_PASSWORD_ERROR -330
-#define GNUTLS_E_TPM_SRK_PASSWORD_ERROR -331
-#define GNUTLS_E_TPM_SESSION_ERROR -332
-#define GNUTLS_E_TPM_KEY_NOT_FOUND -333
-#define GNUTLS_E_TPM_UNINITIALIZED -334
-#define GNUTLS_E_TPM_NO_LIB -335
-
-#define GNUTLS_E_NO_CERTIFICATE_STATUS -340
-#define GNUTLS_E_OCSP_RESPONSE_ERROR -341
-#define GNUTLS_E_RANDOM_DEVICE_ERROR -342
-#define GNUTLS_E_AUTH_ERROR -343
-#define GNUTLS_E_NO_APPLICATION_PROTOCOL -344
-#define GNUTLS_E_SOCKETS_INIT_ERROR -345
-#define GNUTLS_E_KEY_IMPORT_FAILED -346
-#define GNUTLS_E_INAPPROPRIATE_FALLBACK -347 /*GNUTLS_A_INAPPROPRIATE_FALLBACK*/
-#define GNUTLS_E_CERTIFICATE_VERIFICATION_ERROR -348
-#define GNUTLS_E_PRIVKEY_VERIFICATION_ERROR -349
-#define GNUTLS_E_UNEXPECTED_EXTENSIONS_LENGTH -350 /*GNUTLS_A_DECODE_ERROR*/
-#define GNUTLS_E_ASN1_EMBEDDED_NULL_IN_STRING -351
-
-#define GNUTLS_E_SELF_TEST_ERROR -400
-#define GNUTLS_E_NO_SELF_TEST -401
-#define GNUTLS_E_LIB_IN_ERROR_STATE -402
-#define GNUTLS_E_PK_GENERATION_ERROR -403
-#define GNUTLS_E_IDNA_ERROR -404
-
-#define GNUTLS_E_NEED_FALLBACK -405
-#define GNUTLS_E_SESSION_USER_ID_CHANGED -406
-#define GNUTLS_E_HANDSHAKE_DURING_FALSE_START -407
-#define GNUTLS_E_UNAVAILABLE_DURING_HANDSHAKE -408
-#define GNUTLS_E_PK_INVALID_PUBKEY -409
-#define GNUTLS_E_PK_INVALID_PRIVKEY -410
-#define GNUTLS_E_NOT_YET_ACTIVATED -411
-#define GNUTLS_E_INVALID_UTF8_STRING -412
-#define GNUTLS_E_NO_EMBEDDED_DATA -413
-#define GNUTLS_E_INVALID_UTF8_EMAIL -414
-#define GNUTLS_E_INVALID_PASSWORD_STRING -415
-#define GNUTLS_E_CERTIFICATE_TIME_ERROR -416
-#define GNUTLS_E_RECORD_OVERFLOW -417 /* GNUTLS_A_RECORD_OVERFLOW */
-#define GNUTLS_E_ASN1_TIME_ERROR -418
-#define GNUTLS_E_INCOMPATIBLE_SIG_WITH_KEY -419
-#define GNUTLS_E_PK_INVALID_PUBKEY_PARAMS -420
-#define GNUTLS_E_PK_NO_VALIDATION_PARAMS -421
-#define GNUTLS_E_OCSP_MISMATCH_WITH_CERTS -422
-
-#define GNUTLS_E_NO_COMMON_KEY_SHARE -423
-#define GNUTLS_E_REAUTH_REQUEST -424
-#define GNUTLS_E_TOO_MANY_MATCHES -425
-#define GNUTLS_E_CRL_VERIFICATION_ERROR -426
-#define GNUTLS_E_MISSING_EXTENSION -427
-#define GNUTLS_E_DB_ENTRY_EXISTS -428
-#define GNUTLS_E_EARLY_DATA_REJECTED -429
-#define GNUTLS_E_X509_DUPLICATE_EXTENSION -430
-
-#define GNUTLS_E_UNIMPLEMENTED_FEATURE -1250
+# define GNUTLS_E_PKCS11_ERROR -300
+# define GNUTLS_E_PKCS11_LOAD_ERROR -301
+# define GNUTLS_E_PARSING_ERROR -302
+# define GNUTLS_E_PKCS11_PIN_ERROR -303
+
+# define GNUTLS_E_PKCS11_SLOT_ERROR -305
+# define GNUTLS_E_LOCKING_ERROR -306
+# define GNUTLS_E_PKCS11_ATTRIBUTE_ERROR -307
+# define GNUTLS_E_PKCS11_DEVICE_ERROR -308
+# define GNUTLS_E_PKCS11_DATA_ERROR -309
+# define GNUTLS_E_PKCS11_UNSUPPORTED_FEATURE_ERROR -310
+# define GNUTLS_E_PKCS11_KEY_ERROR -311
+# define GNUTLS_E_PKCS11_PIN_EXPIRED -312
+# define GNUTLS_E_PKCS11_PIN_LOCKED -313
+# define GNUTLS_E_PKCS11_SESSION_ERROR -314
+# define GNUTLS_E_PKCS11_SIGNATURE_ERROR -315
+# define GNUTLS_E_PKCS11_TOKEN_ERROR -316
+# define GNUTLS_E_PKCS11_USER_ERROR -317
+
+# define GNUTLS_E_CRYPTO_INIT_FAILED -318
+# define GNUTLS_E_TIMEDOUT -319
+# define GNUTLS_E_USER_ERROR -320
+# define GNUTLS_E_ECC_NO_SUPPORTED_CURVES -321
+# define GNUTLS_E_ECC_UNSUPPORTED_CURVE -322
+# define GNUTLS_E_PKCS11_REQUESTED_OBJECT_NOT_AVAILBLE -323
+# define GNUTLS_E_CERTIFICATE_LIST_UNSORTED -324
+# define GNUTLS_E_ILLEGAL_PARAMETER -325/* GNUTLS_A_ILLEGAL_PARAMETER */
+# define GNUTLS_E_NO_PRIORITIES_WERE_SET -326
+# define GNUTLS_E_X509_UNSUPPORTED_EXTENSION -327
+# define GNUTLS_E_SESSION_EOF -328
+
+# define GNUTLS_E_TPM_ERROR -329
+# define GNUTLS_E_TPM_KEY_PASSWORD_ERROR -330
+# define GNUTLS_E_TPM_SRK_PASSWORD_ERROR -331
+# define GNUTLS_E_TPM_SESSION_ERROR -332
+# define GNUTLS_E_TPM_KEY_NOT_FOUND -333
+# define GNUTLS_E_TPM_UNINITIALIZED -334
+# define GNUTLS_E_TPM_NO_LIB -335
+
+# define GNUTLS_E_NO_CERTIFICATE_STATUS -340
+# define GNUTLS_E_OCSP_RESPONSE_ERROR -341
+# define GNUTLS_E_RANDOM_DEVICE_ERROR -342
+# define GNUTLS_E_AUTH_ERROR -343
+# define GNUTLS_E_NO_APPLICATION_PROTOCOL -344
+# define GNUTLS_E_SOCKETS_INIT_ERROR -345
+# define GNUTLS_E_KEY_IMPORT_FAILED -346
+# define GNUTLS_E_INAPPROPRIATE_FALLBACK -347 /*GNUTLS_A_INAPPROPRIATE_FALLBACK */
+# define GNUTLS_E_CERTIFICATE_VERIFICATION_ERROR -348
+# define GNUTLS_E_PRIVKEY_VERIFICATION_ERROR -349
+# define GNUTLS_E_UNEXPECTED_EXTENSIONS_LENGTH -350 /*GNUTLS_A_DECODE_ERROR */
+# define GNUTLS_E_ASN1_EMBEDDED_NULL_IN_STRING -351
+
+# define GNUTLS_E_SELF_TEST_ERROR -400
+# define GNUTLS_E_NO_SELF_TEST -401
+# define GNUTLS_E_LIB_IN_ERROR_STATE -402
+# define GNUTLS_E_PK_GENERATION_ERROR -403
+# define GNUTLS_E_IDNA_ERROR -404
+
+# define GNUTLS_E_NEED_FALLBACK -405
+# define GNUTLS_E_SESSION_USER_ID_CHANGED -406
+# define GNUTLS_E_HANDSHAKE_DURING_FALSE_START -407
+# define GNUTLS_E_UNAVAILABLE_DURING_HANDSHAKE -408
+# define GNUTLS_E_PK_INVALID_PUBKEY -409
+# define GNUTLS_E_PK_INVALID_PRIVKEY -410
+# define GNUTLS_E_NOT_YET_ACTIVATED -411
+# define GNUTLS_E_INVALID_UTF8_STRING -412
+# define GNUTLS_E_NO_EMBEDDED_DATA -413
+# define GNUTLS_E_INVALID_UTF8_EMAIL -414
+# define GNUTLS_E_INVALID_PASSWORD_STRING -415
+# define GNUTLS_E_CERTIFICATE_TIME_ERROR -416
+# define GNUTLS_E_RECORD_OVERFLOW -417 /* GNUTLS_A_RECORD_OVERFLOW */
+# define GNUTLS_E_ASN1_TIME_ERROR -418
+# define GNUTLS_E_INCOMPATIBLE_SIG_WITH_KEY -419
+# define GNUTLS_E_PK_INVALID_PUBKEY_PARAMS -420
+# define GNUTLS_E_PK_NO_VALIDATION_PARAMS -421
+# define GNUTLS_E_OCSP_MISMATCH_WITH_CERTS -422
+
+# define GNUTLS_E_NO_COMMON_KEY_SHARE -423
+# define GNUTLS_E_REAUTH_REQUEST -424
+# define GNUTLS_E_TOO_MANY_MATCHES -425
+# define GNUTLS_E_CRL_VERIFICATION_ERROR -426
+# define GNUTLS_E_MISSING_EXTENSION -427
+# define GNUTLS_E_DB_ENTRY_EXISTS -428
+# define GNUTLS_E_EARLY_DATA_REJECTED -429
+# define GNUTLS_E_X509_DUPLICATE_EXTENSION -430
+
+# define GNUTLS_E_UNIMPLEMENTED_FEATURE -1250
/* Internal errors of the library; will never be returned
* to a calling application */
-#define GNUTLS_E_INT_RET_0 -1251
-#define GNUTLS_E_INT_CHECK_AGAIN -1252
+# define GNUTLS_E_INT_RET_0 -1251
+# define GNUTLS_E_INT_CHECK_AGAIN -1252
-#define GNUTLS_E_APPLICATION_ERROR_MAX -65000
-#define GNUTLS_E_APPLICATION_ERROR_MIN -65500
+# define GNUTLS_E_APPLICATION_ERROR_MAX -65000
+# define GNUTLS_E_APPLICATION_ERROR_MIN -65500
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -3707,6 +3640,6 @@ gnutls_transport_is_ktls_enabled(gnutls_session_t session);
#endif
/* *INDENT-ON* */
-#include <gnutls/compat.h>
+# include <gnutls/compat.h>
-#endif /* GNUTLS_GNUTLS_H */
+#endif /* GNUTLS_GNUTLS_H */
diff --git a/lib/includes/gnutls/gnutlsxx.h b/lib/includes/gnutls/gnutlsxx.h
index 23bbd4ea36..2414f36b60 100644
--- a/lib/includes/gnutls/gnutlsxx.h
+++ b/lib/includes/gnutls/gnutlsxx.h
@@ -21,37 +21,35 @@
*/
#ifndef GNUTLS_GNUTLSXX_H
-#define GNUTLS_GNUTLSXX_H
+# define GNUTLS_GNUTLSXX_H
-#include <exception>
-#include <vector>
-#include <gnutls/gnutls.h>
+# include <exception>
+# include <vector>
+# include <gnutls/gnutls.h>
namespace gnutls {
class noncopyable {
- protected:
+ protected:
noncopyable() {
} ~noncopyable() {
- } private:
+ } private:
// These are non-implemented.
noncopyable(const noncopyable &);
noncopyable & operator=(const noncopyable &);
};
-
class exception:public std::exception {
- public:
+ public:
explicit exception(int x);
const char *what() const throw();
int get_code();
- protected:
+ protected:
int retcode;
};
-
class dh_params:private noncopyable {
- public:
+ public:
dh_params();
~dh_params();
void import_raw(const gnutls_datum_t & prime,
@@ -62,19 +60,18 @@ namespace gnutls {
void export_pkcs3(gnutls_x509_crt_fmt_t format,
unsigned char *params_data,
- size_t * params_data_size);
+ size_t *params_data_size);
void export_raw(gnutls_datum_t & prime,
gnutls_datum_t & generator);
gnutls_dh_params_t get_params_t() const;
dh_params & operator=(const dh_params & src);
- protected:
+ protected:
gnutls_dh_params_t params;
};
-
class rsa_params:private noncopyable {
- public:
+ public:
rsa_params();
~rsa_params();
void import_raw(const gnutls_datum_t & m,
@@ -89,21 +86,21 @@ namespace gnutls {
void export_pkcs1(gnutls_x509_crt_fmt_t format,
unsigned char *params_data,
- size_t * params_data_size);
+ size_t *params_data_size);
void export_raw(gnutls_datum_t & m, gnutls_datum_t & e,
gnutls_datum_t & d, gnutls_datum_t & p,
gnutls_datum_t & q, gnutls_datum_t & u);
gnutls_rsa_params_t get_params_t() const;
rsa_params & operator=(const rsa_params & src);
- protected:
+ protected:
gnutls_rsa_params_t params;
};
class session:private noncopyable {
- protected:
+ protected:
gnutls_session_t s;
- public:
+ public:
explicit session(unsigned int);
virtual ~ session();
@@ -162,11 +159,10 @@ namespace gnutls {
void set_data(const void *session_data,
size_t session_data_size);
void get_data(void *session_data,
- size_t * session_data_size) const;
+ size_t *session_data_size) const;
void get_data(gnutls_session_t session,
gnutls_datum_t & data) const;
- void get_id(void *session_id,
- size_t * session_id_size) const;
+ void get_id(void *session_id, size_t *session_id_size) const;
bool is_resumed() const;
@@ -184,13 +180,12 @@ namespace gnutls {
const;
void set_transport_lowat(size_t num);
- void set_transport_push_function(gnutls_push_func
- push_func);
+ void set_transport_push_function(gnutls_push_func push_func);
void set_transport_vec_push_function(gnutls_vec_push_func
vec_push_func);
- void set_transport_pull_function(gnutls_pull_func
- pull_func);
- void set_transport_pull_timeout_function (gnutls_pull_timeout_func pull_timeout_func);
+ void set_transport_pull_function(gnutls_pull_func pull_func);
+ void set_transport_pull_timeout_function
+ (gnutls_pull_timeout_func pull_timeout_func);
void set_user_ptr(void *ptr);
void *get_user_ptr() const;
@@ -227,7 +222,7 @@ namespace gnutls {
// interface for databases
class DB:private noncopyable {
- public:
+ public:
virtual ~ DB() = 0;
virtual bool store(const gnutls_datum_t & key,
const gnutls_datum_t & data) = 0;
@@ -237,7 +232,7 @@ namespace gnutls {
};
class server_session:public session {
- public:
+ public:
server_session();
explicit server_session(int flags);
~server_session();
@@ -253,7 +248,7 @@ namespace gnutls {
const char *get_srp_username() const;
const char *get_psk_username() const;
- void get_server_name(void *data, size_t * data_length,
+ void get_server_name(void *data, size_t *data_length,
unsigned int *type,
unsigned int indx) const;
@@ -262,7 +257,7 @@ namespace gnutls {
};
class client_session:public session {
- public:
+ public:
client_session();
explicit client_session(int flags);
~client_session();
@@ -274,23 +269,22 @@ namespace gnutls {
bool get_request_status();
};
-
class credentials:private noncopyable {
- public:
+ public:
virtual ~ credentials() {
} gnutls_credentials_type_t get_type() const;
- protected:
+ protected:
friend class session;
explicit credentials(gnutls_credentials_type_t t);
void *ptr() const;
void set_ptr(void *ptr);
gnutls_credentials_type_t type;
- private:
+ private:
void *cred;
};
class certificate_credentials:public credentials {
- public:
+ public:
~certificate_credentials();
certificate_credentials();
@@ -331,7 +325,6 @@ namespace gnutls {
int cert_list_size,
gnutls_x509_privkey_t key);
-
void set_simple_pkcs12_file(const char *pkcs12file,
gnutls_x509_crt_fmt_t type,
const char *password);
@@ -339,68 +332,63 @@ namespace gnutls {
void set_retrieve_function
(gnutls_certificate_retrieve_function * func);
- protected:
+ protected:
gnutls_certificate_credentials_t cred;
};
class certificate_server_credentials:public certificate_credentials {
- public:
+ public:
void set_params_function(gnutls_params_function * func);
};
class certificate_client_credentials:public certificate_credentials {
- public:
+ public:
};
-
-
-
class anon_server_credentials:public credentials {
- public:
+ public:
anon_server_credentials();
~anon_server_credentials();
void set_dh_params(const dh_params & params);
void set_params_function(gnutls_params_function * func);
- protected:
+ protected:
gnutls_anon_server_credentials_t cred;
};
class anon_client_credentials:public credentials {
- public:
+ public:
anon_client_credentials();
~anon_client_credentials();
- protected:
+ protected:
gnutls_anon_client_credentials_t cred;
};
-
class srp_server_credentials:public credentials {
- public:
+ public:
srp_server_credentials();
~srp_server_credentials();
void set_credentials_file(const char *password_file,
const char *password_conf_file);
void set_credentials_function
(gnutls_srp_server_credentials_function * func);
- protected:
+ protected:
gnutls_srp_server_credentials_t cred;
};
class srp_client_credentials:public credentials {
- public:
+ public:
srp_client_credentials();
~srp_client_credentials();
void set_credentials(const char *username,
const char *password);
void set_credentials_function
(gnutls_srp_client_credentials_function * func);
- protected:
+ protected:
gnutls_srp_client_credentials_t cred;
};
-
class psk_server_credentials:public credentials {
- public:
+ public:
psk_server_credentials();
~psk_server_credentials();
void set_credentials_file(const char *password_file);
@@ -408,12 +396,12 @@ namespace gnutls {
(gnutls_psk_server_credentials_function * func);
void set_dh_params(const dh_params & params);
void set_params_function(gnutls_params_function * func);
- protected:
+ protected:
gnutls_psk_server_credentials_t cred;
};
class psk_client_credentials:public credentials {
- public:
+ public:
psk_client_credentials();
~psk_client_credentials();
void set_credentials(const char *username,
@@ -421,11 +409,10 @@ namespace gnutls {
gnutls_psk_key_flags flags);
void set_credentials_function
(gnutls_psk_client_credentials_function * func);
- protected:
+ protected:
gnutls_psk_client_credentials_t cred;
};
-
} /* namespace */
-#endif /* GNUTLS_GNUTLSXX_H */
+#endif /* GNUTLS_GNUTLSXX_H */
diff --git a/lib/includes/gnutls/ocsp.h b/lib/includes/gnutls/ocsp.h
index 87806cfd70..63945c5c13 100644
--- a/lib/includes/gnutls/ocsp.h
+++ b/lib/includes/gnutls/ocsp.h
@@ -24,10 +24,10 @@
*/
#ifndef GNUTLS_OCSP_H
-#define GNUTLS_OCSP_H
+# define GNUTLS_OCSP_H
-#include <gnutls/gnutls.h>
-#include <gnutls/x509.h>
+# include <gnutls/gnutls.h>
+# include <gnutls/x509.h>
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -35,7 +35,7 @@ extern "C" {
#endif
/* *INDENT-ON* */
-#define GNUTLS_OCSP_NONCE "1.3.6.1.5.5.7.48.1.2"
+# define GNUTLS_OCSP_NONCE "1.3.6.1.5.5.7.48.1.2"
/**
* gnutls_ocsp_print_formats_t:
@@ -147,8 +147,7 @@ typedef const struct gnutls_ocsp_req_int *gnutls_ocsp_req_const_t;
int gnutls_ocsp_req_init(gnutls_ocsp_req_t * req);
void gnutls_ocsp_req_deinit(gnutls_ocsp_req_t req);
-int gnutls_ocsp_req_import(gnutls_ocsp_req_t req,
- const gnutls_datum_t * data);
+int gnutls_ocsp_req_import(gnutls_ocsp_req_t req, const gnutls_datum_t * data);
int gnutls_ocsp_req_export(gnutls_ocsp_req_const_t req, gnutls_datum_t * data);
int gnutls_ocsp_req_print(gnutls_ocsp_req_const_t req,
gnutls_ocsp_print_formats_t format,
@@ -171,8 +170,7 @@ int gnutls_ocsp_req_add_cert_id(gnutls_ocsp_req_t req,
const gnutls_datum_t * serial_number);
int gnutls_ocsp_req_add_cert(gnutls_ocsp_req_t req,
gnutls_digest_algorithm_t digest,
- gnutls_x509_crt_t issuer,
- gnutls_x509_crt_t cert);
+ gnutls_x509_crt_t issuer, gnutls_x509_crt_t cert);
int gnutls_ocsp_req_get_extension(gnutls_ocsp_req_const_t req,
unsigned indx,
@@ -185,8 +183,7 @@ int gnutls_ocsp_req_set_extension(gnutls_ocsp_req_t req,
const gnutls_datum_t * data);
int gnutls_ocsp_req_get_nonce(gnutls_ocsp_req_const_t req,
- unsigned int *critical,
- gnutls_datum_t * nonce);
+ unsigned int *critical, gnutls_datum_t * nonce);
int gnutls_ocsp_req_set_nonce(gnutls_ocsp_req_t req,
unsigned int critical,
const gnutls_datum_t * nonce);
@@ -207,8 +204,7 @@ int gnutls_ocsp_resp_import2(gnutls_ocsp_resp_t resp,
int gnutls_ocsp_resp_export(gnutls_ocsp_resp_const_t resp,
gnutls_datum_t * data);
int gnutls_ocsp_resp_export2(gnutls_ocsp_resp_const_t resp,
- gnutls_datum_t * data,
- gnutls_x509_crt_fmt_t fmt);
+ gnutls_datum_t * data, gnutls_x509_crt_fmt_t fmt);
int gnutls_ocsp_resp_print(gnutls_ocsp_resp_const_t resp,
gnutls_ocsp_print_formats_t format,
gnutls_datum_t * out);
@@ -216,24 +212,21 @@ int gnutls_ocsp_resp_print(gnutls_ocsp_resp_const_t resp,
int gnutls_ocsp_resp_get_status(gnutls_ocsp_resp_const_t resp);
int gnutls_ocsp_resp_get_response(gnutls_ocsp_resp_const_t resp,
gnutls_datum_t *
- response_type_oid,
- gnutls_datum_t * response);
+ response_type_oid, gnutls_datum_t * response);
int gnutls_ocsp_resp_get_version(gnutls_ocsp_resp_const_t resp);
int gnutls_ocsp_resp_get_responder(gnutls_ocsp_resp_const_t resp,
gnutls_datum_t * dn);
int gnutls_ocsp_resp_get_responder2(gnutls_ocsp_resp_const_t resp,
- gnutls_datum_t * dn,
- unsigned flags);
+ gnutls_datum_t * dn, unsigned flags);
/* the raw key ID of the responder */
-#define GNUTLS_OCSP_RESP_ID_KEY 1
+# define GNUTLS_OCSP_RESP_ID_KEY 1
/* the raw DN of the responder */
-#define GNUTLS_OCSP_RESP_ID_DN 2
+# define GNUTLS_OCSP_RESP_ID_DN 2
int
gnutls_ocsp_resp_get_responder_raw_id(gnutls_ocsp_resp_const_t resp,
- unsigned type,
- gnutls_datum_t * raw);
+ unsigned type, gnutls_datum_t * raw);
time_t gnutls_ocsp_resp_get_produced(gnutls_ocsp_resp_const_t resp);
int gnutls_ocsp_resp_get_single(gnutls_ocsp_resp_const_t resp,
@@ -253,19 +246,16 @@ int gnutls_ocsp_resp_get_extension(gnutls_ocsp_resp_const_t resp,
unsigned int *critical,
gnutls_datum_t * data);
int gnutls_ocsp_resp_get_nonce(gnutls_ocsp_resp_const_t resp,
- unsigned int *critical,
- gnutls_datum_t * nonce);
+ unsigned int *critical, gnutls_datum_t * nonce);
int gnutls_ocsp_resp_get_signature_algorithm(gnutls_ocsp_resp_const_t resp);
int gnutls_ocsp_resp_get_signature(gnutls_ocsp_resp_const_t resp,
gnutls_datum_t * sig);
int gnutls_ocsp_resp_get_certs(gnutls_ocsp_resp_const_t resp,
- gnutls_x509_crt_t ** certs,
- size_t * ncerts);
+ gnutls_x509_crt_t ** certs, size_t *ncerts);
int gnutls_ocsp_resp_verify_direct(gnutls_ocsp_resp_const_t resp,
gnutls_x509_crt_t issuer,
- unsigned int *verify,
- unsigned int flags);
+ unsigned int *verify, unsigned int flags);
int gnutls_ocsp_resp_verify(gnutls_ocsp_resp_const_t resp,
gnutls_x509_trust_list_t trustlist,
unsigned int *verify, unsigned int flags);
@@ -274,11 +264,10 @@ int gnutls_ocsp_resp_check_crt(gnutls_ocsp_resp_const_t resp,
unsigned int indx, gnutls_x509_crt_t crt);
int
-gnutls_ocsp_resp_list_import2(gnutls_ocsp_resp_t **ocsps,
- unsigned int *size,
- const gnutls_datum_t *resp_data,
- gnutls_x509_crt_fmt_t format,
- unsigned int flags);
+gnutls_ocsp_resp_list_import2(gnutls_ocsp_resp_t ** ocsps,
+ unsigned int *size,
+ const gnutls_datum_t * resp_data,
+ gnutls_x509_crt_fmt_t format, unsigned int flags);
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -286,4 +275,4 @@ gnutls_ocsp_resp_list_import2(gnutls_ocsp_resp_t **ocsps,
#endif
/* *INDENT-ON* */
-#endif /* GNUTLS_OCSP_H */
+#endif /* GNUTLS_OCSP_H */
diff --git a/lib/includes/gnutls/openpgp.h b/lib/includes/gnutls/openpgp.h
index 632ffb1dc0..6c4dd5d827 100644
--- a/lib/includes/gnutls/openpgp.h
+++ b/lib/includes/gnutls/openpgp.h
@@ -25,10 +25,10 @@
*/
#ifndef GNUTLS_OPENPGP_H
-#define GNUTLS_OPENPGP_H
+# define GNUTLS_OPENPGP_H
-#include <gnutls/gnutls.h>
-#include <limits.h>
+# include <gnutls/gnutls.h>
+# include <limits.h>
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -51,8 +51,8 @@ typedef enum gnutls_openpgp_crt_fmt {
GNUTLS_OPENPGP_FMT_BASE64
} gnutls_openpgp_crt_fmt_t;
-#define GNUTLS_OPENPGP_KEYID_SIZE 8
-#define GNUTLS_OPENPGP_V4_FINGERPRINT_SIZE 20
+# define GNUTLS_OPENPGP_KEYID_SIZE 8
+# define GNUTLS_OPENPGP_V4_FINGERPRINT_SIZE 20
typedef unsigned char
gnutls_openpgp_keyid_t[GNUTLS_OPENPGP_KEYID_SIZE];
@@ -60,164 +60,202 @@ typedef unsigned char
*/
/* initializes the memory for gnutls_openpgp_crt_t struct */
-int gnutls_openpgp_crt_init(gnutls_openpgp_crt_t * key) _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_crt_init(gnutls_openpgp_crt_t *
+ key) _GNUTLS_GCC_ATTR_DEPRECATED;
/* frees all memory */
-void gnutls_openpgp_crt_deinit(gnutls_openpgp_crt_t key) _GNUTLS_GCC_ATTR_DEPRECATED;
+void gnutls_openpgp_crt_deinit(gnutls_openpgp_crt_t key)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_crt_import(gnutls_openpgp_crt_t key,
const gnutls_datum_t * data,
- gnutls_openpgp_crt_fmt_t format) _GNUTLS_GCC_ATTR_DEPRECATED;
+ gnutls_openpgp_crt_fmt_t format)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_crt_export(gnutls_openpgp_crt_t key,
gnutls_openpgp_crt_fmt_t format,
void *output_data,
- size_t * output_data_size) _GNUTLS_GCC_ATTR_DEPRECATED;
+ size_t *output_data_size)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_crt_export2(gnutls_openpgp_crt_t key,
gnutls_openpgp_crt_fmt_t format,
- gnutls_datum_t * out) _GNUTLS_GCC_ATTR_DEPRECATED;
+ gnutls_datum_t *
+ out) _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_crt_print(gnutls_openpgp_crt_t cert,
gnutls_certificate_print_formats_t
- format, gnutls_datum_t * out) _GNUTLS_GCC_ATTR_DEPRECATED;
+ format,
+ gnutls_datum_t * out) _GNUTLS_GCC_ATTR_DEPRECATED;
/* The key_usage flags are defined in gnutls.h. They are
* the GNUTLS_KEY_* definitions.
*/
-#define GNUTLS_OPENPGP_MASTER_KEYID_IDX INT_MAX
+# define GNUTLS_OPENPGP_MASTER_KEYID_IDX INT_MAX
int gnutls_openpgp_crt_get_key_usage(gnutls_openpgp_crt_t key,
- unsigned int *key_usage) _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_openpgp_crt_get_fingerprint(gnutls_openpgp_crt_t key,
- void *fpr, size_t * fprlen) _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_openpgp_crt_get_subkey_fingerprint(gnutls_openpgp_crt_t
- key,
- unsigned int idx,
- void *fpr, size_t * fprlen) _GNUTLS_GCC_ATTR_DEPRECATED;
+ unsigned int *key_usage)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_crt_get_fingerprint(gnutls_openpgp_crt_t key, void *fpr,
+ size_t *fprlen)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_crt_get_subkey_fingerprint(gnutls_openpgp_crt_t key,
+ unsigned int idx, void *fpr,
+ size_t *fprlen)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_crt_get_name(gnutls_openpgp_crt_t key,
- int idx, char *buf, size_t * sizeof_buf) _GNUTLS_GCC_ATTR_DEPRECATED;
+ int idx, char *buf,
+ size_t *sizeof_buf) _GNUTLS_GCC_ATTR_DEPRECATED;
gnutls_pk_algorithm_t
gnutls_openpgp_crt_get_pk_algorithm(gnutls_openpgp_crt_t key,
- unsigned int *bits) _GNUTLS_GCC_ATTR_DEPRECATED;
+ unsigned int *bits)
+_GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_openpgp_crt_get_version(gnutls_openpgp_crt_t key) _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_crt_get_version(gnutls_openpgp_crt_t key)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
-time_t gnutls_openpgp_crt_get_creation_time(gnutls_openpgp_crt_t key) _GNUTLS_GCC_ATTR_DEPRECATED;
-time_t gnutls_openpgp_crt_get_expiration_time(gnutls_openpgp_crt_t key) _GNUTLS_GCC_ATTR_DEPRECATED;
+time_t gnutls_openpgp_crt_get_creation_time(gnutls_openpgp_crt_t key)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
+time_t gnutls_openpgp_crt_get_expiration_time(gnutls_openpgp_crt_t key)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_crt_get_key_id(gnutls_openpgp_crt_t key,
- gnutls_openpgp_keyid_t keyid) _GNUTLS_GCC_ATTR_DEPRECATED;
+ gnutls_openpgp_keyid_t keyid)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_crt_check_hostname(gnutls_openpgp_crt_t key,
- const char *hostname) _GNUTLS_GCC_ATTR_DEPRECATED;
+ const char *hostname)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_crt_check_hostname2(gnutls_openpgp_crt_t key,
- const char *hostname, unsigned int flags) _GNUTLS_GCC_ATTR_DEPRECATED;
-int
-gnutls_openpgp_crt_check_email(gnutls_openpgp_crt_t key, const char *email, unsigned flags) _GNUTLS_GCC_ATTR_DEPRECATED;
+ const char *hostname,
+ unsigned int flags)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_crt_check_email(gnutls_openpgp_crt_t key, const char *email,
+ unsigned flags) _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_openpgp_crt_get_revoked_status(gnutls_openpgp_crt_t key) _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_crt_get_revoked_status(gnutls_openpgp_crt_t key)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_openpgp_crt_get_subkey_count(gnutls_openpgp_crt_t key) _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_crt_get_subkey_count(gnutls_openpgp_crt_t key)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_crt_get_subkey_idx(gnutls_openpgp_crt_t key,
- const gnutls_openpgp_keyid_t keyid) _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_openpgp_crt_get_subkey_revoked_status
- (gnutls_openpgp_crt_t key, unsigned int idx) _GNUTLS_GCC_ATTR_DEPRECATED;
+ const gnutls_openpgp_keyid_t keyid)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_crt_get_subkey_revoked_status(gnutls_openpgp_crt_t key,
+ unsigned int idx)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
gnutls_pk_algorithm_t
-gnutls_openpgp_crt_get_subkey_pk_algorithm(gnutls_openpgp_crt_t
- key,
+gnutls_openpgp_crt_get_subkey_pk_algorithm(gnutls_openpgp_crt_t key,
unsigned int idx,
- unsigned int *bits) _GNUTLS_GCC_ATTR_DEPRECATED;
-time_t
- gnutls_openpgp_crt_get_subkey_creation_time
- (gnutls_openpgp_crt_t key, unsigned int idx) _GNUTLS_GCC_ATTR_DEPRECATED;
-time_t
- gnutls_openpgp_crt_get_subkey_expiration_time
- (gnutls_openpgp_crt_t key, unsigned int idx) _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_openpgp_crt_get_subkey_id(gnutls_openpgp_crt_t key,
- unsigned int idx,
- gnutls_openpgp_keyid_t keyid) _GNUTLS_GCC_ATTR_DEPRECATED;
+ unsigned int *bits)
+_GNUTLS_GCC_ATTR_DEPRECATED;
+time_t gnutls_openpgp_crt_get_subkey_creation_time(gnutls_openpgp_crt_t key,
+ unsigned int idx)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
+time_t gnutls_openpgp_crt_get_subkey_expiration_time(gnutls_openpgp_crt_t key,
+ unsigned int idx)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_crt_get_subkey_id(gnutls_openpgp_crt_t key, unsigned int idx,
+ gnutls_openpgp_keyid_t keyid)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_crt_get_subkey_usage(gnutls_openpgp_crt_t key,
unsigned int idx,
- unsigned int *key_usage) _GNUTLS_GCC_ATTR_DEPRECATED;
+ unsigned int *key_usage)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_crt_get_subkey_pk_dsa_raw(gnutls_openpgp_crt_t
crt, unsigned int idx,
gnutls_datum_t * p,
gnutls_datum_t * q,
gnutls_datum_t * g,
- gnutls_datum_t * y) _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_openpgp_crt_get_subkey_pk_rsa_raw(gnutls_openpgp_crt_t
- crt, unsigned int idx,
+ gnutls_datum_t *
+ y) _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_crt_get_subkey_pk_rsa_raw(gnutls_openpgp_crt_t crt,
+ unsigned int idx,
gnutls_datum_t * m,
- gnutls_datum_t * e) _GNUTLS_GCC_ATTR_DEPRECATED;
+ gnutls_datum_t *
+ e) _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_crt_get_pk_dsa_raw(gnutls_openpgp_crt_t crt,
- gnutls_datum_t * p,
- gnutls_datum_t * q,
+ gnutls_datum_t * p, gnutls_datum_t * q,
gnutls_datum_t * g,
- gnutls_datum_t * y) _GNUTLS_GCC_ATTR_DEPRECATED;
+ gnutls_datum_t *
+ y) _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_crt_get_pk_rsa_raw(gnutls_openpgp_crt_t crt,
gnutls_datum_t * m,
- gnutls_datum_t * e) _GNUTLS_GCC_ATTR_DEPRECATED;
+ gnutls_datum_t *
+ e) _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_crt_get_preferred_key_id(gnutls_openpgp_crt_t
key,
- gnutls_openpgp_keyid_t keyid) _GNUTLS_GCC_ATTR_DEPRECATED;
-int
-gnutls_openpgp_crt_set_preferred_key_id(gnutls_openpgp_crt_t key,
- const
- gnutls_openpgp_keyid_t keyid) _GNUTLS_GCC_ATTR_DEPRECATED;
+ gnutls_openpgp_keyid_t keyid)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_crt_set_preferred_key_id(gnutls_openpgp_crt_t key,
+ const gnutls_openpgp_keyid_t keyid)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
/* privkey stuff.
*/
-int gnutls_openpgp_privkey_init(gnutls_openpgp_privkey_t * key) _GNUTLS_GCC_ATTR_DEPRECATED;
-void gnutls_openpgp_privkey_deinit(gnutls_openpgp_privkey_t key) _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_privkey_init(gnutls_openpgp_privkey_t *
+ key) _GNUTLS_GCC_ATTR_DEPRECATED;
+void gnutls_openpgp_privkey_deinit(gnutls_openpgp_privkey_t key)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
gnutls_pk_algorithm_t
- gnutls_openpgp_privkey_get_pk_algorithm
- (gnutls_openpgp_privkey_t key, unsigned int *bits) _GNUTLS_GCC_ATTR_DEPRECATED;
+gnutls_openpgp_privkey_get_pk_algorithm(gnutls_openpgp_privkey_t key,
+ unsigned int *bits)
+_GNUTLS_GCC_ATTR_DEPRECATED;
gnutls_sec_param_t
-gnutls_openpgp_privkey_sec_param(gnutls_openpgp_privkey_t key) _GNUTLS_GCC_ATTR_DEPRECATED;
+gnutls_openpgp_privkey_sec_param(gnutls_openpgp_privkey_t key)
+_GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_privkey_import(gnutls_openpgp_privkey_t key,
const gnutls_datum_t * data,
gnutls_openpgp_crt_fmt_t format,
const char *password,
- unsigned int flags) _GNUTLS_GCC_ATTR_DEPRECATED;
+ unsigned int flags)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_privkey_get_fingerprint(gnutls_openpgp_privkey_t
key, void *fpr,
- size_t * fprlen) _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_openpgp_privkey_get_subkey_fingerprint
- (gnutls_openpgp_privkey_t key, unsigned int idx, void *fpr,
- size_t * fprlen) _GNUTLS_GCC_ATTR_DEPRECATED;
+ size_t *fprlen)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_privkey_get_subkey_fingerprint(gnutls_openpgp_privkey_t key,
+ unsigned int idx, void *fpr,
+ size_t *fprlen)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_privkey_get_key_id(gnutls_openpgp_privkey_t key,
- gnutls_openpgp_keyid_t keyid) _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_openpgp_privkey_get_subkey_count(gnutls_openpgp_privkey_t key) _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_openpgp_privkey_get_subkey_idx(gnutls_openpgp_privkey_t
- key,
- const
- gnutls_openpgp_keyid_t keyid) _GNUTLS_GCC_ATTR_DEPRECATED;
+ gnutls_openpgp_keyid_t keyid)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_privkey_get_subkey_count(gnutls_openpgp_privkey_t key)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_privkey_get_subkey_idx(gnutls_openpgp_privkey_t key,
+ const gnutls_openpgp_keyid_t keyid)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_privkey_get_subkey_revoked_status
- (gnutls_openpgp_privkey_t key, unsigned int idx) _GNUTLS_GCC_ATTR_DEPRECATED;
+ (gnutls_openpgp_privkey_t key,
+ unsigned int idx) _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_privkey_get_revoked_status
(gnutls_openpgp_privkey_t key) _GNUTLS_GCC_ATTR_DEPRECATED;
gnutls_pk_algorithm_t
gnutls_openpgp_privkey_get_subkey_pk_algorithm
- (gnutls_openpgp_privkey_t key, unsigned int idx, unsigned int *bits) _GNUTLS_GCC_ATTR_DEPRECATED;
+ (gnutls_openpgp_privkey_t key, unsigned int idx,
+ unsigned int *bits) _GNUTLS_GCC_ATTR_DEPRECATED;
time_t
gnutls_openpgp_privkey_get_subkey_expiration_time
- (gnutls_openpgp_privkey_t key, unsigned int idx) _GNUTLS_GCC_ATTR_DEPRECATED;
+ (gnutls_openpgp_privkey_t key,
+ unsigned int idx) _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_privkey_get_subkey_id(gnutls_openpgp_privkey_t
key, unsigned int idx,
- gnutls_openpgp_keyid_t keyid) _GNUTLS_GCC_ATTR_DEPRECATED;
+ gnutls_openpgp_keyid_t keyid)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
time_t
gnutls_openpgp_privkey_get_subkey_creation_time
- (gnutls_openpgp_privkey_t key, unsigned int idx) _GNUTLS_GCC_ATTR_DEPRECATED;
+ (gnutls_openpgp_privkey_t key,
+ unsigned int idx) _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_privkey_export_subkey_dsa_raw
(gnutls_openpgp_privkey_t pkey, unsigned int idx,
@@ -226,76 +264,89 @@ int gnutls_openpgp_privkey_export_subkey_dsa_raw
int gnutls_openpgp_privkey_export_subkey_rsa_raw
(gnutls_openpgp_privkey_t pkey, unsigned int idx,
gnutls_datum_t * m, gnutls_datum_t * e, gnutls_datum_t * d,
- gnutls_datum_t * p, gnutls_datum_t * q, gnutls_datum_t * u) _GNUTLS_GCC_ATTR_DEPRECATED;
+ gnutls_datum_t * p, gnutls_datum_t * q,
+ gnutls_datum_t * u) _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_privkey_export_dsa_raw(gnutls_openpgp_privkey_t
pkey, gnutls_datum_t * p,
gnutls_datum_t * q,
gnutls_datum_t * g,
gnutls_datum_t * y,
- gnutls_datum_t * x) _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_openpgp_privkey_export_rsa_raw(gnutls_openpgp_privkey_t
- pkey, gnutls_datum_t * m,
+ gnutls_datum_t *
+ x) _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_privkey_export_rsa_raw(gnutls_openpgp_privkey_t pkey,
+ gnutls_datum_t * m,
gnutls_datum_t * e,
gnutls_datum_t * d,
gnutls_datum_t * p,
gnutls_datum_t * q,
- gnutls_datum_t * u) _GNUTLS_GCC_ATTR_DEPRECATED;
+ gnutls_datum_t *
+ u) _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_privkey_export(gnutls_openpgp_privkey_t key,
gnutls_openpgp_crt_fmt_t format,
const char *password,
unsigned int flags,
void *output_data,
- size_t * output_data_size) _GNUTLS_GCC_ATTR_DEPRECATED;
+ size_t *output_data_size)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_privkey_export2(gnutls_openpgp_privkey_t key,
gnutls_openpgp_crt_fmt_t format,
- const char *password,
- unsigned int flags,
- gnutls_datum_t * out) _GNUTLS_GCC_ATTR_DEPRECATED;
+ const char *password, unsigned int flags,
+ gnutls_datum_t *
+ out) _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_privkey_set_preferred_key_id
- (gnutls_openpgp_privkey_t key, const gnutls_openpgp_keyid_t keyid) _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_openpgp_privkey_get_preferred_key_id
- (gnutls_openpgp_privkey_t key, gnutls_openpgp_keyid_t keyid) _GNUTLS_GCC_ATTR_DEPRECATED;
+ (gnutls_openpgp_privkey_t key,
+ const gnutls_openpgp_keyid_t keyid) _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_privkey_get_preferred_key_id(gnutls_openpgp_privkey_t key,
+ gnutls_openpgp_keyid_t keyid)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_crt_get_auth_subkey(gnutls_openpgp_crt_t crt,
gnutls_openpgp_keyid_t
- keyid, unsigned int flag) _GNUTLS_GCC_ATTR_DEPRECATED;
+ keyid,
+ unsigned int flag)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
/* Keyring stuff.
*/
-int gnutls_openpgp_keyring_init(gnutls_openpgp_keyring_t * keyring) _GNUTLS_GCC_ATTR_DEPRECATED;
-void gnutls_openpgp_keyring_deinit(gnutls_openpgp_keyring_t keyring) _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_keyring_init(gnutls_openpgp_keyring_t *
+ keyring) _GNUTLS_GCC_ATTR_DEPRECATED;
+void gnutls_openpgp_keyring_deinit(gnutls_openpgp_keyring_t keyring)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_keyring_import(gnutls_openpgp_keyring_t keyring,
const gnutls_datum_t * data,
- gnutls_openpgp_crt_fmt_t format) _GNUTLS_GCC_ATTR_DEPRECATED;
+ gnutls_openpgp_crt_fmt_t format)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_keyring_check_id(gnutls_openpgp_keyring_t ring,
const gnutls_openpgp_keyid_t
- keyid, unsigned int flags) _GNUTLS_GCC_ATTR_DEPRECATED;
-
+ keyid,
+ unsigned int flags)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_crt_verify_ring(gnutls_openpgp_crt_t key,
gnutls_openpgp_keyring_t
keyring, unsigned int flags,
unsigned int *verify
/* the output of the verification */
- ) _GNUTLS_GCC_ATTR_DEPRECATED;
+) _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_crt_verify_self(gnutls_openpgp_crt_t key,
unsigned int flags,
- unsigned int *verify) _GNUTLS_GCC_ATTR_DEPRECATED;
+ unsigned int *verify)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_openpgp_keyring_get_crt(gnutls_openpgp_keyring_t ring,
unsigned int idx,
- gnutls_openpgp_crt_t * cert) _GNUTLS_GCC_ATTR_DEPRECATED;
-
-int gnutls_openpgp_keyring_get_crt_count(gnutls_openpgp_keyring_t ring) _GNUTLS_GCC_ATTR_DEPRECATED;
-
+ gnutls_openpgp_crt_t *
+ cert) _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_keyring_get_crt_count(gnutls_openpgp_keyring_t ring)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
/**
* gnutls_openpgp_recv_key_func:
@@ -314,55 +365,56 @@ int gnutls_openpgp_keyring_get_crt_count(gnutls_openpgp_keyring_t ring) _GNUTLS_
* Returns: On success, %GNUTLS_E_SUCCESS (zero) is returned,
* otherwise an error code is returned.
*/
-typedef int (*gnutls_openpgp_recv_key_func) (gnutls_session_t
- session,
- const unsigned char
- *keyfpr,
- unsigned int
- keyfpr_length,
- gnutls_datum_t * key);
+typedef int (*gnutls_openpgp_recv_key_func)(gnutls_session_t
+ session,
+ const unsigned char
+ *keyfpr,
+ unsigned int
+ keyfpr_length,
+ gnutls_datum_t * key);
void
gnutls_openpgp_set_recv_key_function(gnutls_session_t session,
- gnutls_openpgp_recv_key_func func) _GNUTLS_GCC_ATTR_DEPRECATED;
-
-
+ gnutls_openpgp_recv_key_func func)
+_GNUTLS_GCC_ATTR_DEPRECATED;
/* certificate authentication stuff.
*/
int gnutls_certificate_set_openpgp_key
(gnutls_certificate_credentials_t res,
- gnutls_openpgp_crt_t crt, gnutls_openpgp_privkey_t pkey) _GNUTLS_GCC_ATTR_DEPRECATED;
+ gnutls_openpgp_crt_t crt,
+ gnutls_openpgp_privkey_t pkey) _GNUTLS_GCC_ATTR_DEPRECATED;
int
gnutls_certificate_get_openpgp_key(gnutls_certificate_credentials_t res,
- unsigned index,
- gnutls_openpgp_privkey_t *key) _GNUTLS_GCC_ATTR_DEPRECATED;
-int
-gnutls_certificate_get_openpgp_crt(gnutls_certificate_credentials_t res,
- unsigned index,
- gnutls_openpgp_crt_t **crt_list,
- unsigned *crt_list_size) _GNUTLS_GCC_ATTR_DEPRECATED;
-
-int
- gnutls_certificate_set_openpgp_key_file
+ unsigned index,
+ gnutls_openpgp_privkey_t *
+ key) _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_certificate_get_openpgp_crt(gnutls_certificate_credentials_t res,
+ unsigned index,
+ gnutls_openpgp_crt_t ** crt_list,
+ unsigned *crt_list_size)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
+
+int gnutls_certificate_set_openpgp_key_file
(gnutls_certificate_credentials_t res, const char *certfile,
- const char *keyfile, gnutls_openpgp_crt_fmt_t format) _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_certificate_set_openpgp_key_mem
- (gnutls_certificate_credentials_t res,
- const gnutls_datum_t * cert, const gnutls_datum_t * key,
+ const char *keyfile,
gnutls_openpgp_crt_fmt_t format) _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_certificate_set_openpgp_key_mem(gnutls_certificate_credentials_t res,
+ const gnutls_datum_t * cert,
+ const gnutls_datum_t * key,
+ gnutls_openpgp_crt_fmt_t format)
+ _GNUTLS_GCC_ATTR_DEPRECATED;
-int
- gnutls_certificate_set_openpgp_key_file2
+int gnutls_certificate_set_openpgp_key_file2
(gnutls_certificate_credentials_t res, const char *certfile,
const char *keyfile, const char *subkey_id,
gnutls_openpgp_crt_fmt_t format) _GNUTLS_GCC_ATTR_DEPRECATED;
-int
- gnutls_certificate_set_openpgp_key_mem2
+int gnutls_certificate_set_openpgp_key_mem2
(gnutls_certificate_credentials_t res,
const gnutls_datum_t * cert, const gnutls_datum_t * key,
- const char *subkey_id, gnutls_openpgp_crt_fmt_t format) _GNUTLS_GCC_ATTR_DEPRECATED;
+ const char *subkey_id,
+ gnutls_openpgp_crt_fmt_t format) _GNUTLS_GCC_ATTR_DEPRECATED;
int gnutls_certificate_set_openpgp_keyring_mem
(gnutls_certificate_credentials_t c, const unsigned char *data,
@@ -378,4 +430,4 @@ int gnutls_certificate_set_openpgp_keyring_file
#endif
/* *INDENT-ON* */
-#endif /* GNUTLS_OPENPGP_H */
+#endif /* GNUTLS_OPENPGP_H */
diff --git a/lib/includes/gnutls/pkcs11.h b/lib/includes/gnutls/pkcs11.h
index 2436069849..ba0e1addc8 100644
--- a/lib/includes/gnutls/pkcs11.h
+++ b/lib/includes/gnutls/pkcs11.h
@@ -22,11 +22,11 @@
*/
#ifndef GNUTLS_PKCS11_H
-#define GNUTLS_PKCS11_H
+# define GNUTLS_PKCS11_H
-#include <stdarg.h>
-#include <gnutls/gnutls.h>
-#include <gnutls/x509.h>
+# include <stdarg.h>
+# include <gnutls/gnutls.h>
+# include <gnutls/x509.h>
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -34,7 +34,7 @@ extern "C" {
#endif
/* *INDENT-ON* */
-#define GNUTLS_PKCS11_MAX_PIN_LEN 256
+# define GNUTLS_PKCS11_MAX_PIN_LEN 256
/**
* gnutls_pkcs11_token_callback_t:
@@ -54,34 +54,30 @@ extern "C" {
*
* Since: 2.12.0
**/
-typedef int (*gnutls_pkcs11_token_callback_t) (void *const
- userdata,
- const char *const
- label, unsigned retry);
-
+typedef int (*gnutls_pkcs11_token_callback_t)(void *const
+ userdata,
+ const char *const
+ label, unsigned retry);
struct gnutls_pkcs11_obj_st;
typedef struct gnutls_pkcs11_obj_st *gnutls_pkcs11_obj_t;
-
-#define GNUTLS_PKCS11_FLAG_MANUAL 0 /* Manual loading of libraries */
-#define GNUTLS_PKCS11_FLAG_AUTO 1 /* Automatically load libraries by reading /etc/gnutls/pkcs11.conf */
-#define GNUTLS_PKCS11_FLAG_AUTO_TRUSTED (1<<1) /* Automatically load trusted libraries by reading /etc/gnutls/pkcs11.conf */
+# define GNUTLS_PKCS11_FLAG_MANUAL 0 /* Manual loading of libraries */
+# define GNUTLS_PKCS11_FLAG_AUTO 1 /* Automatically load libraries by reading /etc/gnutls/pkcs11.conf */
+# define GNUTLS_PKCS11_FLAG_AUTO_TRUSTED (1<<1) /* Automatically load trusted libraries by reading /etc/gnutls/pkcs11.conf */
/* pkcs11.conf format:
* load = /lib/xxx-pkcs11.so
* load = /lib/yyy-pkcs11.so
*/
-int gnutls_pkcs11_init(unsigned int flags,
- const char *deprecated_config_file);
+int gnutls_pkcs11_init(unsigned int flags, const char *deprecated_config_file);
int gnutls_pkcs11_reinit(void);
void gnutls_pkcs11_deinit(void);
void gnutls_pkcs11_set_token_function
(gnutls_pkcs11_token_callback_t fn, void *userdata);
-void gnutls_pkcs11_set_pin_function(gnutls_pin_callback_t fn,
- void *userdata);
+void gnutls_pkcs11_set_pin_function(gnutls_pin_callback_t fn, void *userdata);
gnutls_pin_callback_t gnutls_pkcs11_get_pin_function(void
**userdata);
@@ -125,35 +121,37 @@ void gnutls_pkcs11_obj_set_pin_function(gnutls_pkcs11_obj_t obj,
* or retrieving objects.
*/
typedef enum gnutls_pkcs11_obj_flags {
- GNUTLS_PKCS11_OBJ_FLAG_LOGIN = (1<<0),
- GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED = (1<<1),
- GNUTLS_PKCS11_OBJ_FLAG_MARK_SENSITIVE = (1<<2),
- GNUTLS_PKCS11_OBJ_FLAG_LOGIN_SO = (1<<3),
- GNUTLS_PKCS11_OBJ_FLAG_MARK_PRIVATE = (1<<4),
- GNUTLS_PKCS11_OBJ_FLAG_MARK_NOT_PRIVATE = (1<<5),
- GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_ANY = (1<<6),
- GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_TRUSTED = GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED,
- GNUTLS_PKCS11_OBJ_FLAG_MARK_DISTRUSTED = (1<<8),
- GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_DISTRUSTED = GNUTLS_PKCS11_OBJ_FLAG_MARK_DISTRUSTED,
- GNUTLS_PKCS11_OBJ_FLAG_COMPARE = (1<<9),
- GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE = (1<<10),
- GNUTLS_PKCS11_OBJ_FLAG_MARK_CA = (1<<11),
- GNUTLS_PKCS11_OBJ_FLAG_MARK_KEY_WRAP = (1<<12),
- GNUTLS_PKCS11_OBJ_FLAG_COMPARE_KEY = (1<<13),
- GNUTLS_PKCS11_OBJ_FLAG_OVERWRITE_TRUSTMOD_EXT = (1<<14),
- GNUTLS_PKCS11_OBJ_FLAG_MARK_ALWAYS_AUTH = (1<<15),
- GNUTLS_PKCS11_OBJ_FLAG_MARK_EXTRACTABLE = (1<<16),
- GNUTLS_PKCS11_OBJ_FLAG_NEVER_EXTRACTABLE = (1<<17),
- GNUTLS_PKCS11_OBJ_FLAG_CRT = (1<<18),
- GNUTLS_PKCS11_OBJ_FLAG_WITH_PRIVKEY = (1<<19),
- GNUTLS_PKCS11_OBJ_FLAG_PUBKEY = (1<<20),
+ GNUTLS_PKCS11_OBJ_FLAG_LOGIN = (1 << 0),
+ GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED = (1 << 1),
+ GNUTLS_PKCS11_OBJ_FLAG_MARK_SENSITIVE = (1 << 2),
+ GNUTLS_PKCS11_OBJ_FLAG_LOGIN_SO = (1 << 3),
+ GNUTLS_PKCS11_OBJ_FLAG_MARK_PRIVATE = (1 << 4),
+ GNUTLS_PKCS11_OBJ_FLAG_MARK_NOT_PRIVATE = (1 << 5),
+ GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_ANY = (1 << 6),
+ GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_TRUSTED =
+ GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED,
+ GNUTLS_PKCS11_OBJ_FLAG_MARK_DISTRUSTED = (1 << 8),
+ GNUTLS_PKCS11_OBJ_FLAG_RETRIEVE_DISTRUSTED =
+ GNUTLS_PKCS11_OBJ_FLAG_MARK_DISTRUSTED,
+ GNUTLS_PKCS11_OBJ_FLAG_COMPARE = (1 << 9),
+ GNUTLS_PKCS11_OBJ_FLAG_PRESENT_IN_TRUSTED_MODULE = (1 << 10),
+ GNUTLS_PKCS11_OBJ_FLAG_MARK_CA = (1 << 11),
+ GNUTLS_PKCS11_OBJ_FLAG_MARK_KEY_WRAP = (1 << 12),
+ GNUTLS_PKCS11_OBJ_FLAG_COMPARE_KEY = (1 << 13),
+ GNUTLS_PKCS11_OBJ_FLAG_OVERWRITE_TRUSTMOD_EXT = (1 << 14),
+ GNUTLS_PKCS11_OBJ_FLAG_MARK_ALWAYS_AUTH = (1 << 15),
+ GNUTLS_PKCS11_OBJ_FLAG_MARK_EXTRACTABLE = (1 << 16),
+ GNUTLS_PKCS11_OBJ_FLAG_NEVER_EXTRACTABLE = (1 << 17),
+ GNUTLS_PKCS11_OBJ_FLAG_CRT = (1 << 18),
+ GNUTLS_PKCS11_OBJ_FLAG_WITH_PRIVKEY = (1 << 19),
+ GNUTLS_PKCS11_OBJ_FLAG_PUBKEY = (1 << 20),
GNUTLS_PKCS11_OBJ_FLAG_NO_STORE_PUBKEY = GNUTLS_PKCS11_OBJ_FLAG_PUBKEY,
- GNUTLS_PKCS11_OBJ_FLAG_PRIVKEY = (1<<21),
- GNUTLS_PKCS11_OBJ_FLAG_MARK_NOT_SENSITIVE = (1<<22),
+ GNUTLS_PKCS11_OBJ_FLAG_PRIVKEY = (1 << 21),
+ GNUTLS_PKCS11_OBJ_FLAG_MARK_NOT_SENSITIVE = (1 << 22),
/* flags 1<<29 and later are reserved - see pkcs11_int.h */
} gnutls_pkcs11_obj_flags;
-#define gnutls_pkcs11_obj_attr_t gnutls_pkcs11_obj_flags
+# define gnutls_pkcs11_obj_attr_t gnutls_pkcs11_obj_flags
/**
* gnutls_pkcs11_url_type_t:
@@ -173,39 +171,37 @@ int gnutls_pkcs11_obj_import_url(gnutls_pkcs11_obj_t obj,
const char *url, unsigned int flags
/* GNUTLS_PKCS11_OBJ_FLAG_* */ );
int gnutls_pkcs11_obj_export_url(gnutls_pkcs11_obj_t obj,
- gnutls_pkcs11_url_type_t detailed,
- char **url);
+ gnutls_pkcs11_url_type_t detailed, char **url);
void gnutls_pkcs11_obj_deinit(gnutls_pkcs11_obj_t obj);
int gnutls_pkcs11_obj_export(gnutls_pkcs11_obj_t obj,
- void *output_data, size_t * output_data_size);
-int gnutls_pkcs11_obj_export2(gnutls_pkcs11_obj_t obj,
- gnutls_datum_t * out);
+ void *output_data, size_t *output_data_size);
+int gnutls_pkcs11_obj_export2(gnutls_pkcs11_obj_t obj, gnutls_datum_t * out);
-int gnutls_pkcs11_obj_export3(gnutls_pkcs11_obj_t obj, gnutls_x509_crt_fmt_t fmt,
- gnutls_datum_t * out);
+int gnutls_pkcs11_obj_export3(gnutls_pkcs11_obj_t obj,
+ gnutls_x509_crt_fmt_t fmt, gnutls_datum_t * out);
int gnutls_pkcs11_get_raw_issuer(const char *url, gnutls_x509_crt_t cert,
- gnutls_datum_t * issuer,
- gnutls_x509_crt_fmt_t fmt,
- unsigned int flags);
-
-int gnutls_pkcs11_get_raw_issuer_by_dn (const char *url, const gnutls_datum_t *dn,
- gnutls_datum_t *issuer,
- gnutls_x509_crt_fmt_t fmt,
- unsigned int flags);
-
-int gnutls_pkcs11_get_raw_issuer_by_subject_key_id (const char *url,
- const gnutls_datum_t *dn,
- const gnutls_datum_t *spki,
- gnutls_datum_t *issuer,
- gnutls_x509_crt_fmt_t fmt,
- unsigned int flags);
+ gnutls_datum_t * issuer,
+ gnutls_x509_crt_fmt_t fmt, unsigned int flags);
+
+int gnutls_pkcs11_get_raw_issuer_by_dn(const char *url,
+ const gnutls_datum_t * dn,
+ gnutls_datum_t * issuer,
+ gnutls_x509_crt_fmt_t fmt,
+ unsigned int flags);
+
+int gnutls_pkcs11_get_raw_issuer_by_subject_key_id(const char *url,
+ const gnutls_datum_t * dn,
+ const gnutls_datum_t * spki,
+ gnutls_datum_t * issuer,
+ gnutls_x509_crt_fmt_t fmt,
+ unsigned int flags);
unsigned gnutls_pkcs11_crt_is_known(const char *url, gnutls_x509_crt_t cert,
- unsigned int flags);
+ unsigned int flags);
-#if 0
+# if 0
/* for documentation */
int gnutls_pkcs11_copy_x509_crt(const char *token_url,
gnutls_x509_crt_t crt,
@@ -215,46 +211,44 @@ int gnutls_pkcs11_copy_x509_crt(const char *token_url,
int gnutls_pkcs11_copy_x509_privkey(const char *token_url,
gnutls_x509_privkey_t key,
const char *label,
- unsigned int key_usage,
- unsigned int flags);
+ unsigned int key_usage, 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);
+ gnutls_datum_t * pubkey, unsigned int flags);
int
gnutls_pkcs11_privkey_generate(const char *url, gnutls_pk_algorithm_t pk,
unsigned int bits, const char *label,
unsigned int flags);
-#endif
+# endif
int
gnutls_pkcs11_copy_pubkey(const char *token_url,
gnutls_pubkey_t crt, const char *label,
- const gnutls_datum_t *cid,
+ const gnutls_datum_t * cid,
unsigned int key_usage, unsigned int flags);
-#define gnutls_pkcs11_copy_x509_crt(url, crt, label, flags) \
+# define gnutls_pkcs11_copy_x509_crt(url, crt, label, flags) \
gnutls_pkcs11_copy_x509_crt2(url, crt, label, NULL, flags)
int gnutls_pkcs11_copy_x509_crt2(const char *token_url,
- gnutls_x509_crt_t crt,
- const char *label,
- const gnutls_datum_t *id,
- unsigned int flags /* GNUTLS_PKCS11_OBJ_FLAG_* */);
+ gnutls_x509_crt_t crt,
+ const char *label,
+ const gnutls_datum_t * id, unsigned int flags
+ /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
-#define gnutls_pkcs11_copy_x509_privkey(url, key, label, usage, flags) \
+# define gnutls_pkcs11_copy_x509_privkey(url, key, label, usage, flags) \
gnutls_pkcs11_copy_x509_privkey2(url, key, label, NULL, usage, flags)
int gnutls_pkcs11_copy_x509_privkey2(const char *token_url,
- gnutls_x509_privkey_t key,
- const char *label,
- const gnutls_datum_t *cid,
- unsigned int key_usage
- /*GNUTLS_KEY_* */ ,
- unsigned int flags
- /* GNUTLS_PKCS11_OBJ_FLAG_* */
-);
+ gnutls_x509_privkey_t key,
+ const char *label,
+ const gnutls_datum_t * cid,
+ unsigned int key_usage
+ /*GNUTLS_KEY_* */ ,
+ unsigned int flags
+ /* GNUTLS_PKCS11_OBJ_FLAG_* */
+ );
int gnutls_pkcs11_delete_url(const char *object_url, unsigned int flags
/* GNUTLS_PKCS11_OBJ_FLAG_* */ );
@@ -298,25 +292,24 @@ typedef enum {
int
gnutls_pkcs11_obj_get_ptr(gnutls_pkcs11_obj_t obj, void **ptr,
void **session, void **ohandle,
- unsigned long *slot_id,
- unsigned int flags);
+ unsigned long *slot_id, unsigned int flags);
int gnutls_pkcs11_obj_get_info(gnutls_pkcs11_obj_t obj,
gnutls_pkcs11_obj_info_t itype,
- void *output, size_t * output_size);
+ void *output, size_t *output_size);
int gnutls_pkcs11_obj_set_info(gnutls_pkcs11_obj_t obj,
gnutls_pkcs11_obj_info_t itype,
const void *data, size_t data_size,
unsigned flags);
-#define GNUTLS_PKCS11_OBJ_ATTR_CRT_ALL GNUTLS_PKCS11_OBJ_FLAG_CRT
-#define GNUTLS_PKCS11_OBJ_ATTR_MATCH 0 /* always match the given URL */
-#define GNUTLS_PKCS11_OBJ_ATTR_ALL 0 /* match everything! */
-#define GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED (GNUTLS_PKCS11_OBJ_FLAG_CRT|GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED)
-#define GNUTLS_PKCS11_OBJ_ATTR_CRT_WITH_PRIVKEY (GNUTLS_PKCS11_OBJ_FLAG_CRT|GNUTLS_PKCS11_OBJ_FLAG_WITH_PRIVKEY)
-#define GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED_CA (GNUTLS_PKCS11_OBJ_FLAG_CRT|GNUTLS_PKCS11_OBJ_FLAG_MARK_CA|GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED)
-#define GNUTLS_PKCS11_OBJ_ATTR_PUBKEY GNUTLS_PKCS11_OBJ_FLAG_PUBKEY
-#define GNUTLS_PKCS11_OBJ_ATTR_PRIVKEY GNUTLS_PKCS11_OBJ_FLAG_PRIVKEY
+# define GNUTLS_PKCS11_OBJ_ATTR_CRT_ALL GNUTLS_PKCS11_OBJ_FLAG_CRT
+# define GNUTLS_PKCS11_OBJ_ATTR_MATCH 0 /* always match the given URL */
+# define GNUTLS_PKCS11_OBJ_ATTR_ALL 0 /* match everything! */
+# define GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED (GNUTLS_PKCS11_OBJ_FLAG_CRT|GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED)
+# define GNUTLS_PKCS11_OBJ_ATTR_CRT_WITH_PRIVKEY (GNUTLS_PKCS11_OBJ_FLAG_CRT|GNUTLS_PKCS11_OBJ_FLAG_WITH_PRIVKEY)
+# define GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED_CA (GNUTLS_PKCS11_OBJ_FLAG_CRT|GNUTLS_PKCS11_OBJ_FLAG_MARK_CA|GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED)
+# define GNUTLS_PKCS11_OBJ_ATTR_PUBKEY GNUTLS_PKCS11_OBJ_FLAG_PUBKEY
+# define GNUTLS_PKCS11_OBJ_ATTR_PRIVKEY GNUTLS_PKCS11_OBJ_FLAG_PRIVKEY
/**
* gnutls_pkcs11_token_info_t:
@@ -369,72 +362,68 @@ gnutls_pkcs11_token_get_ptr(const char *url, void **ptr, unsigned long *slot_id,
int
gnutls_pkcs11_token_get_mechanism(const char *url,
- unsigned int idx,
- unsigned long *mechanism);
+ unsigned int idx, unsigned long *mechanism);
unsigned
gnutls_pkcs11_token_check_mechanism(const char *url,
unsigned long mechanism,
void *ptr, unsigned psize, unsigned flags);
-int gnutls_pkcs11_token_set_pin(const char *token_url, const char *oldpin, const char *newpin, unsigned int flags /*gnutls_pin_flag_t */);
+int gnutls_pkcs11_token_set_pin(const char *token_url, const char *oldpin,
+ const char *newpin,
+ unsigned int flags /*gnutls_pin_flag_t */ );
int gnutls_pkcs11_token_get_url(unsigned int seq,
- gnutls_pkcs11_url_type_t detailed,
- char **url);
+ gnutls_pkcs11_url_type_t detailed, char **url);
int gnutls_pkcs11_token_get_info(const char *url,
gnutls_pkcs11_token_info_t ttype,
- void *output, size_t * output_size);
-
-#define GNUTLS_PKCS11_TOKEN_HW 1
-#define GNUTLS_PKCS11_TOKEN_TRUSTED (1<<1) /* p11-kit trusted */
-#define GNUTLS_PKCS11_TOKEN_RNG (1<<2) /* CKF_RNG */
-#define GNUTLS_PKCS11_TOKEN_LOGIN_REQUIRED (1<<3) /* CKF_LOGIN_REQUIRED */
-#define GNUTLS_PKCS11_TOKEN_PROTECTED_AUTHENTICATION_PATH (1<<4) /* CKF_PROTECTED_AUTHENTICATION_PATH */
-#define GNUTLS_PKCS11_TOKEN_INITIALIZED (1<<5) /* CKF_TOKEN_INITIALIZED */
-#define GNUTLS_PKCS11_TOKEN_USER_PIN_COUNT_LOW (1<<6) /* CKF_USER_PIN_COUNT_LOW */
-#define GNUTLS_PKCS11_TOKEN_USER_PIN_FINAL_TRY (1<<7) /* CKF_USER_PIN_FINAL_TRY */
-#define GNUTLS_PKCS11_TOKEN_USER_PIN_LOCKED (1<<8) /* CKF_USER_PIN_LOCKED */
-#define GNUTLS_PKCS11_TOKEN_SO_PIN_COUNT_LOW (1<<9) /* CKF_SO_PIN_COUNT_LOW */
-#define GNUTLS_PKCS11_TOKEN_SO_PIN_FINAL_TRY (1<<10) /* CKF_SO_PIN_FINAL_TRY */
-#define GNUTLS_PKCS11_TOKEN_SO_PIN_LOCKED (1<<11) /* CKF_SO_PIN_LOCKED */
-#define GNUTLS_PKCS11_TOKEN_USER_PIN_INITIALIZED (1<<12) /* CKF_USER_PIN_INITIALIZED */
-#define GNUTLS_PKCS11_TOKEN_ERROR_STATE (1<<13) /* CKF_ERROR_STATE */
+ void *output, size_t *output_size);
+
+# define GNUTLS_PKCS11_TOKEN_HW 1
+# define GNUTLS_PKCS11_TOKEN_TRUSTED (1<<1) /* p11-kit trusted */
+# define GNUTLS_PKCS11_TOKEN_RNG (1<<2) /* CKF_RNG */
+# define GNUTLS_PKCS11_TOKEN_LOGIN_REQUIRED (1<<3) /* CKF_LOGIN_REQUIRED */
+# define GNUTLS_PKCS11_TOKEN_PROTECTED_AUTHENTICATION_PATH (1<<4) /* CKF_PROTECTED_AUTHENTICATION_PATH */
+# define GNUTLS_PKCS11_TOKEN_INITIALIZED (1<<5) /* CKF_TOKEN_INITIALIZED */
+# define GNUTLS_PKCS11_TOKEN_USER_PIN_COUNT_LOW (1<<6) /* CKF_USER_PIN_COUNT_LOW */
+# define GNUTLS_PKCS11_TOKEN_USER_PIN_FINAL_TRY (1<<7) /* CKF_USER_PIN_FINAL_TRY */
+# define GNUTLS_PKCS11_TOKEN_USER_PIN_LOCKED (1<<8) /* CKF_USER_PIN_LOCKED */
+# define GNUTLS_PKCS11_TOKEN_SO_PIN_COUNT_LOW (1<<9) /* CKF_SO_PIN_COUNT_LOW */
+# define GNUTLS_PKCS11_TOKEN_SO_PIN_FINAL_TRY (1<<10) /* CKF_SO_PIN_FINAL_TRY */
+# define GNUTLS_PKCS11_TOKEN_SO_PIN_LOCKED (1<<11) /* CKF_SO_PIN_LOCKED */
+# define GNUTLS_PKCS11_TOKEN_USER_PIN_INITIALIZED (1<<12) /* CKF_USER_PIN_INITIALIZED */
+# define GNUTLS_PKCS11_TOKEN_ERROR_STATE (1<<13)/* CKF_ERROR_STATE */
int gnutls_pkcs11_token_get_flags(const char *url, unsigned int *flags);
-#define gnutls_pkcs11_obj_list_import_url(p_list, n_list, url, attrs, flags) gnutls_pkcs11_obj_list_import_url3(p_list, n_list, url, attrs|flags)
-#define gnutls_pkcs11_obj_list_import_url2(p_list, n_list, url, attrs, flags) gnutls_pkcs11_obj_list_import_url4(p_list, n_list, url, attrs|flags)
+# define gnutls_pkcs11_obj_list_import_url(p_list, n_list, url, attrs, flags) gnutls_pkcs11_obj_list_import_url3(p_list, n_list, url, attrs|flags)
+# define gnutls_pkcs11_obj_list_import_url2(p_list, n_list, url, attrs, flags) gnutls_pkcs11_obj_list_import_url4(p_list, n_list, url, attrs|flags)
int gnutls_pkcs11_obj_list_import_url3(gnutls_pkcs11_obj_t * p_list,
- unsigned int *const n_list,
- const char *url,
- unsigned int flags
- /* GNUTLS_PKCS11_OBJ_FLAG_* */
+ unsigned int *const n_list,
+ const char *url, unsigned int flags
+ /* GNUTLS_PKCS11_OBJ_FLAG_* */
);
int
gnutls_pkcs11_obj_list_import_url4(gnutls_pkcs11_obj_t ** p_list,
unsigned int *n_list,
- const char *url,
- unsigned int flags
+ const char *url, unsigned int flags
/* GNUTLS_PKCS11_OBJ_FLAG_* */
);
int gnutls_x509_crt_import_pkcs11(gnutls_x509_crt_t crt,
gnutls_pkcs11_obj_t pkcs11_crt);
-gnutls_pkcs11_obj_type_t
-gnutls_pkcs11_obj_get_type(gnutls_pkcs11_obj_t obj);
+gnutls_pkcs11_obj_type_t gnutls_pkcs11_obj_get_type(gnutls_pkcs11_obj_t obj);
const char *gnutls_pkcs11_type_get_name(gnutls_pkcs11_obj_type_t type);
int
gnutls_pkcs11_obj_get_exts(gnutls_pkcs11_obj_t obj,
- struct gnutls_x509_ext_st **exts, unsigned int *exts_size,
- unsigned int flags);
+ struct gnutls_x509_ext_st **exts,
+ unsigned int *exts_size, unsigned int flags);
-int
-gnutls_pkcs11_obj_get_flags(gnutls_pkcs11_obj_t obj, unsigned int *oflags);
+int gnutls_pkcs11_obj_get_flags(gnutls_pkcs11_obj_t obj, unsigned int *oflags);
char *gnutls_pkcs11_obj_flags_get_str(unsigned int flags);
int gnutls_x509_crt_list_import_pkcs11(gnutls_x509_crt_t * certs,
@@ -459,7 +448,7 @@ int gnutls_pkcs11_privkey_get_pk_algorithm(gnutls_pkcs11_privkey_t
key, unsigned int *bits);
int gnutls_pkcs11_privkey_get_info(gnutls_pkcs11_privkey_t pkey,
gnutls_pkcs11_obj_info_t itype,
- void *output, size_t * output_size);
+ void *output, size_t *output_size);
int gnutls_pkcs11_privkey_import_url(gnutls_pkcs11_privkey_t pkey,
const char *url, unsigned int flags);
@@ -469,10 +458,10 @@ int gnutls_pkcs11_privkey_export_url(gnutls_pkcs11_privkey_t key,
detailed, char **url);
unsigned gnutls_pkcs11_privkey_status(gnutls_pkcs11_privkey_t key);
-#define gnutls_pkcs11_privkey_generate(url, pk, bits, label, flags) \
+# define gnutls_pkcs11_privkey_generate(url, pk, bits, label, flags) \
gnutls_pkcs11_privkey_generate3(url, pk, bits, label, NULL, 0, NULL, 0, flags)
-#define gnutls_pkcs11_privkey_generate2(url, pk, bits, label, fmt, pubkey, flags) \
+# define gnutls_pkcs11_privkey_generate2(url, pk, bits, label, fmt, pubkey, flags) \
gnutls_pkcs11_privkey_generate3(url, pk, bits, label, NULL, fmt, pubkey, 0, flags)
int
@@ -480,30 +469,27 @@ gnutls_pkcs11_privkey_generate3(const char *url,
gnutls_pk_algorithm_t pk,
unsigned int bits,
const char *label,
- const gnutls_datum_t *cid,
+ const gnutls_datum_t * cid,
gnutls_x509_crt_fmt_t fmt,
gnutls_datum_t * pubkey,
- unsigned int key_usage,
- unsigned int flags);
+ unsigned int key_usage, unsigned int flags);
int
gnutls_pkcs11_privkey_export_pubkey(gnutls_pkcs11_privkey_t pkey,
- gnutls_x509_crt_fmt_t fmt,
- gnutls_datum_t * pubkey,
- unsigned int flags);
+ gnutls_x509_crt_fmt_t fmt,
+ gnutls_datum_t * pubkey,
+ unsigned int flags);
int
-gnutls_pkcs11_token_get_random(const char *token_url,
- void *data, size_t len);
+gnutls_pkcs11_token_get_random(const char *token_url, void *data, size_t len);
int
gnutls_pkcs11_copy_attached_extension(const char *token_url,
gnutls_x509_crt_t crt,
- gnutls_datum_t *data,
- const char *label,
- unsigned int flags);
+ gnutls_datum_t * data,
+ const char *label, unsigned int flags);
-#define gnutls_x509_crt_import_pkcs11_url gnutls_x509_crt_import_url
+# define gnutls_x509_crt_import_pkcs11_url gnutls_x509_crt_import_url
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -511,4 +497,4 @@ gnutls_pkcs11_copy_attached_extension(const char *token_url,
#endif
/* *INDENT-ON* */
-#endif /* GNUTLS_PKCS11_H */
+#endif /* GNUTLS_PKCS11_H */
diff --git a/lib/includes/gnutls/pkcs12.h b/lib/includes/gnutls/pkcs12.h
index e613fe12f5..1f4874eb8c 100644
--- a/lib/includes/gnutls/pkcs12.h
+++ b/lib/includes/gnutls/pkcs12.h
@@ -21,9 +21,9 @@
*/
#ifndef GNUTLS_PKCS12_H
-#define GNUTLS_PKCS12_H
+# define GNUTLS_PKCS12_H
-#include <gnutls/x509.h>
+# include <gnutls/x509.h>
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -46,17 +46,17 @@ int gnutls_pkcs12_import(gnutls_pkcs12_t pkcs12,
gnutls_x509_crt_fmt_t format, unsigned int flags);
int gnutls_pkcs12_export(gnutls_pkcs12_t pkcs12,
gnutls_x509_crt_fmt_t format,
- void *output_data, size_t * output_data_size);
+ void *output_data, size_t *output_data_size);
int gnutls_pkcs12_export2(gnutls_pkcs12_t pkcs12,
- gnutls_x509_crt_fmt_t format,
- gnutls_datum_t * out);
+ gnutls_x509_crt_fmt_t format, gnutls_datum_t * out);
int gnutls_pkcs12_get_bag(gnutls_pkcs12_t pkcs12,
int indx, gnutls_pkcs12_bag_t bag);
int gnutls_pkcs12_set_bag(gnutls_pkcs12_t pkcs12, gnutls_pkcs12_bag_t bag);
int gnutls_pkcs12_generate_mac(gnutls_pkcs12_t pkcs12, const char *pass);
-int gnutls_pkcs12_generate_mac2(gnutls_pkcs12_t pkcs12, gnutls_mac_algorithm_t mac, const char *pass);
+int gnutls_pkcs12_generate_mac2(gnutls_pkcs12_t pkcs12,
+ gnutls_mac_algorithm_t mac, const char *pass);
int gnutls_pkcs12_verify_mac(gnutls_pkcs12_t pkcs12, const char *pass);
int gnutls_pkcs12_bag_decrypt(gnutls_pkcs12_bag_t bag, const char *pass);
@@ -64,13 +64,15 @@ int gnutls_pkcs12_bag_encrypt(gnutls_pkcs12_bag_t bag,
const char *pass, unsigned int flags);
int
-gnutls_pkcs12_bag_enc_info(gnutls_pkcs12_bag_t bag, unsigned int *schema, unsigned int *cipher,
- void *salt, unsigned int *salt_size, unsigned int *iter_count, char **oid);
-int
-gnutls_pkcs12_mac_info(gnutls_pkcs12_t pkcs12, unsigned int *mac,
- void *salt, unsigned int *salt_size, unsigned int *iter_count, char **oid);
-
-#define GNUTLS_PKCS12_SP_INCLUDE_SELF_SIGNED 1
+gnutls_pkcs12_bag_enc_info(gnutls_pkcs12_bag_t bag, unsigned int *schema,
+ unsigned int *cipher, void *salt,
+ unsigned int *salt_size, unsigned int *iter_count,
+ char **oid);
+int gnutls_pkcs12_mac_info(gnutls_pkcs12_t pkcs12, unsigned int *mac,
+ void *salt, unsigned int *salt_size,
+ unsigned int *iter_count, char **oid);
+
+# define GNUTLS_PKCS12_SP_INCLUDE_SELF_SIGNED 1
int gnutls_pkcs12_simple_parse(gnutls_pkcs12_t p12,
const char *password,
gnutls_x509_privkey_t * key,
@@ -78,8 +80,7 @@ int gnutls_pkcs12_simple_parse(gnutls_pkcs12_t p12,
unsigned int *chain_len,
gnutls_x509_crt_t ** extra_certs,
unsigned int *extra_certs_len,
- gnutls_x509_crl_t * crl,
- unsigned int flags);
+ gnutls_x509_crl_t * crl, unsigned int flags);
/**
* gnutls_pkcs12_bag_type_t:
@@ -109,17 +110,14 @@ typedef enum gnutls_pkcs12_bag_type_t {
GNUTLS_BAG_UNKNOWN = 20
} gnutls_pkcs12_bag_type_t;
-int
-gnutls_pkcs12_bag_get_type(gnutls_pkcs12_bag_t bag, unsigned indx);
+int gnutls_pkcs12_bag_get_type(gnutls_pkcs12_bag_t bag, unsigned indx);
int gnutls_pkcs12_bag_get_data(gnutls_pkcs12_bag_t bag, unsigned indx,
gnutls_datum_t * data);
int gnutls_pkcs12_bag_set_data(gnutls_pkcs12_bag_t bag,
gnutls_pkcs12_bag_type_t type,
const gnutls_datum_t * data);
-int gnutls_pkcs12_bag_set_crl(gnutls_pkcs12_bag_t bag,
- gnutls_x509_crl_t crl);
-int gnutls_pkcs12_bag_set_crt(gnutls_pkcs12_bag_t bag,
- gnutls_x509_crt_t crt);
+int gnutls_pkcs12_bag_set_crl(gnutls_pkcs12_bag_t bag, gnutls_x509_crl_t crl);
+int gnutls_pkcs12_bag_set_crt(gnutls_pkcs12_bag_t bag, gnutls_x509_crt_t crt);
int
gnutls_pkcs12_bag_set_privkey(gnutls_pkcs12_bag_t bag,
@@ -146,4 +144,4 @@ int gnutls_pkcs12_bag_set_friendly_name(gnutls_pkcs12_bag_t bag,
#endif
/* *INDENT-ON* */
-#endif /* GNUTLS_PKCS12_H */
+#endif /* GNUTLS_PKCS12_H */
diff --git a/lib/includes/gnutls/pkcs7.h b/lib/includes/gnutls/pkcs7.h
index 528427b484..b6a223ed9c 100644
--- a/lib/includes/gnutls/pkcs7.h
+++ b/lib/includes/gnutls/pkcs7.h
@@ -26,10 +26,10 @@
*/
#ifndef GNUTLS_PKCS7_H
-#define GNUTLS_PKCS7_H
+# define GNUTLS_PKCS7_H
-#include <gnutls/gnutls.h>
-#include <gnutls/x509.h>
+# include <gnutls/gnutls.h>
+# include <gnutls/x509.h>
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -49,34 +49,31 @@ int gnutls_pkcs7_import(gnutls_pkcs7_t pkcs7,
gnutls_x509_crt_fmt_t format);
int gnutls_pkcs7_export(gnutls_pkcs7_t pkcs7,
gnutls_x509_crt_fmt_t format,
- void *output_data, size_t * output_data_size);
+ void *output_data, size_t *output_data_size);
int gnutls_pkcs7_export2(gnutls_pkcs7_t pkcs7,
- gnutls_x509_crt_fmt_t format,
- gnutls_datum_t * out);
+ gnutls_x509_crt_fmt_t format, gnutls_datum_t * out);
int gnutls_pkcs7_get_signature_count(gnutls_pkcs7_t pkcs7);
-#define GNUTLS_PKCS7_EDATA_GET_RAW (1<<24)
-int gnutls_pkcs7_get_embedded_data(gnutls_pkcs7_t pkcs7, unsigned flags, gnutls_datum_t *data);
+# define GNUTLS_PKCS7_EDATA_GET_RAW (1<<24)
+int gnutls_pkcs7_get_embedded_data(gnutls_pkcs7_t pkcs7, unsigned flags,
+ gnutls_datum_t * data);
-const char *
-gnutls_pkcs7_get_embedded_data_oid(gnutls_pkcs7_t pkcs7);
+const char *gnutls_pkcs7_get_embedded_data_oid(gnutls_pkcs7_t pkcs7);
int gnutls_pkcs7_get_crt_count(gnutls_pkcs7_t pkcs7);
int gnutls_pkcs7_get_crt_raw(gnutls_pkcs7_t pkcs7, unsigned indx,
- void *certificate, size_t * certificate_size);
+ void *certificate, size_t *certificate_size);
-int gnutls_pkcs7_set_crt_raw(gnutls_pkcs7_t pkcs7,
- const gnutls_datum_t * crt);
+int gnutls_pkcs7_set_crt_raw(gnutls_pkcs7_t pkcs7, const gnutls_datum_t * crt);
int gnutls_pkcs7_set_crt(gnutls_pkcs7_t pkcs7, gnutls_x509_crt_t crt);
int gnutls_pkcs7_delete_crt(gnutls_pkcs7_t pkcs7, int indx);
int gnutls_pkcs7_get_crl_raw(gnutls_pkcs7_t pkcs7,
- unsigned indx, void *crl, size_t * crl_size);
+ unsigned indx, void *crl, size_t *crl_size);
int gnutls_pkcs7_get_crl_count(gnutls_pkcs7_t pkcs7);
-int gnutls_pkcs7_set_crl_raw(gnutls_pkcs7_t pkcs7,
- const gnutls_datum_t * crl);
+int gnutls_pkcs7_set_crl_raw(gnutls_pkcs7_t pkcs7, const gnutls_datum_t * crl);
int gnutls_pkcs7_set_crl(gnutls_pkcs7_t pkcs7, gnutls_x509_crl_t crl);
int gnutls_pkcs7_delete_crl(gnutls_pkcs7_t pkcs7, int indx);
@@ -94,19 +91,24 @@ typedef struct gnutls_pkcs7_signature_info_st {
char pad[64];
} gnutls_pkcs7_signature_info_st;
-void gnutls_pkcs7_signature_info_deinit(gnutls_pkcs7_signature_info_st *info);
-int gnutls_pkcs7_get_signature_info(gnutls_pkcs7_t pkcs7, unsigned idx, gnutls_pkcs7_signature_info_st *info);
+void gnutls_pkcs7_signature_info_deinit(gnutls_pkcs7_signature_info_st * info);
+int gnutls_pkcs7_get_signature_info(gnutls_pkcs7_t pkcs7, unsigned idx,
+ gnutls_pkcs7_signature_info_st * info);
int gnutls_pkcs7_verify_direct(gnutls_pkcs7_t pkcs7, gnutls_x509_crt_t signer,
- unsigned idx, const gnutls_datum_t *data, unsigned flags);
+ unsigned idx, const gnutls_datum_t * data,
+ unsigned flags);
int gnutls_pkcs7_verify(gnutls_pkcs7_t pkcs7, gnutls_x509_trust_list_t tl,
gnutls_typed_vdata_st * vdata, unsigned int vdata_size,
- unsigned idx, const gnutls_datum_t *data, unsigned flags);
+ unsigned idx, const gnutls_datum_t * data,
+ unsigned flags);
-#define GNUTLS_PKCS7_ATTR_ENCODE_OCTET_STRING 1
-int gnutls_pkcs7_add_attr(gnutls_pkcs7_attrs_t *list, const char *oid, gnutls_datum_t *data, unsigned flags);
+# define GNUTLS_PKCS7_ATTR_ENCODE_OCTET_STRING 1
+int gnutls_pkcs7_add_attr(gnutls_pkcs7_attrs_t * list, const char *oid,
+ gnutls_datum_t * data, unsigned flags);
void gnutls_pkcs7_attrs_deinit(gnutls_pkcs7_attrs_t list);
-int gnutls_pkcs7_get_attr(gnutls_pkcs7_attrs_t list, unsigned idx, char **oid, gnutls_datum_t *data, unsigned flags);
+int gnutls_pkcs7_get_attr(gnutls_pkcs7_attrs_t list, unsigned idx, char **oid,
+ gnutls_datum_t * data, unsigned flags);
/**
* gnutls_pkcs7_sign_flags:
@@ -119,26 +121,25 @@ int gnutls_pkcs7_get_attr(gnutls_pkcs7_attrs_t list, unsigned idx, char **oid, g
*/
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_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,
gnutls_x509_crt_t signer,
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 unsigned_attrs,
- gnutls_digest_algorithm_t dig,
- unsigned flags);
+ gnutls_digest_algorithm_t dig, unsigned flags);
int
gnutls_pkcs7_get_crt_raw2(gnutls_pkcs7_t pkcs7,
- unsigned indx, gnutls_datum_t *cert);
+ unsigned indx, gnutls_datum_t * cert);
int
gnutls_pkcs7_get_crl_raw2(gnutls_pkcs7_t pkcs7,
- unsigned indx, gnutls_datum_t *crl);
+ unsigned indx, gnutls_datum_t * crl);
int gnutls_pkcs7_print(gnutls_pkcs7_t pkcs7,
gnutls_certificate_print_formats_t format,
@@ -154,4 +155,4 @@ int gnutls_pkcs7_print_signature_info(gnutls_pkcs7_signature_info_st * info,
#endif
/* *INDENT-ON* */
-#endif /* GNUTLS_PKCS7_H */
+#endif /* GNUTLS_PKCS7_H */
diff --git a/lib/includes/gnutls/self-test.h b/lib/includes/gnutls/self-test.h
index 88b5a8dbf9..0d5989e63a 100644
--- a/lib/includes/gnutls/self-test.h
+++ b/lib/includes/gnutls/self-test.h
@@ -21,14 +21,14 @@
*/
#ifndef GNUTLS_SELF_TEST_H
-#define GNUTLS_SELF_TEST_H
+# define GNUTLS_SELF_TEST_H
-#include <gnutls/gnutls.h>
+# include <gnutls/gnutls.h>
/* Self checking functions */
-
-#define GNUTLS_SELF_TEST_FLAG_ALL 1
-#define GNUTLS_SELF_TEST_FLAG_NO_COMPAT (1<<1)
+
+# define GNUTLS_SELF_TEST_FLAG_ALL 1
+# define GNUTLS_SELF_TEST_FLAG_NO_COMPAT (1<<1)
int gnutls_cipher_self_test(unsigned flags, gnutls_cipher_algorithm_t cipher);
int gnutls_mac_self_test(unsigned flags, gnutls_mac_algorithm_t mac);
@@ -38,4 +38,4 @@ int gnutls_hkdf_self_test(unsigned flags, gnutls_mac_algorithm_t mac);
int gnutls_pbkdf2_self_test(unsigned flags, gnutls_mac_algorithm_t mac);
int gnutls_tlsprf_self_test(unsigned flags, gnutls_mac_algorithm_t mac);
-#endif /* GNUTLS_SELF_TEST_H */
+#endif /* GNUTLS_SELF_TEST_H */
diff --git a/lib/includes/gnutls/socket.h b/lib/includes/gnutls/socket.h
index 64eb19f896..9669e142eb 100644
--- a/lib/includes/gnutls/socket.h
+++ b/lib/includes/gnutls/socket.h
@@ -24,12 +24,12 @@
*/
#ifndef GNUTLS_SOCKET_H
-#define GNUTLS_SOCKET_H
+# define GNUTLS_SOCKET_H
-#include <gnutls/gnutls.h>
+# include <gnutls/gnutls.h>
/* Get socklen_t */
-#include <sys/socket.h>
+# include <sys/socket.h>
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -38,10 +38,10 @@ extern "C" {
/* *INDENT-ON* */
void gnutls_transport_set_fastopen(gnutls_session_t session,
- int fd,
- struct sockaddr *connect_addr,
- socklen_t connect_addrlen,
- unsigned int flags);
+ int fd,
+ struct sockaddr *connect_addr,
+ socklen_t connect_addrlen,
+ unsigned int flags);
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -49,4 +49,4 @@ void gnutls_transport_set_fastopen(gnutls_session_t session,
#endif
/* *INDENT-ON* */
-#endif /* GNUTLS_SOCKET_H */
+#endif /* GNUTLS_SOCKET_H */
diff --git a/lib/includes/gnutls/system-keys.h b/lib/includes/gnutls/system-keys.h
index a0aa056dfa..9b58451462 100644
--- a/lib/includes/gnutls/system-keys.h
+++ b/lib/includes/gnutls/system-keys.h
@@ -21,10 +21,10 @@
*/
#ifndef GNUTLS_SYSTEM_KEYS_H
-#define GNUTLS_SYSTEM_KEYS_H
+# define GNUTLS_SYSTEM_KEYS_H
-#include <gnutls/gnutls.h>
-#include <gnutls/x509.h>
+# include <gnutls/gnutls.h>
+# include <gnutls/x509.h>
/* This API allows to access user key and certificate pairs that are
* available in the current system. If any passwords are required,
@@ -42,18 +42,17 @@ typedef struct system_key_iter_st *gnutls_system_key_iter_t;
void gnutls_system_key_iter_deinit(gnutls_system_key_iter_t iter);
int
-gnutls_system_key_iter_get_info(gnutls_system_key_iter_t *iter,
- unsigned cert_type /* gnutls_certificate_type_t */,
- char **cert_url,
- char **key_url,
- char **label,
- gnutls_datum_t *der,
- unsigned int flags);
+gnutls_system_key_iter_get_info(gnutls_system_key_iter_t * iter,
+ unsigned cert_type
+ /* gnutls_certificate_type_t */ ,
+ char **cert_url, char **key_url, char **label,
+ gnutls_datum_t * der, unsigned int flags);
int gnutls_system_key_delete(const char *cert_url, const char *key_url);
-int gnutls_system_key_add_x509(gnutls_x509_crt_t crt, gnutls_x509_privkey_t privkey,
- const char *label, char **cert_url, char **key_url);
+int gnutls_system_key_add_x509(gnutls_x509_crt_t crt,
+ gnutls_x509_privkey_t privkey, const char *label,
+ char **cert_url, char **key_url);
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -61,4 +60,4 @@ int gnutls_system_key_add_x509(gnutls_x509_crt_t crt, gnutls_x509_privkey_t priv
#endif
/* *INDENT-ON* */
-#endif /* GNUTLS_SYSTEM_KEYS_H */
+#endif /* GNUTLS_SYSTEM_KEYS_H */
diff --git a/lib/includes/gnutls/tpm.h b/lib/includes/gnutls/tpm.h
index b5da3e994f..f899bd46d6 100644
--- a/lib/includes/gnutls/tpm.h
+++ b/lib/includes/gnutls/tpm.h
@@ -21,10 +21,10 @@
*/
#ifndef GNUTLS_TPM_H
-#define GNUTLS_TPM_H
+# define GNUTLS_TPM_H
-#include <gnutls/gnutls.h>
-#include <gnutls/x509.h>
+# include <gnutls/gnutls.h>
+# include <gnutls/x509.h>
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -35,9 +35,9 @@ extern "C" {
struct tpm_key_list_st;
typedef struct tpm_key_list_st *gnutls_tpm_key_list_t;
-#define GNUTLS_TPM_KEY_SIGNING (1<<1)
-#define GNUTLS_TPM_REGISTER_KEY (1<<2)
-#define GNUTLS_TPM_KEY_USER (1<<3)
+# define GNUTLS_TPM_KEY_SIGNING (1<<1)
+# define GNUTLS_TPM_REGISTER_KEY (1<<2)
+# define GNUTLS_TPM_KEY_USER (1<<3)
/**
* gnutls_tpmkey_fmt_t:
@@ -77,4 +77,4 @@ int gnutls_tpm_privkey_delete(const char *url, const char *srk_password);
#endif
/* *INDENT-ON* */
-#endif /* GNUTLS_TPM_H */
+#endif /* GNUTLS_TPM_H */
diff --git a/lib/includes/gnutls/urls.h b/lib/includes/gnutls/urls.h
index f4fd5a7915..87ab5e6db5 100644
--- a/lib/includes/gnutls/urls.h
+++ b/lib/includes/gnutls/urls.h
@@ -21,11 +21,11 @@
*/
#ifndef GNUTLS_URLS_H
-#define GNUTLS_URLS_H
+# define GNUTLS_URLS_H
-#include <gnutls/gnutls.h>
-#include <gnutls/x509.h>
-#include <gnutls/abstract.h>
+# include <gnutls/gnutls.h>
+# include <gnutls/x509.h>
+# include <gnutls/abstract.h>
/* This API allows to register application specific URLs for
* keys and certificates.
@@ -38,10 +38,10 @@ extern "C" {
/* *INDENT-ON* */
typedef int (*gnutls_privkey_import_url_func)(gnutls_privkey_t pkey,
- const char *url, unsigned flags);
+ const char *url, unsigned flags);
typedef int (*gnutls_x509_crt_import_url_func)(gnutls_x509_crt_t pkey,
- const char *url, unsigned flags);
+ const char *url, unsigned flags);
/* The following callbacks are optional */
@@ -53,8 +53,10 @@ typedef int (*gnutls_pubkey_import_url_func)(gnutls_pubkey_t pkey,
* the initial certificate URL and the certificate to find its issuer, and must
* return zero and the DER encoding of the issuer's certificate. If not available,
* it should return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE. */
-typedef int (*gnutls_get_raw_issuer_func)(const char *url, gnutls_x509_crt_t crt,
- gnutls_datum_t *issuer_der, unsigned flags);
+typedef int (*gnutls_get_raw_issuer_func)(const char *url,
+ gnutls_x509_crt_t crt,
+ gnutls_datum_t * issuer_der,
+ unsigned flags);
typedef struct gnutls_custom_url_st {
const char *name;
@@ -63,11 +65,11 @@ typedef struct gnutls_custom_url_st {
gnutls_x509_crt_import_url_func import_crt;
gnutls_pubkey_import_url_func import_pubkey;
gnutls_get_raw_issuer_func get_issuer;
- void *future1; /* replace in a future extension */
- void *future2; /* replace in a future extension */
+ void *future1; /* replace in a future extension */
+ void *future2; /* replace in a future extension */
} gnutls_custom_url_st;
-int gnutls_register_custom_url(const gnutls_custom_url_st *st);
+int gnutls_register_custom_url(const gnutls_custom_url_st * st);
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -75,4 +77,4 @@ int gnutls_register_custom_url(const gnutls_custom_url_st *st);
#endif
/* *INDENT-ON* */
-#endif /* GNUTLS_URLS_H */
+#endif /* GNUTLS_URLS_H */
diff --git a/lib/includes/gnutls/x509-ext.h b/lib/includes/gnutls/x509-ext.h
index 459c1e8b14..a164e4af73 100644
--- a/lib/includes/gnutls/x509-ext.h
+++ b/lib/includes/gnutls/x509-ext.h
@@ -23,10 +23,10 @@
/* Prototypes for direct handling of extension data */
#ifndef GNUTLS_X509_EXT_H
-#define GNUTLS_X509_EXT_H
+# define GNUTLS_X509_EXT_H
-#include <gnutls/gnutls.h>
-#include <gnutls/x509.h>
+# include <gnutls/gnutls.h>
+# include <gnutls/x509.h>
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -38,141 +38,140 @@ typedef struct gnutls_subject_alt_names_st *gnutls_subject_alt_names_t;
int gnutls_subject_alt_names_init(gnutls_subject_alt_names_t *);
void gnutls_subject_alt_names_deinit(gnutls_subject_alt_names_t sans);
-int gnutls_subject_alt_names_get(gnutls_subject_alt_names_t sans, unsigned int seq,
- unsigned int *san_type, gnutls_datum_t * san,
+int gnutls_subject_alt_names_get(gnutls_subject_alt_names_t sans,
+ unsigned int seq, unsigned int *san_type,
+ gnutls_datum_t * san,
gnutls_datum_t * othername_oid);
int gnutls_subject_alt_names_set(gnutls_subject_alt_names_t sans,
unsigned int san_type,
const gnutls_datum_t * san,
- const char* othername_oid);
-
+ const char *othername_oid);
int gnutls_x509_ext_import_subject_alt_names(const gnutls_datum_t * ext,
- gnutls_subject_alt_names_t,
- unsigned int flags);
+ gnutls_subject_alt_names_t,
+ unsigned int flags);
int gnutls_x509_ext_export_subject_alt_names(gnutls_subject_alt_names_t,
- gnutls_datum_t * ext);
+ gnutls_datum_t * ext);
/* They are exactly the same */
-#define gnutls_x509_ext_import_issuer_alt_name gnutls_x509_ext_import_subject_alt_name
-#define gnutls_x509_ext_export_issuer_alt_name gnutls_x509_ext_export_subject_alt_name
+# define gnutls_x509_ext_import_issuer_alt_name gnutls_x509_ext_import_subject_alt_name
+# define gnutls_x509_ext_export_issuer_alt_name gnutls_x509_ext_export_subject_alt_name
typedef struct gnutls_x509_crl_dist_points_st *gnutls_x509_crl_dist_points_t;
int gnutls_x509_crl_dist_points_init(gnutls_x509_crl_dist_points_t *);
void gnutls_x509_crl_dist_points_deinit(gnutls_x509_crl_dist_points_t);
-int gnutls_x509_crl_dist_points_get(gnutls_x509_crl_dist_points_t, unsigned int seq,
- unsigned int *type,
- gnutls_datum_t *dist, unsigned int *reason_flags);
+int gnutls_x509_crl_dist_points_get(gnutls_x509_crl_dist_points_t,
+ unsigned int seq, unsigned int *type,
+ gnutls_datum_t * dist,
+ unsigned int *reason_flags);
int gnutls_x509_crl_dist_points_set(gnutls_x509_crl_dist_points_t,
- gnutls_x509_subject_alt_name_t type,
- const gnutls_datum_t *dist, unsigned int reason_flags);
+ gnutls_x509_subject_alt_name_t type,
+ const gnutls_datum_t * dist,
+ unsigned int reason_flags);
int gnutls_x509_ext_import_crl_dist_points(const gnutls_datum_t * ext,
- gnutls_x509_crl_dist_points_t dp,
- unsigned int flags);
+ gnutls_x509_crl_dist_points_t dp,
+ unsigned int flags);
int gnutls_x509_ext_export_crl_dist_points(gnutls_x509_crl_dist_points_t dp,
- gnutls_datum_t * ext);
+ gnutls_datum_t * ext);
int gnutls_x509_ext_import_name_constraints(const gnutls_datum_t * ext,
- gnutls_x509_name_constraints_t nc,
- unsigned int flags);
+ gnutls_x509_name_constraints_t nc,
+ unsigned int flags);
int gnutls_x509_ext_export_name_constraints(gnutls_x509_name_constraints_t nc,
- gnutls_datum_t * ext);
+ gnutls_datum_t * ext);
typedef struct gnutls_x509_aia_st *gnutls_x509_aia_t;
int gnutls_x509_aia_init(gnutls_x509_aia_t *);
void gnutls_x509_aia_deinit(gnutls_x509_aia_t);
int gnutls_x509_aia_get(gnutls_x509_aia_t aia, unsigned int seq,
- gnutls_datum_t *oid,
- unsigned *san_type,
- gnutls_datum_t *san);
+ gnutls_datum_t * oid,
+ unsigned *san_type, gnutls_datum_t * san);
int gnutls_x509_aia_set(gnutls_x509_aia_t aia,
const char *oid,
- unsigned san_type,
- const gnutls_datum_t * san);
+ unsigned san_type, const gnutls_datum_t * san);
int gnutls_x509_ext_import_aia(const gnutls_datum_t * ext,
- gnutls_x509_aia_t,
- unsigned int flags);
-int gnutls_x509_ext_export_aia(gnutls_x509_aia_t aia,
- gnutls_datum_t * ext);
+ gnutls_x509_aia_t, unsigned int flags);
+int gnutls_x509_ext_export_aia(gnutls_x509_aia_t aia, gnutls_datum_t * ext);
int gnutls_x509_ext_import_subject_key_id(const gnutls_datum_t * ext,
- gnutls_datum_t * id);
+ gnutls_datum_t * id);
int gnutls_x509_ext_export_subject_key_id(const gnutls_datum_t * id,
- gnutls_datum_t * ext);
+ gnutls_datum_t * ext);
typedef struct gnutls_x509_aki_st *gnutls_x509_aki_t;
int gnutls_x509_ext_export_authority_key_id(gnutls_x509_aki_t,
- gnutls_datum_t * ext);
+ gnutls_datum_t * ext);
int gnutls_x509_ext_import_authority_key_id(const gnutls_datum_t * ext,
- gnutls_x509_aki_t,
- unsigned int flags);
+ gnutls_x509_aki_t,
+ unsigned int flags);
-int gnutls_x509_othername_to_virtual(const char *oid,
- const gnutls_datum_t *othername,
+int gnutls_x509_othername_to_virtual(const char *oid,
+ const gnutls_datum_t * othername,
unsigned int *virt_type,
- gnutls_datum_t *virt);
+ gnutls_datum_t * virt);
int gnutls_x509_aki_init(gnutls_x509_aki_t *);
-int gnutls_x509_aki_get_id(gnutls_x509_aki_t, gnutls_datum_t *id);
+int gnutls_x509_aki_get_id(gnutls_x509_aki_t, gnutls_datum_t * id);
int gnutls_x509_aki_get_cert_issuer(gnutls_x509_aki_t aki, unsigned int seq,
- unsigned int *san_type, gnutls_datum_t * san,
- gnutls_datum_t *othername_oid,
- gnutls_datum_t *serial);
-int gnutls_x509_aki_set_id(gnutls_x509_aki_t aki, const gnutls_datum_t *id);
-int gnutls_x509_aki_set_cert_issuer(gnutls_x509_aki_t aki,
- unsigned int san_type,
- const gnutls_datum_t * san,
- const char *othername_oid,
- const gnutls_datum_t * serial);
+ unsigned int *san_type,
+ gnutls_datum_t * san,
+ gnutls_datum_t * othername_oid,
+ gnutls_datum_t * serial);
+int gnutls_x509_aki_set_id(gnutls_x509_aki_t aki, const gnutls_datum_t * id);
+int gnutls_x509_aki_set_cert_issuer(gnutls_x509_aki_t aki,
+ unsigned int san_type,
+ const gnutls_datum_t * san,
+ const char *othername_oid,
+ const gnutls_datum_t * serial);
void gnutls_x509_aki_deinit(gnutls_x509_aki_t);
int gnutls_x509_ext_import_private_key_usage_period(const gnutls_datum_t * ext,
- time_t * activation,
- time_t * expiration);
+ time_t * activation,
+ time_t * expiration);
int gnutls_x509_ext_export_private_key_usage_period(time_t activation,
- time_t expiration,
- gnutls_datum_t * ext);
+ time_t expiration,
+ gnutls_datum_t * ext);
int gnutls_x509_ext_import_basic_constraints(const gnutls_datum_t * ext,
- unsigned int *ca, int *pathlen);
+ unsigned int *ca, int *pathlen);
int gnutls_x509_ext_export_basic_constraints(unsigned int ca, int pathlen,
- gnutls_datum_t * ext);
+ gnutls_datum_t * ext);
typedef struct gnutls_x509_key_purposes_st *gnutls_x509_key_purposes_t;
-int gnutls_x509_key_purpose_init(gnutls_x509_key_purposes_t *p);
+int gnutls_x509_key_purpose_init(gnutls_x509_key_purposes_t * p);
void gnutls_x509_key_purpose_deinit(gnutls_x509_key_purposes_t p);
int gnutls_x509_key_purpose_set(gnutls_x509_key_purposes_t p, const char *oid);
-int gnutls_x509_key_purpose_get(gnutls_x509_key_purposes_t p, unsigned idx, gnutls_datum_t *oid);
+int gnutls_x509_key_purpose_get(gnutls_x509_key_purposes_t p, unsigned idx,
+ gnutls_datum_t * oid);
int gnutls_x509_ext_import_key_purposes(const gnutls_datum_t * ext,
- gnutls_x509_key_purposes_t,
- unsigned int flags);
+ gnutls_x509_key_purposes_t,
+ unsigned int flags);
int gnutls_x509_ext_export_key_purposes(gnutls_x509_key_purposes_t,
- gnutls_datum_t * ext);
-
+ gnutls_datum_t * ext);
int gnutls_x509_ext_import_key_usage(const gnutls_datum_t * ext,
- unsigned int *key_usage);
+ unsigned int *key_usage);
int gnutls_x509_ext_export_key_usage(unsigned int key_usage,
- gnutls_datum_t * ext);
+ gnutls_datum_t * ext);
int gnutls_x509_ext_import_inhibit_anypolicy(const gnutls_datum_t * ext,
- unsigned int *skipcerts);
+ unsigned int *skipcerts);
int gnutls_x509_ext_export_inhibit_anypolicy(unsigned int skipcerts,
- gnutls_datum_t * ext);
+ gnutls_datum_t * ext);
int gnutls_x509_ext_import_proxy(const gnutls_datum_t * ext, int *pathlen,
- char **policyLanguage, char **policy,
- size_t * sizeof_policy);
-int gnutls_x509_ext_export_proxy(int pathLenConstraint, const char *policyLanguage,
- const char *policy, size_t sizeof_policy,
- gnutls_datum_t * ext);
+ char **policyLanguage, char **policy,
+ size_t *sizeof_policy);
+int gnutls_x509_ext_export_proxy(int pathLenConstraint,
+ const char *policyLanguage, const char *policy,
+ size_t sizeof_policy, gnutls_datum_t * ext);
typedef struct gnutls_x509_policies_st *gnutls_x509_policies_t;
@@ -180,40 +179,41 @@ int gnutls_x509_policies_init(gnutls_x509_policies_t *);
void gnutls_x509_policies_deinit(gnutls_x509_policies_t);
int gnutls_x509_policies_get(gnutls_x509_policies_t policies, unsigned int seq,
- struct gnutls_x509_policy_st *policy);
+ struct gnutls_x509_policy_st *policy);
int gnutls_x509_policies_set(gnutls_x509_policies_t policies,
- const struct gnutls_x509_policy_st *policy);
+ const struct gnutls_x509_policy_st *policy);
-int gnutls_x509_ext_import_policies(const gnutls_datum_t * ext, gnutls_x509_policies_t
- policies,
- unsigned int flags);
+int gnutls_x509_ext_import_policies(const gnutls_datum_t * ext,
+ gnutls_x509_policies_t policies,
+ unsigned int flags);
int gnutls_x509_ext_export_policies(gnutls_x509_policies_t policies,
- gnutls_datum_t * ext);
+ gnutls_datum_t * ext);
int gnutls_x509_ext_import_tlsfeatures(const gnutls_datum_t * ext,
- gnutls_x509_tlsfeatures_t,
- unsigned int flags);
+ gnutls_x509_tlsfeatures_t,
+ unsigned int flags);
int gnutls_x509_ext_export_tlsfeatures(gnutls_x509_tlsfeatures_t f,
- gnutls_datum_t * ext);
+ gnutls_datum_t * ext);
-int gnutls_x509_tlsfeatures_add(gnutls_x509_tlsfeatures_t f, unsigned int feature);
+int gnutls_x509_tlsfeatures_add(gnutls_x509_tlsfeatures_t f,
+ unsigned int feature);
typedef struct gnutls_x509_ct_scts_st *gnutls_x509_ct_scts_t;
int gnutls_x509_ext_ct_scts_init(gnutls_x509_ct_scts_t * scts);
void gnutls_x509_ext_ct_scts_deinit(gnutls_x509_ct_scts_t scts);
int gnutls_x509_ext_ct_import_scts(const gnutls_datum_t * ext,
- gnutls_x509_ct_scts_t scts, unsigned int flags);
-int gnutls_x509_ext_ct_export_scts(const gnutls_x509_ct_scts_t scts, gnutls_datum_t * ext);
-int gnutls_x509_ct_sct_get_version(const gnutls_x509_ct_scts_t scts, unsigned idx,
- unsigned int *version_out);
-int gnutls_x509_ct_sct_get(const gnutls_x509_ct_scts_t scts,
- unsigned idx,
- time_t *timestamp,
- gnutls_datum_t *logid,
- gnutls_sign_algorithm_t *sigalg,
- gnutls_datum_t *signature);
+ gnutls_x509_ct_scts_t scts,
+ unsigned int flags);
+int gnutls_x509_ext_ct_export_scts(const gnutls_x509_ct_scts_t scts,
+ gnutls_datum_t * ext);
+int gnutls_x509_ct_sct_get_version(const gnutls_x509_ct_scts_t scts,
+ unsigned idx, unsigned int *version_out);
+int gnutls_x509_ct_sct_get(const gnutls_x509_ct_scts_t scts, unsigned idx,
+ time_t * timestamp, gnutls_datum_t * logid,
+ gnutls_sign_algorithm_t * sigalg,
+ gnutls_datum_t * signature);
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -221,4 +221,4 @@ int gnutls_x509_ct_sct_get(const gnutls_x509_ct_scts_t scts,
#endif
/* *INDENT-ON* */
-#endif /* GNUTLS_X509_EXT_H */
+#endif /* GNUTLS_X509_EXT_H */
diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index 5ac601a0a9..38db3082c0 100644
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -26,9 +26,9 @@
*/
#ifndef GNUTLS_X509_H
-#define GNUTLS_X509_H
+# define GNUTLS_X509_H
-#include <gnutls/gnutls.h>
+# include <gnutls/gnutls.h>
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -39,77 +39,77 @@ extern "C" {
/* Some OIDs usually found in Distinguished names, or
* in Subject Directory Attribute extensions.
*/
-#define GNUTLS_OID_X520_COUNTRY_NAME "2.5.4.6"
-#define GNUTLS_OID_X520_ORGANIZATION_NAME "2.5.4.10"
-#define GNUTLS_OID_X520_ORGANIZATIONAL_UNIT_NAME "2.5.4.11"
-#define GNUTLS_OID_X520_COMMON_NAME "2.5.4.3"
-#define GNUTLS_OID_X520_LOCALITY_NAME "2.5.4.7"
-#define GNUTLS_OID_X520_STATE_OR_PROVINCE_NAME "2.5.4.8"
-
-#define GNUTLS_OID_X520_INITIALS "2.5.4.43"
-#define GNUTLS_OID_X520_GENERATION_QUALIFIER "2.5.4.44"
-#define GNUTLS_OID_X520_SURNAME "2.5.4.4"
-#define GNUTLS_OID_X520_GIVEN_NAME "2.5.4.42"
-#define GNUTLS_OID_X520_TITLE "2.5.4.12"
-#define GNUTLS_OID_X520_DN_QUALIFIER "2.5.4.46"
-#define GNUTLS_OID_X520_PSEUDONYM "2.5.4.65"
-#define GNUTLS_OID_X520_POSTALCODE "2.5.4.17"
-#define GNUTLS_OID_X520_NAME "2.5.4.41"
-
-#define GNUTLS_OID_LDAP_DC "0.9.2342.19200300.100.1.25"
-#define GNUTLS_OID_LDAP_UID "0.9.2342.19200300.100.1.1"
+# define GNUTLS_OID_X520_COUNTRY_NAME "2.5.4.6"
+# define GNUTLS_OID_X520_ORGANIZATION_NAME "2.5.4.10"
+# define GNUTLS_OID_X520_ORGANIZATIONAL_UNIT_NAME "2.5.4.11"
+# define GNUTLS_OID_X520_COMMON_NAME "2.5.4.3"
+# define GNUTLS_OID_X520_LOCALITY_NAME "2.5.4.7"
+# define GNUTLS_OID_X520_STATE_OR_PROVINCE_NAME "2.5.4.8"
+
+# define GNUTLS_OID_X520_INITIALS "2.5.4.43"
+# define GNUTLS_OID_X520_GENERATION_QUALIFIER "2.5.4.44"
+# define GNUTLS_OID_X520_SURNAME "2.5.4.4"
+# define GNUTLS_OID_X520_GIVEN_NAME "2.5.4.42"
+# define GNUTLS_OID_X520_TITLE "2.5.4.12"
+# define GNUTLS_OID_X520_DN_QUALIFIER "2.5.4.46"
+# define GNUTLS_OID_X520_PSEUDONYM "2.5.4.65"
+# define GNUTLS_OID_X520_POSTALCODE "2.5.4.17"
+# define GNUTLS_OID_X520_NAME "2.5.4.41"
+
+# define GNUTLS_OID_LDAP_DC "0.9.2342.19200300.100.1.25"
+# define GNUTLS_OID_LDAP_UID "0.9.2342.19200300.100.1.1"
/* The following should not be included in DN.
*/
-#define GNUTLS_OID_PKCS9_EMAIL "1.2.840.113549.1.9.1"
+# define GNUTLS_OID_PKCS9_EMAIL "1.2.840.113549.1.9.1"
-#define GNUTLS_OID_PKIX_DATE_OF_BIRTH "1.3.6.1.5.5.7.9.1"
-#define GNUTLS_OID_PKIX_PLACE_OF_BIRTH "1.3.6.1.5.5.7.9.2"
-#define GNUTLS_OID_PKIX_GENDER "1.3.6.1.5.5.7.9.3"
-#define GNUTLS_OID_PKIX_COUNTRY_OF_CITIZENSHIP "1.3.6.1.5.5.7.9.4"
-#define GNUTLS_OID_PKIX_COUNTRY_OF_RESIDENCE "1.3.6.1.5.5.7.9.5"
+# define GNUTLS_OID_PKIX_DATE_OF_BIRTH "1.3.6.1.5.5.7.9.1"
+# define GNUTLS_OID_PKIX_PLACE_OF_BIRTH "1.3.6.1.5.5.7.9.2"
+# define GNUTLS_OID_PKIX_GENDER "1.3.6.1.5.5.7.9.3"
+# define GNUTLS_OID_PKIX_COUNTRY_OF_CITIZENSHIP "1.3.6.1.5.5.7.9.4"
+# define GNUTLS_OID_PKIX_COUNTRY_OF_RESIDENCE "1.3.6.1.5.5.7.9.5"
/* Key purpose Object Identifiers.
*/
-#define GNUTLS_KP_TLS_WWW_SERVER "1.3.6.1.5.5.7.3.1"
-#define GNUTLS_KP_TLS_WWW_CLIENT "1.3.6.1.5.5.7.3.2"
-#define GNUTLS_KP_CODE_SIGNING "1.3.6.1.5.5.7.3.3"
-#define GNUTLS_KP_MS_SMART_CARD_LOGON "1.3.6.1.4.1.311.20.2.2"
-#define GNUTLS_KP_EMAIL_PROTECTION "1.3.6.1.5.5.7.3.4"
-#define GNUTLS_KP_TIME_STAMPING "1.3.6.1.5.5.7.3.8"
-#define GNUTLS_KP_OCSP_SIGNING "1.3.6.1.5.5.7.3.9"
-#define GNUTLS_KP_IPSEC_IKE "1.3.6.1.5.5.7.3.17"
-#define GNUTLS_KP_ANY "2.5.29.37.0"
-
-#define GNUTLS_KP_FLAG_DISALLOW_ANY 1
-
-#define GNUTLS_OID_AIA "1.3.6.1.5.5.7.1.1"
-#define GNUTLS_OID_AD_OCSP "1.3.6.1.5.5.7.48.1"
-#define GNUTLS_OID_AD_CAISSUERS "1.3.6.1.5.5.7.48.2"
-
-#define GNUTLS_FSAN_SET 0
-#define GNUTLS_FSAN_APPEND 1
-#define GNUTLS_FSAN_ENCODE_OCTET_STRING (1<<1)
-#define GNUTLS_FSAN_ENCODE_UTF8_STRING (1<<2)
-
-#define GNUTLS_X509EXT_OID_SUBJECT_KEY_ID "2.5.29.14"
-#define GNUTLS_X509EXT_OID_KEY_USAGE "2.5.29.15"
-#define GNUTLS_X509EXT_OID_PRIVATE_KEY_USAGE_PERIOD "2.5.29.16"
-#define GNUTLS_X509EXT_OID_SAN "2.5.29.17"
-#define GNUTLS_X509EXT_OID_IAN "2.5.29.18"
-#define GNUTLS_X509EXT_OID_BASIC_CONSTRAINTS "2.5.29.19"
-#define GNUTLS_X509EXT_OID_NAME_CONSTRAINTS "2.5.29.30"
-#define GNUTLS_X509EXT_OID_CRL_DIST_POINTS "2.5.29.31"
-#define GNUTLS_X509EXT_OID_CRT_POLICY "2.5.29.32"
-#define GNUTLS_X509EXT_OID_AUTHORITY_KEY_ID "2.5.29.35"
-#define GNUTLS_X509EXT_OID_EXTENDED_KEY_USAGE "2.5.29.37"
-#define GNUTLS_X509EXT_OID_INHIBIT_ANYPOLICY "2.5.29.52"
-#define GNUTLS_X509EXT_OID_AUTHORITY_INFO_ACCESS "1.3.6.1.5.5.7.1.1"
-#define GNUTLS_X509EXT_OID_PROXY_CRT_INFO "1.3.6.1.5.5.7.1.14"
-#define GNUTLS_X509EXT_OID_TLSFEATURES "1.3.6.1.5.5.7.1.24"
-#define GNUTLS_X509EXT_OID_CT_SCT_V1 "1.3.6.1.4.1.11129.2.4.2"
-
-#define GNUTLS_X509_OID_POLICY_ANY "2.5.29.54"
+# define GNUTLS_KP_TLS_WWW_SERVER "1.3.6.1.5.5.7.3.1"
+# define GNUTLS_KP_TLS_WWW_CLIENT "1.3.6.1.5.5.7.3.2"
+# define GNUTLS_KP_CODE_SIGNING "1.3.6.1.5.5.7.3.3"
+# define GNUTLS_KP_MS_SMART_CARD_LOGON "1.3.6.1.4.1.311.20.2.2"
+# define GNUTLS_KP_EMAIL_PROTECTION "1.3.6.1.5.5.7.3.4"
+# define GNUTLS_KP_TIME_STAMPING "1.3.6.1.5.5.7.3.8"
+# define GNUTLS_KP_OCSP_SIGNING "1.3.6.1.5.5.7.3.9"
+# define GNUTLS_KP_IPSEC_IKE "1.3.6.1.5.5.7.3.17"
+# define GNUTLS_KP_ANY "2.5.29.37.0"
+
+# define GNUTLS_KP_FLAG_DISALLOW_ANY 1
+
+# define GNUTLS_OID_AIA "1.3.6.1.5.5.7.1.1"
+# define GNUTLS_OID_AD_OCSP "1.3.6.1.5.5.7.48.1"
+# define GNUTLS_OID_AD_CAISSUERS "1.3.6.1.5.5.7.48.2"
+
+# define GNUTLS_FSAN_SET 0
+# define GNUTLS_FSAN_APPEND 1
+# define GNUTLS_FSAN_ENCODE_OCTET_STRING (1<<1)
+# define GNUTLS_FSAN_ENCODE_UTF8_STRING (1<<2)
+
+# define GNUTLS_X509EXT_OID_SUBJECT_KEY_ID "2.5.29.14"
+# define GNUTLS_X509EXT_OID_KEY_USAGE "2.5.29.15"
+# define GNUTLS_X509EXT_OID_PRIVATE_KEY_USAGE_PERIOD "2.5.29.16"
+# define GNUTLS_X509EXT_OID_SAN "2.5.29.17"
+# define GNUTLS_X509EXT_OID_IAN "2.5.29.18"
+# define GNUTLS_X509EXT_OID_BASIC_CONSTRAINTS "2.5.29.19"
+# define GNUTLS_X509EXT_OID_NAME_CONSTRAINTS "2.5.29.30"
+# define GNUTLS_X509EXT_OID_CRL_DIST_POINTS "2.5.29.31"
+# define GNUTLS_X509EXT_OID_CRT_POLICY "2.5.29.32"
+# define GNUTLS_X509EXT_OID_AUTHORITY_KEY_ID "2.5.29.35"
+# define GNUTLS_X509EXT_OID_EXTENDED_KEY_USAGE "2.5.29.37"
+# define GNUTLS_X509EXT_OID_INHIBIT_ANYPOLICY "2.5.29.52"
+# define GNUTLS_X509EXT_OID_AUTHORITY_INFO_ACCESS "1.3.6.1.5.5.7.1.1"
+# define GNUTLS_X509EXT_OID_PROXY_CRT_INFO "1.3.6.1.5.5.7.1.14"
+# define GNUTLS_X509EXT_OID_TLSFEATURES "1.3.6.1.5.5.7.1.24"
+# define GNUTLS_X509EXT_OID_CT_SCT_V1 "1.3.6.1.4.1.11129.2.4.2"
+
+# define GNUTLS_X509_OID_POLICY_ANY "2.5.29.54"
/* Certificate handling functions.
*/
@@ -128,8 +128,8 @@ extern "C" {
*/
typedef enum gnutls_certificate_import_flags {
GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED = 1,
- GNUTLS_X509_CRT_LIST_FAIL_IF_UNSORTED = 1<<1,
- GNUTLS_X509_CRT_LIST_SORT = 1<<2
+ GNUTLS_X509_CRT_LIST_FAIL_IF_UNSORTED = 1 << 1,
+ GNUTLS_X509_CRT_LIST_SORT = 1 << 2
} gnutls_certificate_import_flags;
int gnutls_x509_crt_init(gnutls_x509_crt_t * cert);
@@ -148,8 +148,10 @@ typedef enum gnutls_x509_crt_flags {
} gnutls_x509_crt_flags;
void gnutls_x509_crt_set_flags(gnutls_x509_crt_t cert, unsigned flags);
-unsigned gnutls_x509_crt_equals(gnutls_x509_crt_t cert1, gnutls_x509_crt_t cert2);
-unsigned gnutls_x509_crt_equals2(gnutls_x509_crt_t cert1, const gnutls_datum_t * der);
+unsigned gnutls_x509_crt_equals(gnutls_x509_crt_t cert1,
+ gnutls_x509_crt_t cert2);
+unsigned gnutls_x509_crt_equals2(gnutls_x509_crt_t cert1,
+ const gnutls_datum_t * der);
int gnutls_x509_crt_import(gnutls_x509_crt_t cert,
const gnutls_datum_t * data,
@@ -166,24 +168,22 @@ int gnutls_x509_crt_list_import(gnutls_x509_crt_t * certs,
unsigned int flags);
int gnutls_x509_crt_import_url(gnutls_x509_crt_t crt,
- const char *url, unsigned int flags
- /* GNUTLS_PKCS11_OBJ_FLAG_* */
+ const char *url, unsigned int flags
+ /* GNUTLS_PKCS11_OBJ_FLAG_* */
);
int
-gnutls_x509_crt_list_import_url(gnutls_x509_crt_t **certs,
+gnutls_x509_crt_list_import_url(gnutls_x509_crt_t ** certs,
unsigned int *size,
const char *url,
gnutls_pin_callback_t pin_fn,
- void *pin_fn_userdata,
- unsigned int flags);
+ void *pin_fn_userdata, unsigned int flags);
int gnutls_x509_crt_export(gnutls_x509_crt_t cert,
gnutls_x509_crt_fmt_t format,
- void *output_data, size_t * output_data_size);
+ void *output_data, size_t *output_data_size);
int gnutls_x509_crt_export2(gnutls_x509_crt_t cert,
- gnutls_x509_crt_fmt_t format,
- gnutls_datum_t * out);
+ gnutls_x509_crt_fmt_t format, gnutls_datum_t * out);
int gnutls_x509_crt_get_private_key_usage_period(gnutls_x509_crt_t
cert,
time_t *
@@ -193,37 +193,36 @@ int gnutls_x509_crt_get_private_key_usage_period(gnutls_x509_crt_t
*critical);
int gnutls_x509_crt_get_issuer_dn(gnutls_x509_crt_t cert,
- char *buf, size_t * buf_size);
-int gnutls_x509_crt_get_issuer_dn2(gnutls_x509_crt_t cert,
- gnutls_datum_t * dn);
+ char *buf, size_t *buf_size);
+int gnutls_x509_crt_get_issuer_dn2(gnutls_x509_crt_t cert, gnutls_datum_t * dn);
int gnutls_x509_crt_get_issuer_dn3(gnutls_x509_crt_t cert,
gnutls_datum_t * dn, unsigned flags);
int gnutls_x509_crt_get_issuer_dn_oid(gnutls_x509_crt_t cert,
unsigned indx, void *oid,
- size_t * oid_size);
+ size_t *oid_size);
int gnutls_x509_crt_get_issuer_dn_by_oid(gnutls_x509_crt_t cert,
const char *oid, unsigned indx,
unsigned int raw_flag,
- void *buf, size_t * buf_size);
+ void *buf, size_t *buf_size);
-int gnutls_x509_crt_get_dn(gnutls_x509_crt_t cert, char *buf,
- size_t * buf_size);
+int gnutls_x509_crt_get_dn(gnutls_x509_crt_t cert, char *buf, size_t *buf_size);
int gnutls_x509_crt_get_dn2(gnutls_x509_crt_t cert, gnutls_datum_t * dn);
-int gnutls_x509_crt_get_dn3(gnutls_x509_crt_t cert, gnutls_datum_t * dn, unsigned flags);
+int gnutls_x509_crt_get_dn3(gnutls_x509_crt_t cert, gnutls_datum_t * dn,
+ unsigned flags);
int gnutls_x509_crt_get_dn_oid(gnutls_x509_crt_t cert, unsigned indx,
- void *oid, size_t * oid_size);
+ void *oid, size_t *oid_size);
int gnutls_x509_crt_get_dn_by_oid(gnutls_x509_crt_t cert,
const char *oid, unsigned indx,
unsigned int raw_flag, void *buf,
- size_t * buf_size);
+ size_t *buf_size);
unsigned gnutls_x509_crt_check_hostname(gnutls_x509_crt_t cert,
- const char *hostname);
+ const char *hostname);
unsigned gnutls_x509_crt_check_hostname2(gnutls_x509_crt_t cert,
- const char *hostname, unsigned int flags);
-unsigned
-gnutls_x509_crt_check_email(gnutls_x509_crt_t cert,
- const char *email, unsigned int flags);
+ const char *hostname,
+ unsigned int flags);
+unsigned gnutls_x509_crt_check_email(gnutls_x509_crt_t cert, const char *email,
+ unsigned int flags);
unsigned
gnutls_x509_crt_check_ip(gnutls_x509_crt_t cert,
@@ -232,11 +231,13 @@ gnutls_x509_crt_check_ip(gnutls_x509_crt_t cert,
int gnutls_x509_crt_get_signature_algorithm(gnutls_x509_crt_t cert);
int gnutls_x509_crt_get_signature(gnutls_x509_crt_t cert,
- char *sig, size_t * sizeof_sig);
+ char *sig, size_t *sizeof_sig);
int gnutls_x509_crt_get_version(gnutls_x509_crt_t cert);
-int gnutls_x509_crt_get_pk_oid(gnutls_x509_crt_t cert, char *oid, size_t *oid_size);
-int gnutls_x509_crt_get_signature_oid(gnutls_x509_crt_t cert, char *oid, size_t *oid_size);
+int gnutls_x509_crt_get_pk_oid(gnutls_x509_crt_t cert, char *oid,
+ size_t *oid_size);
+int gnutls_x509_crt_get_signature_oid(gnutls_x509_crt_t cert, char *oid,
+ size_t *oid_size);
/**
* gnutls_keyid_flags_t:
@@ -250,14 +251,14 @@ int gnutls_x509_crt_get_signature_oid(gnutls_x509_crt_t cert, char *oid, size_t
*/
typedef enum {
GNUTLS_KEYID_USE_SHA1 = 0,
- GNUTLS_KEYID_USE_SHA256 = (1<<0),
- GNUTLS_KEYID_USE_SHA512 = (1<<1),
- GNUTLS_KEYID_USE_BEST_KNOWN = (1<<30)
+ GNUTLS_KEYID_USE_SHA256 = (1 << 0),
+ GNUTLS_KEYID_USE_SHA512 = (1 << 1),
+ GNUTLS_KEYID_USE_BEST_KNOWN = (1 << 30)
} gnutls_keyid_flags_t;
int gnutls_x509_crt_get_key_id(gnutls_x509_crt_t crt,
unsigned int flags,
unsigned char *output_data,
- size_t * output_data_size);
+ size_t *output_data_size);
int gnutls_x509_crt_set_private_key_usage_period(gnutls_x509_crt_t
crt,
@@ -267,34 +268,32 @@ int gnutls_x509_crt_set_authority_key_id(gnutls_x509_crt_t cert,
const void *id, size_t id_size);
int gnutls_x509_crt_get_authority_key_id(gnutls_x509_crt_t cert,
void *id,
- size_t * id_size,
+ size_t *id_size,
unsigned int *critical);
int gnutls_x509_crt_get_authority_key_gn_serial(gnutls_x509_crt_t
cert,
unsigned int seq,
void *alt,
- size_t * alt_size,
- unsigned int
+ size_t *alt_size, unsigned int
*alt_type,
void *serial,
- size_t *
- serial_size, unsigned int
+ size_t *serial_size,
+ unsigned int
*critical);
int gnutls_x509_crt_get_subject_key_id(gnutls_x509_crt_t cert,
void *ret,
- size_t * ret_size,
+ size_t *ret_size,
unsigned int *critical);
int gnutls_x509_crt_get_subject_unique_id(gnutls_x509_crt_t crt,
- char *buf, size_t * buf_size);
+ char *buf, size_t *buf_size);
int gnutls_x509_crt_get_issuer_unique_id(gnutls_x509_crt_t crt,
- char *buf, size_t * buf_size);
+ char *buf, size_t *buf_size);
void gnutls_x509_crt_set_pin_function(gnutls_x509_crt_t crt,
- gnutls_pin_callback_t fn,
- void *userdata);
+ gnutls_pin_callback_t fn, void *userdata);
/**
* gnutls_info_access_what_t:
@@ -329,41 +328,45 @@ int gnutls_x509_crt_get_authority_info_access(gnutls_x509_crt_t
typedef struct gnutls_name_constraints_st *gnutls_x509_name_constraints_t;
unsigned gnutls_x509_name_constraints_check(gnutls_x509_name_constraints_t nc,
- gnutls_x509_subject_alt_name_t type,
- const gnutls_datum_t * name);
-unsigned gnutls_x509_name_constraints_check_crt(gnutls_x509_name_constraints_t nc,
- gnutls_x509_subject_alt_name_t type,
- gnutls_x509_crt_t crt);
-
-int gnutls_x509_name_constraints_init(gnutls_x509_name_constraints_t *nc);
+ gnutls_x509_subject_alt_name_t type,
+ const gnutls_datum_t * name);
+unsigned gnutls_x509_name_constraints_check_crt(gnutls_x509_name_constraints_t
+ nc,
+ gnutls_x509_subject_alt_name_t
+ type, gnutls_x509_crt_t crt);
+
+int gnutls_x509_name_constraints_init(gnutls_x509_name_constraints_t * nc);
void gnutls_x509_name_constraints_deinit(gnutls_x509_name_constraints_t nc);
-#define GNUTLS_EXT_FLAG_APPEND 1
+# define GNUTLS_EXT_FLAG_APPEND 1
-#define GNUTLS_NAME_CONSTRAINTS_FLAG_APPEND GNUTLS_EXT_FLAG_APPEND
+# define GNUTLS_NAME_CONSTRAINTS_FLAG_APPEND GNUTLS_EXT_FLAG_APPEND
int gnutls_x509_crt_get_name_constraints(gnutls_x509_crt_t crt,
gnutls_x509_name_constraints_t nc,
unsigned int flags,
unsigned int *critical);
-int gnutls_x509_name_constraints_add_permitted(gnutls_x509_name_constraints_t nc,
- gnutls_x509_subject_alt_name_t type,
+int gnutls_x509_name_constraints_add_permitted(gnutls_x509_name_constraints_t
+ nc,
+ gnutls_x509_subject_alt_name_t
+ type,
const gnutls_datum_t * name);
int gnutls_x509_name_constraints_add_excluded(gnutls_x509_name_constraints_t nc,
- gnutls_x509_subject_alt_name_t type,
+ gnutls_x509_subject_alt_name_t
+ type,
const gnutls_datum_t * name);
-int gnutls_x509_crt_set_name_constraints(gnutls_x509_crt_t crt,
+int gnutls_x509_crt_set_name_constraints(gnutls_x509_crt_t crt,
gnutls_x509_name_constraints_t nc,
unsigned int critical);
-int gnutls_x509_name_constraints_get_permitted(gnutls_x509_name_constraints_t nc,
- unsigned idx,
- unsigned *type, gnutls_datum_t * name);
+int gnutls_x509_name_constraints_get_permitted(gnutls_x509_name_constraints_t
+ nc, unsigned idx, unsigned *type,
+ gnutls_datum_t * name);
int gnutls_x509_name_constraints_get_excluded(gnutls_x509_name_constraints_t nc,
- unsigned idx,
- unsigned *type, gnutls_datum_t * name);
-int gnutls_x509_cidr_to_rfc5280(const char *cidr, gnutls_datum_t *cidr_rfc5280);
+ unsigned idx, unsigned *type,
+ gnutls_datum_t * name);
+int gnutls_x509_cidr_to_rfc5280(const char *cidr,
+ gnutls_datum_t * cidr_rfc5280);
-
-#define GNUTLS_CRL_REASON_SUPERSEEDED GNUTLS_CRL_REASON_SUPERSEDED,
+# define GNUTLS_CRL_REASON_SUPERSEEDED GNUTLS_CRL_REASON_SUPERSEDED,
/**
* gnutls_x509_crl_reason_flags_t:
* @GNUTLS_CRL_REASON_PRIVILEGE_WITHDRAWN: The privileges were withdrawn from the owner.
@@ -394,7 +397,7 @@ typedef enum gnutls_x509_crl_reason_flags_t {
int gnutls_x509_crt_get_crl_dist_points(gnutls_x509_crt_t cert,
unsigned int seq,
void *ret,
- size_t * ret_size,
+ size_t *ret_size,
unsigned int *reason_flags,
unsigned int *critical);
int gnutls_x509_crt_set_crl_dist_points2(gnutls_x509_crt_t crt,
@@ -417,33 +420,34 @@ int gnutls_x509_crl_sign(gnutls_x509_crl_t crl,
int gnutls_x509_crl_sign2(gnutls_x509_crl_t crl,
gnutls_x509_crt_t issuer,
gnutls_x509_privkey_t issuer_key,
- gnutls_digest_algorithm_t dig,
- unsigned int flags);
+ gnutls_digest_algorithm_t dig, unsigned int flags);
time_t gnutls_x509_crt_get_activation_time(gnutls_x509_crt_t cert);
/* This macro is deprecated and defunc; do not use */
-#define GNUTLS_X509_NO_WELL_DEFINED_EXPIRATION ((time_t)4294197631)
+# define GNUTLS_X509_NO_WELL_DEFINED_EXPIRATION ((time_t)4294197631)
time_t gnutls_x509_crt_get_expiration_time(gnutls_x509_crt_t cert);
int gnutls_x509_crt_get_serial(gnutls_x509_crt_t cert,
- void *result, size_t * result_size);
+ void *result, size_t *result_size);
typedef struct gnutls_x509_spki_st *gnutls_x509_spki_t;
-int gnutls_x509_spki_init(gnutls_x509_spki_t *spki);
+int gnutls_x509_spki_init(gnutls_x509_spki_t * spki);
void gnutls_x509_spki_deinit(gnutls_x509_spki_t spki);
int gnutls_x509_spki_get_rsa_pss_params(gnutls_x509_spki_t spki,
- gnutls_digest_algorithm_t *dig, unsigned int *salt_size);
+ gnutls_digest_algorithm_t * dig,
+ unsigned int *salt_size);
void gnutls_x509_spki_set_rsa_pss_params(gnutls_x509_spki_t spki,
- gnutls_digest_algorithm_t dig, unsigned int salt_size);
+ gnutls_digest_algorithm_t dig,
+ unsigned int salt_size);
int gnutls_x509_crt_get_pk_algorithm(gnutls_x509_crt_t cert,
unsigned int *bits);
-int gnutls_x509_crt_set_spki(gnutls_x509_crt_t crt, const gnutls_x509_spki_t spki,
- unsigned int flags);
+int gnutls_x509_crt_set_spki(gnutls_x509_crt_t crt,
+ const gnutls_x509_spki_t spki, unsigned int flags);
int gnutls_x509_crt_get_spki(gnutls_x509_crt_t cert, gnutls_x509_spki_t spki,
unsigned int flags);
@@ -455,49 +459,46 @@ int gnutls_x509_crt_get_pk_dsa_raw(gnutls_x509_crt_t crt,
gnutls_datum_t * g, gnutls_datum_t * y);
int gnutls_x509_crt_get_pk_ecc_raw(gnutls_x509_crt_t crt,
gnutls_ecc_curve_t * curve,
- gnutls_datum_t * x,
- gnutls_datum_t * y);
+ gnutls_datum_t * x, gnutls_datum_t * y);
int gnutls_x509_crt_get_pk_gost_raw(gnutls_x509_crt_t crt,
gnutls_ecc_curve_t * curve,
gnutls_digest_algorithm_t * digest,
- gnutls_gost_paramset_t *paramset,
+ gnutls_gost_paramset_t * paramset,
gnutls_datum_t * x, gnutls_datum_t * y);
int gnutls_x509_crt_get_subject_alt_name(gnutls_x509_crt_t cert,
unsigned int seq,
void *san,
- size_t * san_size,
+ size_t *san_size,
unsigned int *critical);
int gnutls_x509_crt_get_subject_alt_name2(gnutls_x509_crt_t cert,
unsigned int seq,
void *san,
- size_t * san_size,
+ size_t *san_size,
unsigned int *san_type,
unsigned int *critical);
int gnutls_x509_crt_get_subject_alt_othername_oid(gnutls_x509_crt_t
cert,
unsigned int seq,
- void *oid,
- size_t * oid_size);
+ void *oid, size_t *oid_size);
int gnutls_x509_crt_get_issuer_alt_name(gnutls_x509_crt_t cert,
unsigned int seq,
void *ian,
- size_t * ian_size,
+ size_t *ian_size,
unsigned int *critical);
int gnutls_x509_crt_get_issuer_alt_name2(gnutls_x509_crt_t cert,
unsigned int seq,
void *ian,
- size_t * ian_size,
+ size_t *ian_size,
unsigned int *ian_type,
unsigned int *critical);
int gnutls_x509_crt_get_issuer_alt_othername_oid(gnutls_x509_crt_t
cert,
unsigned int seq,
- void *ret,
- size_t * ret_size);
+ void *ret, size_t *ret_size);
int gnutls_x509_crt_get_ca_status(gnutls_x509_crt_t cert,
unsigned int *critical);
@@ -511,44 +512,42 @@ int gnutls_x509_crt_get_basic_constraints(gnutls_x509_crt_t cert,
int gnutls_x509_crt_get_key_usage(gnutls_x509_crt_t cert,
unsigned int *key_usage,
unsigned int *critical);
-int gnutls_x509_crt_set_key_usage(gnutls_x509_crt_t crt,
- unsigned int usage);
+int gnutls_x509_crt_set_key_usage(gnutls_x509_crt_t crt, unsigned int usage);
int gnutls_x509_crt_set_authority_info_access(gnutls_x509_crt_t
crt, int what,
gnutls_datum_t * data);
int gnutls_x509_crt_get_inhibit_anypolicy(gnutls_x509_crt_t cert,
- unsigned int *skipcerts,
- unsigned int *critical);
+ unsigned int *skipcerts,
+ unsigned int *critical);
int
-gnutls_x509_crt_set_inhibit_anypolicy(gnutls_x509_crt_t crt, unsigned int skipcerts);
+gnutls_x509_crt_set_inhibit_anypolicy(gnutls_x509_crt_t crt,
+ unsigned int skipcerts);
int gnutls_x509_crt_get_proxy(gnutls_x509_crt_t cert,
unsigned int *critical,
int *pathlen,
char **policyLanguage,
- char **policy, size_t * sizeof_policy);
-
+ char **policy, size_t *sizeof_policy);
typedef struct gnutls_x509_tlsfeatures_st *gnutls_x509_tlsfeatures_t;
-int gnutls_x509_tlsfeatures_init(gnutls_x509_tlsfeatures_t *features);
+int gnutls_x509_tlsfeatures_init(gnutls_x509_tlsfeatures_t * features);
void gnutls_x509_tlsfeatures_deinit(gnutls_x509_tlsfeatures_t);
-int gnutls_x509_tlsfeatures_get(gnutls_x509_tlsfeatures_t f, unsigned idx, unsigned int *feature);
+int gnutls_x509_tlsfeatures_get(gnutls_x509_tlsfeatures_t f, unsigned idx,
+ unsigned int *feature);
int gnutls_x509_crt_set_tlsfeatures(gnutls_x509_crt_t crt,
gnutls_x509_tlsfeatures_t features);
int gnutls_x509_crt_get_tlsfeatures(gnutls_x509_crt_t cert,
gnutls_x509_tlsfeatures_t features,
- unsigned int flags,
- unsigned int *critical);
+ unsigned int flags, unsigned int *critical);
unsigned gnutls_x509_tlsfeatures_check_crt(gnutls_x509_tlsfeatures_t feat,
- gnutls_x509_crt_t crt);
-
+ gnutls_x509_crt_t crt);
-#define GNUTLS_MAX_QUALIFIERS 8
+# define GNUTLS_MAX_QUALIFIERS 8
/**
* gnutls_x509_qualifier_t:
@@ -582,38 +581,37 @@ int gnutls_x509_crt_set_policy(gnutls_x509_crt_t crt, const struct gnutls_x509_p
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);
/* Read extensions by OID. */
int gnutls_x509_crt_get_extension_oid(gnutls_x509_crt_t cert,
unsigned indx, void *oid,
- size_t * oid_size);
+ size_t *oid_size);
int gnutls_x509_crt_get_extension_by_oid(gnutls_x509_crt_t cert,
const char *oid, unsigned indx,
void *buf,
- size_t * buf_size,
+ size_t *buf_size,
unsigned int *critical);
int gnutls_x509_crq_get_signature_algorithm(gnutls_x509_crq_t crq);
int
gnutls_x509_crq_get_extension_by_oid2(gnutls_x509_crq_t crq,
- const char *oid, unsigned indx,
- gnutls_datum_t *output,
- unsigned int *critical);
+ const char *oid, unsigned indx,
+ gnutls_datum_t * output,
+ unsigned int *critical);
/* Read extensions by sequence number. */
int gnutls_x509_crt_get_extension_info(gnutls_x509_crt_t cert,
unsigned indx, void *oid,
- size_t * oid_size,
+ size_t *oid_size,
unsigned int *critical);
int gnutls_x509_crt_get_extension_data(gnutls_x509_crt_t cert,
unsigned indx, void *data,
- size_t * sizeof_data);
+ size_t *sizeof_data);
int
gnutls_x509_crt_get_extension_data2(gnutls_x509_crt_t cert,
- unsigned indx, gnutls_datum_t * data);
-
+ unsigned indx, gnutls_datum_t * data);
int gnutls_x509_crt_set_extension_by_oid(gnutls_x509_crt_t crt,
const char *oid,
@@ -629,8 +627,7 @@ int gnutls_x509_crt_set_dn(gnutls_x509_crt_t crt, const char *dn,
int gnutls_x509_crt_set_dn_by_oid(gnutls_x509_crt_t crt,
const char *oid,
unsigned int raw_flag,
- const void *name,
- unsigned int sizeof_name);
+ const void *name, unsigned int sizeof_name);
int gnutls_x509_crt_set_issuer_dn_by_oid(gnutls_x509_crt_t crt,
const char *oid,
unsigned int raw_flag,
@@ -639,10 +636,8 @@ int gnutls_x509_crt_set_issuer_dn_by_oid(gnutls_x509_crt_t crt,
int gnutls_x509_crt_set_issuer_dn(gnutls_x509_crt_t crt,
const char *dn, const char **err);
-int gnutls_x509_crt_set_version(gnutls_x509_crt_t crt,
- unsigned int version);
-int gnutls_x509_crt_set_key(gnutls_x509_crt_t crt,
- gnutls_x509_privkey_t key);
+int gnutls_x509_crt_set_version(gnutls_x509_crt_t crt, unsigned int version);
+int gnutls_x509_crt_set_key(gnutls_x509_crt_t crt, 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_basic_constraints(gnutls_x509_crt_t crt,
unsigned int ca,
@@ -650,10 +645,10 @@ int gnutls_x509_crt_set_basic_constraints(gnutls_x509_crt_t crt,
int
gnutls_x509_crt_set_subject_unique_id(gnutls_x509_crt_t cert, const void *id,
- size_t id_size);
+ size_t id_size);
int
gnutls_x509_crt_set_issuer_unique_id(gnutls_x509_crt_t cert, const void *id,
- size_t id_size);
+ size_t id_size);
int gnutls_x509_crt_set_subject_alternative_name(gnutls_x509_crt_t
crt,
@@ -668,23 +663,23 @@ int gnutls_x509_crt_set_subject_alt_name(gnutls_x509_crt_t crt,
int
gnutls_x509_crt_set_subject_alt_othername(gnutls_x509_crt_t crt,
- const char *oid,
- const void *data,
- unsigned int data_size,
- unsigned int flags);
+ const char *oid,
+ const void *data,
+ unsigned int data_size,
+ unsigned int flags);
int gnutls_x509_crt_set_issuer_alt_name(gnutls_x509_crt_t crt,
- gnutls_x509_subject_alt_name_t
- type, const void *data,
- unsigned int data_size,
- unsigned int flags);
+ gnutls_x509_subject_alt_name_t
+ type, const void *data,
+ unsigned int data_size,
+ unsigned int flags);
int
gnutls_x509_crt_set_issuer_alt_othername(gnutls_x509_crt_t crt,
- const char *oid,
- const void *data,
- unsigned int data_size,
- unsigned int flags);
+ const char *oid,
+ const void *data,
+ unsigned int data_size,
+ unsigned int flags);
int gnutls_x509_crt_sign(gnutls_x509_crt_t crt,
gnutls_x509_crt_t issuer,
@@ -692,8 +687,7 @@ int gnutls_x509_crt_sign(gnutls_x509_crt_t crt,
int gnutls_x509_crt_sign2(gnutls_x509_crt_t crt,
gnutls_x509_crt_t issuer,
gnutls_x509_privkey_t issuer_key,
- gnutls_digest_algorithm_t dig,
- unsigned int flags);
+ gnutls_digest_algorithm_t dig, unsigned int flags);
int gnutls_x509_crt_set_activation_time(gnutls_x509_crt_t cert,
time_t act_time);
int gnutls_x509_crt_set_expiration_time(gnutls_x509_crt_t cert,
@@ -707,8 +701,7 @@ int gnutls_x509_crt_set_subject_key_id(gnutls_x509_crt_t cert,
int gnutls_x509_crt_set_proxy_dn(gnutls_x509_crt_t crt,
gnutls_x509_crt_t eecrt,
unsigned int raw_flag,
- const void *name,
- unsigned int sizeof_name);
+ const void *name, unsigned int sizeof_name);
int gnutls_x509_crt_set_proxy(gnutls_x509_crt_t crt,
int pathLenConstraint,
const char *policyLanguage,
@@ -725,24 +718,23 @@ int gnutls_x509_crl_print(gnutls_x509_crl_t crl,
*/
int gnutls_x509_crt_get_raw_issuer_dn(gnutls_x509_crt_t cert,
gnutls_datum_t * start);
-int gnutls_x509_crt_get_raw_dn(gnutls_x509_crt_t cert,
- gnutls_datum_t * start);
+int gnutls_x509_crt_get_raw_dn(gnutls_x509_crt_t cert, gnutls_datum_t * start);
/* RDN handling.
*/
int gnutls_x509_rdn_get(const gnutls_datum_t * idn,
- char *buf, size_t * sizeof_buf);
+ char *buf, size_t *sizeof_buf);
int
gnutls_x509_rdn_get2(const gnutls_datum_t * idn,
- gnutls_datum_t *str, unsigned flags);
+ gnutls_datum_t * str, unsigned flags);
int gnutls_x509_rdn_get_oid(const gnutls_datum_t * idn,
- unsigned indx, void *buf, size_t * sizeof_buf);
+ unsigned indx, void *buf, size_t *sizeof_buf);
int gnutls_x509_rdn_get_by_oid(const gnutls_datum_t * idn,
const char *oid, unsigned indx,
unsigned int raw_flag, void *buf,
- size_t * sizeof_buf);
+ size_t *sizeof_buf);
typedef struct gnutls_x509_dn_st *gnutls_x509_dn_t;
@@ -752,36 +744,32 @@ typedef struct gnutls_x509_ava_st {
unsigned long value_tag;
} gnutls_x509_ava_st;
-int gnutls_x509_crt_get_subject(gnutls_x509_crt_t cert,
- gnutls_x509_dn_t * dn);
-int gnutls_x509_crt_get_issuer(gnutls_x509_crt_t cert,
- gnutls_x509_dn_t * dn);
+int gnutls_x509_crt_get_subject(gnutls_x509_crt_t cert, gnutls_x509_dn_t * dn);
+int gnutls_x509_crt_get_issuer(gnutls_x509_crt_t cert, gnutls_x509_dn_t * dn);
int gnutls_x509_dn_get_rdn_ava(gnutls_x509_dn_t dn, int irdn,
int iava, gnutls_x509_ava_st * ava);
-int gnutls_x509_dn_get_str(gnutls_x509_dn_t dn, gnutls_datum_t *str);
+int gnutls_x509_dn_get_str(gnutls_x509_dn_t dn, gnutls_datum_t * str);
-#define GNUTLS_X509_DN_FLAG_COMPAT 1
-int gnutls_x509_dn_get_str2(gnutls_x509_dn_t dn, gnutls_datum_t *str, unsigned flags);
+# define GNUTLS_X509_DN_FLAG_COMPAT 1
+int gnutls_x509_dn_get_str2(gnutls_x509_dn_t dn, gnutls_datum_t * str,
+ unsigned flags);
int
gnutls_x509_dn_set_str(gnutls_x509_dn_t dn, const char *str, const char **err);
int gnutls_x509_dn_init(gnutls_x509_dn_t * dn);
-int gnutls_x509_dn_import(gnutls_x509_dn_t dn,
- const gnutls_datum_t * data);
+int gnutls_x509_dn_import(gnutls_x509_dn_t dn, const gnutls_datum_t * data);
int gnutls_x509_dn_export(gnutls_x509_dn_t dn,
gnutls_x509_crt_fmt_t format,
- void *output_data, size_t * output_data_size);
+ void *output_data, size_t *output_data_size);
int gnutls_x509_dn_export2(gnutls_x509_dn_t dn,
- gnutls_x509_crt_fmt_t format,
- gnutls_datum_t * out);
+ gnutls_x509_crt_fmt_t format, gnutls_datum_t * out);
void gnutls_x509_dn_deinit(gnutls_x509_dn_t dn);
-
/* CRL handling functions.
*/
int gnutls_x509_crl_init(gnutls_x509_crl_t * crl);
@@ -792,35 +780,33 @@ int gnutls_x509_crl_import(gnutls_x509_crl_t crl,
gnutls_x509_crt_fmt_t format);
int gnutls_x509_crl_export(gnutls_x509_crl_t crl,
gnutls_x509_crt_fmt_t format,
- void *output_data, size_t * output_data_size);
+ void *output_data, size_t *output_data_size);
int gnutls_x509_crl_export2(gnutls_x509_crl_t crl,
- gnutls_x509_crt_fmt_t format,
- gnutls_datum_t * out);
+ gnutls_x509_crt_fmt_t format, gnutls_datum_t * out);
int
-gnutls_x509_crl_get_raw_issuer_dn(gnutls_x509_crl_t crl,
- gnutls_datum_t * dn);
+gnutls_x509_crl_get_raw_issuer_dn(gnutls_x509_crl_t crl, gnutls_datum_t * dn);
int gnutls_x509_crl_get_issuer_dn(gnutls_x509_crl_t crl,
- char *buf, size_t * sizeof_buf);
-int gnutls_x509_crl_get_issuer_dn2(gnutls_x509_crl_t crl,
- gnutls_datum_t * dn);
+ char *buf, size_t *sizeof_buf);
+int gnutls_x509_crl_get_issuer_dn2(gnutls_x509_crl_t crl, gnutls_datum_t * dn);
int gnutls_x509_crl_get_issuer_dn3(gnutls_x509_crl_t crl,
gnutls_datum_t * dn, unsigned flags);
int gnutls_x509_crl_get_issuer_dn_by_oid(gnutls_x509_crl_t crl,
const char *oid, unsigned indx,
unsigned int raw_flag,
- void *buf, size_t * sizeof_buf);
+ void *buf, size_t *sizeof_buf);
int gnutls_x509_crl_get_dn_oid(gnutls_x509_crl_t crl, unsigned indx,
- void *oid, size_t * sizeof_oid);
+ void *oid, size_t *sizeof_oid);
int gnutls_x509_crl_get_signature_algorithm(gnutls_x509_crl_t crl);
int gnutls_x509_crl_get_signature(gnutls_x509_crl_t crl,
- char *sig, size_t * sizeof_sig);
+ char *sig, size_t *sizeof_sig);
int gnutls_x509_crl_get_version(gnutls_x509_crl_t crl);
-int gnutls_x509_crl_get_signature_oid(gnutls_x509_crl_t crl, char *oid, size_t *oid_size);
+int gnutls_x509_crl_get_signature_oid(gnutls_x509_crl_t crl, char *oid,
+ size_t *oid_size);
time_t gnutls_x509_crl_get_this_update(gnutls_x509_crl_t crl);
time_t gnutls_x509_crl_get_next_update(gnutls_x509_crl_t crl);
@@ -828,22 +814,22 @@ time_t gnutls_x509_crl_get_next_update(gnutls_x509_crl_t crl);
int gnutls_x509_crl_get_crt_count(gnutls_x509_crl_t crl);
int gnutls_x509_crl_get_crt_serial(gnutls_x509_crl_t crl, unsigned indx,
unsigned char *serial,
- size_t * serial_size, time_t * t);
+ size_t *serial_size, time_t * t);
-typedef struct gnutls_x509_crl_iter * gnutls_x509_crl_iter_t;
+typedef struct gnutls_x509_crl_iter *gnutls_x509_crl_iter_t;
int gnutls_x509_crl_iter_crt_serial(gnutls_x509_crl_t crl,
gnutls_x509_crl_iter_t *,
unsigned char *serial,
- size_t * serial_size, time_t * t);
+ size_t *serial_size, time_t * t);
void gnutls_x509_crl_iter_deinit(gnutls_x509_crl_iter_t);
-#define gnutls_x509_crl_get_certificate_count gnutls_x509_crl_get_crt_count
-#define gnutls_x509_crl_get_certificate gnutls_x509_crl_get_crt_serial
+# define gnutls_x509_crl_get_certificate_count gnutls_x509_crl_get_crt_count
+# define gnutls_x509_crl_get_certificate gnutls_x509_crl_get_crt_serial
unsigned gnutls_x509_crl_check_issuer(gnutls_x509_crl_t crl,
- gnutls_x509_crt_t issuer);
+ gnutls_x509_crt_t issuer);
int gnutls_x509_crl_list_import2(gnutls_x509_crl_t ** crls,
unsigned int *size,
@@ -858,53 +844,48 @@ int gnutls_x509_crl_list_import(gnutls_x509_crl_t * crls,
unsigned int flags);
/* CRL writing.
*/
-int gnutls_x509_crl_set_version(gnutls_x509_crl_t crl,
- unsigned int version);
-int gnutls_x509_crl_set_this_update(gnutls_x509_crl_t crl,
- time_t act_time);
-int gnutls_x509_crl_set_next_update(gnutls_x509_crl_t crl,
- time_t exp_time);
+int gnutls_x509_crl_set_version(gnutls_x509_crl_t crl, unsigned int version);
+int gnutls_x509_crl_set_this_update(gnutls_x509_crl_t crl, time_t act_time);
+int gnutls_x509_crl_set_next_update(gnutls_x509_crl_t crl, time_t exp_time);
int gnutls_x509_crl_set_crt_serial(gnutls_x509_crl_t crl,
const void *serial,
- size_t serial_size,
- time_t revocation_time);
+ size_t serial_size, time_t revocation_time);
int gnutls_x509_crl_set_crt(gnutls_x509_crl_t crl,
gnutls_x509_crt_t crt, time_t revocation_time);
int gnutls_x509_crl_get_authority_key_id(gnutls_x509_crl_t crl,
void *id,
- size_t * id_size,
+ size_t *id_size,
unsigned int *critical);
int gnutls_x509_crl_get_authority_key_gn_serial(gnutls_x509_crl_t
crl,
unsigned int seq,
void *alt,
- size_t * alt_size,
- unsigned int
+ size_t *alt_size, unsigned int
*alt_type,
void *serial,
- size_t *
- serial_size, unsigned int
+ size_t *serial_size,
+ unsigned int
*critical);
int gnutls_x509_crl_get_number(gnutls_x509_crl_t crl, void *ret,
- size_t * ret_size, unsigned int *critical);
+ size_t *ret_size, unsigned int *critical);
int gnutls_x509_crl_get_extension_oid(gnutls_x509_crl_t crl,
unsigned indx, void *oid,
- size_t * sizeof_oid);
+ size_t *sizeof_oid);
int gnutls_x509_crl_get_extension_info(gnutls_x509_crl_t crl,
unsigned indx, void *oid,
- size_t * sizeof_oid,
+ size_t *sizeof_oid,
unsigned int *critical);
int gnutls_x509_crl_get_extension_data(gnutls_x509_crl_t crl,
unsigned indx, void *data,
- size_t * sizeof_data);
+ size_t *sizeof_data);
int
gnutls_x509_crl_get_extension_data2(gnutls_x509_crl_t crl,
- unsigned indx, gnutls_datum_t * data);
+ unsigned indx, gnutls_datum_t * data);
int gnutls_x509_crl_set_authority_key_id(gnutls_x509_crl_t crl,
const void *id, size_t id_size);
@@ -912,7 +893,6 @@ int gnutls_x509_crl_set_authority_key_id(gnutls_x509_crl_t crl,
int gnutls_x509_crl_set_number(gnutls_x509_crl_t crl,
const void *nr, size_t nr_size);
-
/* X.509 Certificate verification functions.
*/
@@ -970,7 +950,7 @@ int gnutls_x509_crl_set_number(gnutls_x509_crl_t crl,
*/
typedef enum gnutls_certificate_verify_flags {
GNUTLS_VERIFY_DISABLE_CA_SIGN = 1 << 0,
- GNUTLS_VERIFY_DO_NOT_ALLOW_IP_MATCHES = 1<<1,
+ GNUTLS_VERIFY_DO_NOT_ALLOW_IP_MATCHES = 1 << 1,
GNUTLS_VERIFY_DO_NOT_ALLOW_SAME = 1 << 2,
GNUTLS_VERIFY_ALLOW_ANY_X509_V1_CA_CRT = 1 << 3,
GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD2 = 1 << 4,
@@ -986,10 +966,10 @@ typedef enum gnutls_certificate_verify_flags {
GNUTLS_VERIFY_IGNORE_UNKNOWN_CRIT_EXTENSIONS = 1 << 14,
GNUTLS_VERIFY_ALLOW_SIGN_WITH_SHA1 = 1 << 15,
GNUTLS_VERIFY_RSA_PSS_FIXED_SALT_LENGTH = 1 << 16
- /* cannot exceed 2^24 due to GNUTLS_PROFILE_TO_VFLAGS() */
+ /* cannot exceed 2^24 due to GNUTLS_PROFILE_TO_VFLAGS() */
} gnutls_certificate_verify_flags;
-#define GNUTLS_VERIFY_ALLOW_BROKEN (GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD2|GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD5)
+# define GNUTLS_VERIFY_ALLOW_BROKEN (GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD2|GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD5)
/**
* gnutls_certificate_verification_profiles_t:
@@ -1024,26 +1004,29 @@ typedef enum gnutls_certificate_verification_profiles_t {
GNUTLS_PROFILE_HIGH = 6,
GNUTLS_PROFILE_ULTRA = 7,
GNUTLS_PROFILE_FUTURE = 8,
-
- GNUTLS_PROFILE_SUITEB128=32,
- GNUTLS_PROFILE_SUITEB192=33
- /*GNUTLS_PROFILE_MAX=255*/
+
+ GNUTLS_PROFILE_SUITEB128 = 32,
+ GNUTLS_PROFILE_SUITEB192 = 33
+ /*GNUTLS_PROFILE_MAX=255 */
} gnutls_certificate_verification_profiles_t;
-#define GNUTLS_PROFILE_TO_VFLAGS(x) \
+# define GNUTLS_PROFILE_TO_VFLAGS(x) \
(((unsigned)x)<<24)
-#define GNUTLS_VFLAGS_PROFILE_MASK (0xff000000)
+# define GNUTLS_VFLAGS_PROFILE_MASK (0xff000000)
-#define GNUTLS_VFLAGS_TO_PROFILE(x) \
+# define GNUTLS_VFLAGS_TO_PROFILE(x) \
((((unsigned)x)>>24)&0xff)
-const char *
- gnutls_certificate_verification_profile_get_name(gnutls_certificate_verification_profiles_t id) __GNUTLS_CONST__;
-gnutls_certificate_verification_profiles_t gnutls_certificate_verification_profile_get_id(const char *name) __GNUTLS_CONST__;
+const char
+*gnutls_certificate_verification_profile_get_name
+ (gnutls_certificate_verification_profiles_t id) __GNUTLS_CONST__;
+gnutls_certificate_verification_profiles_t
+gnutls_certificate_verification_profile_get_id(const char *name)
+__GNUTLS_CONST__;
unsigned gnutls_x509_crt_check_issuer(gnutls_x509_crt_t cert,
- gnutls_x509_crt_t issuer);
+ gnutls_x509_crt_t issuer);
int gnutls_x509_crt_list_verify(const gnutls_x509_crt_t *
cert_list, unsigned cert_list_length,
@@ -1064,10 +1047,10 @@ int gnutls_x509_crl_verify(gnutls_x509_crl_t crl,
int
gnutls_x509_crt_verify_data2(gnutls_x509_crt_t crt,
- gnutls_sign_algorithm_t algo,
- unsigned int flags,
- const gnutls_datum_t * data,
- const gnutls_datum_t * signature);
+ gnutls_sign_algorithm_t algo,
+ unsigned int flags,
+ const gnutls_datum_t * data,
+ const gnutls_datum_t * signature);
int gnutls_x509_crt_check_revocation(gnutls_x509_crt_t cert,
const gnutls_x509_crl_t *
@@ -1075,18 +1058,17 @@ int gnutls_x509_crt_check_revocation(gnutls_x509_crt_t cert,
int gnutls_x509_crt_get_fingerprint(gnutls_x509_crt_t cert,
gnutls_digest_algorithm_t algo,
- void *buf, size_t * buf_size);
+ void *buf, size_t *buf_size);
int gnutls_x509_crt_get_key_purpose_oid(gnutls_x509_crt_t cert,
unsigned indx, void *oid,
- size_t * oid_size,
+ size_t *oid_size,
unsigned int *critical);
int gnutls_x509_crt_set_key_purpose_oid(gnutls_x509_crt_t cert,
- const void *oid,
- unsigned int critical);
+ const void *oid, unsigned int critical);
unsigned gnutls_x509_crt_check_key_purpose(gnutls_x509_crt_t cert,
- const char *purpose, unsigned flags);
+ const char *purpose, unsigned flags);
/* Private key handling.
*/
@@ -1094,10 +1076,10 @@ unsigned gnutls_x509_crt_check_key_purpose(gnutls_x509_crt_t cert,
/* Flags for the gnutls_x509_privkey_export_pkcs8() function.
*/
-#define GNUTLS_PKCS8_PLAIN GNUTLS_PKCS_PLAIN
-#define GNUTLS_PKCS8_USE_PKCS12_3DES GNUTLS_PKCS_PKCS12_3DES
-#define GNUTLS_PKCS8_USE_PKCS12_ARCFOUR GNUTLS_PKCS_PKCS12_ARCFOUR
-#define GNUTLS_PKCS8_USE_PKCS12_RC2_40 GNUTLS_PKCS_PKCS12_RC2_40
+# define GNUTLS_PKCS8_PLAIN GNUTLS_PKCS_PLAIN
+# define GNUTLS_PKCS8_USE_PKCS12_3DES GNUTLS_PKCS_PKCS12_3DES
+# define GNUTLS_PKCS8_USE_PKCS12_ARCFOUR GNUTLS_PKCS_PKCS12_ARCFOUR
+# define GNUTLS_PKCS8_USE_PKCS12_RC2_40 GNUTLS_PKCS_PKCS12_RC2_40
/**
* gnutls_pkcs_encrypt_flags_t:
@@ -1122,49 +1104,48 @@ unsigned gnutls_x509_crt_check_key_purpose(gnutls_x509_crt_t cert,
*/
typedef enum gnutls_pkcs_encrypt_flags_t {
GNUTLS_PKCS_PLAIN = 1,
- GNUTLS_PKCS_PKCS12_3DES = 1<<1,
- GNUTLS_PKCS_PKCS12_ARCFOUR = 1<<2,
- GNUTLS_PKCS_PKCS12_RC2_40 = 1<<3,
- GNUTLS_PKCS_PBES2_3DES = 1<<4,
- GNUTLS_PKCS_PBES2_AES_128 = 1<<5,
- GNUTLS_PKCS_PBES2_AES_192 = 1<<6,
- GNUTLS_PKCS_PBES2_AES_256 = 1<<7,
- GNUTLS_PKCS_NULL_PASSWORD = 1<<8,
- GNUTLS_PKCS_PBES2_DES = 1<<9,
- GNUTLS_PKCS_PBES1_DES_MD5 = 1<<10,
- GNUTLS_PKCS_PBES2_GOST_TC26Z = 1<<11,
- GNUTLS_PKCS_PBES2_GOST_CPA = 1<<12,
- GNUTLS_PKCS_PBES2_GOST_CPB = 1<<13,
- GNUTLS_PKCS_PBES2_GOST_CPC = 1<<14,
- GNUTLS_PKCS_PBES2_GOST_CPD = 1<<15
+ GNUTLS_PKCS_PKCS12_3DES = 1 << 1,
+ GNUTLS_PKCS_PKCS12_ARCFOUR = 1 << 2,
+ GNUTLS_PKCS_PKCS12_RC2_40 = 1 << 3,
+ GNUTLS_PKCS_PBES2_3DES = 1 << 4,
+ GNUTLS_PKCS_PBES2_AES_128 = 1 << 5,
+ GNUTLS_PKCS_PBES2_AES_192 = 1 << 6,
+ GNUTLS_PKCS_PBES2_AES_256 = 1 << 7,
+ GNUTLS_PKCS_NULL_PASSWORD = 1 << 8,
+ GNUTLS_PKCS_PBES2_DES = 1 << 9,
+ GNUTLS_PKCS_PBES1_DES_MD5 = 1 << 10,
+ GNUTLS_PKCS_PBES2_GOST_TC26Z = 1 << 11,
+ GNUTLS_PKCS_PBES2_GOST_CPA = 1 << 12,
+ GNUTLS_PKCS_PBES2_GOST_CPB = 1 << 13,
+ GNUTLS_PKCS_PBES2_GOST_CPC = 1 << 14,
+ GNUTLS_PKCS_PBES2_GOST_CPD = 1 << 15
} gnutls_pkcs_encrypt_flags_t;
-#define GNUTLS_PKCS_CIPHER_MASK(x) ((x)&(~(GNUTLS_PKCS_NULL_PASSWORD)))
-
-#define GNUTLS_PKCS_USE_PKCS12_3DES GNUTLS_PKCS_PKCS12_3DES
-#define GNUTLS_PKCS_USE_PKCS12_ARCFOUR GNUTLS_PKCS_PKCS12_ARCFOUR
-#define GNUTLS_PKCS_USE_PKCS12_RC2_40 GNUTLS_PKCS_PKCS12_RC2_40
-#define GNUTLS_PKCS_USE_PBES2_3DES GNUTLS_PKCS_PBES2_3DES
-#define GNUTLS_PKCS_USE_PBES2_AES_128 GNUTLS_PKCS_PBES2_AES_128
-#define GNUTLS_PKCS_USE_PBES2_AES_192 GNUTLS_PKCS_PBES2_AES_192
-#define GNUTLS_PKCS_USE_PBES2_AES_256 GNUTLS_PKCS_PBES2_AES_256
-#define GNUTLS_PKCS_USE_PBES2_GOST_TC26Z GNUTLS_PKCS_PBES2_GOST_TC26Z
-#define GNUTLS_PKCS_USE_PBES2_GOST_CPA GNUTLS_PKCS_PBES2_GOST_CPA
-#define GNUTLS_PKCS_USE_PBES2_GOST_CPB GNUTLS_PKCS_PBES2_GOST_CPB
-#define GNUTLS_PKCS_USE_PBES2_GOST_CPC GNUTLS_PKCS_PBES2_GOST_CPC
-#define GNUTLS_PKCS_USE_PBES2_GOST_CPD GNUTLS_PKCS_PBES2_GOST_CPD
+# define GNUTLS_PKCS_CIPHER_MASK(x) ((x)&(~(GNUTLS_PKCS_NULL_PASSWORD)))
+
+# define GNUTLS_PKCS_USE_PKCS12_3DES GNUTLS_PKCS_PKCS12_3DES
+# define GNUTLS_PKCS_USE_PKCS12_ARCFOUR GNUTLS_PKCS_PKCS12_ARCFOUR
+# define GNUTLS_PKCS_USE_PKCS12_RC2_40 GNUTLS_PKCS_PKCS12_RC2_40
+# define GNUTLS_PKCS_USE_PBES2_3DES GNUTLS_PKCS_PBES2_3DES
+# define GNUTLS_PKCS_USE_PBES2_AES_128 GNUTLS_PKCS_PBES2_AES_128
+# define GNUTLS_PKCS_USE_PBES2_AES_192 GNUTLS_PKCS_PBES2_AES_192
+# define GNUTLS_PKCS_USE_PBES2_AES_256 GNUTLS_PKCS_PBES2_AES_256
+# define GNUTLS_PKCS_USE_PBES2_GOST_TC26Z GNUTLS_PKCS_PBES2_GOST_TC26Z
+# define GNUTLS_PKCS_USE_PBES2_GOST_CPA GNUTLS_PKCS_PBES2_GOST_CPA
+# define GNUTLS_PKCS_USE_PBES2_GOST_CPB GNUTLS_PKCS_PBES2_GOST_CPB
+# define GNUTLS_PKCS_USE_PBES2_GOST_CPC GNUTLS_PKCS_PBES2_GOST_CPC
+# define GNUTLS_PKCS_USE_PBES2_GOST_CPD GNUTLS_PKCS_PBES2_GOST_CPD
const char *gnutls_pkcs_schema_get_name(unsigned int schema);
const char *gnutls_pkcs_schema_get_oid(unsigned int schema);
int gnutls_x509_privkey_init(gnutls_x509_privkey_t * key);
void gnutls_x509_privkey_deinit(gnutls_x509_privkey_t key);
-gnutls_sec_param_t
-gnutls_x509_privkey_sec_param(gnutls_x509_privkey_t key);
+gnutls_sec_param_t gnutls_x509_privkey_sec_param(gnutls_x509_privkey_t key);
void gnutls_x509_privkey_set_pin_function(gnutls_x509_privkey_t key,
- gnutls_pin_callback_t fn,
- void *userdata);
+ gnutls_pin_callback_t fn,
+ void *userdata);
int gnutls_x509_privkey_cpy(gnutls_x509_privkey_t dst,
gnutls_x509_privkey_t src);
@@ -1174,8 +1155,7 @@ int gnutls_x509_privkey_import(gnutls_x509_privkey_t key,
int gnutls_x509_privkey_import_pkcs8(gnutls_x509_privkey_t key,
const gnutls_datum_t * data,
gnutls_x509_crt_fmt_t format,
- const char *password,
- unsigned int flags);
+ const char *password, unsigned int flags);
int gnutls_x509_privkey_import_openssl(gnutls_x509_privkey_t key,
const gnutls_datum_t * data,
const char *password);
@@ -1213,12 +1193,12 @@ int gnutls_x509_privkey_import_ecc_raw(gnutls_x509_privkey_t key,
const gnutls_datum_t * y,
const gnutls_datum_t * k);
int gnutls_x509_privkey_import_gost_raw(gnutls_x509_privkey_t key,
- gnutls_ecc_curve_t curve,
- gnutls_digest_algorithm_t digest,
- gnutls_gost_paramset_t paramset,
- const gnutls_datum_t * x,
- const gnutls_datum_t * y,
- const gnutls_datum_t * k);
+ gnutls_ecc_curve_t curve,
+ gnutls_digest_algorithm_t digest,
+ gnutls_gost_paramset_t paramset,
+ const gnutls_datum_t * x,
+ const gnutls_datum_t * y,
+ const gnutls_datum_t * k);
int gnutls_x509_privkey_fix(gnutls_x509_privkey_t key);
@@ -1226,8 +1206,7 @@ int gnutls_x509_privkey_export_dsa_raw(gnutls_x509_privkey_t key,
gnutls_datum_t * p,
gnutls_datum_t * q,
gnutls_datum_t * g,
- gnutls_datum_t * y,
- gnutls_datum_t * x);
+ gnutls_datum_t * y, gnutls_datum_t * x);
int gnutls_x509_privkey_import_dsa_raw(gnutls_x509_privkey_t key,
const gnutls_datum_t * p,
const gnutls_datum_t * q,
@@ -1239,23 +1218,22 @@ int gnutls_x509_privkey_get_pk_algorithm(gnutls_x509_privkey_t key);
int gnutls_x509_privkey_get_pk_algorithm2(gnutls_x509_privkey_t
key, unsigned int *bits);
int gnutls_x509_privkey_get_spki(gnutls_x509_privkey_t key,
- gnutls_x509_spki_t spki,
- unsigned int flags);
+ gnutls_x509_spki_t spki, unsigned int flags);
int
gnutls_x509_privkey_set_spki(gnutls_x509_privkey_t key,
- const gnutls_x509_spki_t spki,
- unsigned int flags);
+ const gnutls_x509_spki_t spki, unsigned int flags);
int gnutls_x509_privkey_get_key_id(gnutls_x509_privkey_t key,
unsigned int flags,
unsigned char *output_data,
- size_t * output_data_size);
+ size_t *output_data_size);
int gnutls_x509_privkey_generate(gnutls_x509_privkey_t key,
gnutls_pk_algorithm_t algo,
unsigned int bits, unsigned int flags);
-void gnutls_x509_privkey_set_flags(gnutls_x509_privkey_t key, unsigned int flags);
+void gnutls_x509_privkey_set_flags(gnutls_x509_privkey_t key,
+ unsigned int flags);
/**
* gnutls_keygen_types_t:
@@ -1280,17 +1258,22 @@ typedef struct {
int
gnutls_x509_privkey_generate2(gnutls_x509_privkey_t key,
gnutls_pk_algorithm_t algo, unsigned int bits,
- unsigned int flags, const gnutls_keygen_data_st *data, unsigned data_size);
+ unsigned int flags,
+ const gnutls_keygen_data_st * data,
+ unsigned data_size);
-int gnutls_x509_privkey_verify_seed(gnutls_x509_privkey_t key, gnutls_digest_algorithm_t, const void *seed, size_t seed_size);
-int gnutls_x509_privkey_get_seed(gnutls_x509_privkey_t key, gnutls_digest_algorithm_t*, void *seed, size_t *seed_size);
+int gnutls_x509_privkey_verify_seed(gnutls_x509_privkey_t key,
+ gnutls_digest_algorithm_t, const void *seed,
+ size_t seed_size);
+int gnutls_x509_privkey_get_seed(gnutls_x509_privkey_t key,
+ gnutls_digest_algorithm_t *, void *seed,
+ size_t *seed_size);
int gnutls_x509_privkey_verify_params(gnutls_x509_privkey_t key);
int gnutls_x509_privkey_export(gnutls_x509_privkey_t key,
gnutls_x509_crt_fmt_t format,
- void *output_data,
- size_t * output_data_size);
+ void *output_data, size_t *output_data_size);
int gnutls_x509_privkey_export2(gnutls_x509_privkey_t key,
gnutls_x509_crt_fmt_t format,
gnutls_datum_t * out);
@@ -1299,12 +1282,11 @@ int gnutls_x509_privkey_export_pkcs8(gnutls_x509_privkey_t key,
const char *password,
unsigned int flags,
void *output_data,
- size_t * output_data_size);
+ size_t *output_data_size);
int gnutls_x509_privkey_export2_pkcs8(gnutls_x509_privkey_t key,
gnutls_x509_crt_fmt_t format,
const char *password,
- unsigned int flags,
- gnutls_datum_t * out);
+ unsigned int flags, gnutls_datum_t * out);
int gnutls_x509_privkey_export_rsa_raw2(gnutls_x509_privkey_t key,
gnutls_datum_t * m,
gnutls_datum_t * e,
@@ -1319,37 +1301,31 @@ int gnutls_x509_privkey_export_rsa_raw(gnutls_x509_privkey_t key,
gnutls_datum_t * e,
gnutls_datum_t * d,
gnutls_datum_t * p,
- gnutls_datum_t * q,
- gnutls_datum_t * u);
+ gnutls_datum_t * q, gnutls_datum_t * u);
int gnutls_x509_privkey_export_ecc_raw(gnutls_x509_privkey_t key,
gnutls_ecc_curve_t * curve,
gnutls_datum_t * x,
- gnutls_datum_t * y,
- gnutls_datum_t * k);
+ gnutls_datum_t * y, gnutls_datum_t * k);
int gnutls_x509_privkey_export_gost_raw(gnutls_x509_privkey_t key,
- gnutls_ecc_curve_t * curve,
- gnutls_digest_algorithm_t * digest,
- gnutls_gost_paramset_t * paramset,
- gnutls_datum_t * x,
- gnutls_datum_t * y,
- gnutls_datum_t * k);
+ gnutls_ecc_curve_t * curve,
+ gnutls_digest_algorithm_t * digest,
+ gnutls_gost_paramset_t * paramset,
+ gnutls_datum_t * x,
+ gnutls_datum_t * y, gnutls_datum_t * k);
int gnutls_x509_privkey_sign_data(gnutls_x509_privkey_t key,
gnutls_digest_algorithm_t digest,
unsigned int flags,
const gnutls_datum_t * data,
- void *signature,
- size_t * signature_size);
+ void *signature, size_t *signature_size);
/* Certificate request stuff.
*/
-int gnutls_x509_crq_sign(gnutls_x509_crq_t crq,
- gnutls_x509_privkey_t key);
+int gnutls_x509_crq_sign(gnutls_x509_crq_t crq, gnutls_x509_privkey_t key);
int gnutls_x509_crq_sign2(gnutls_x509_crq_t crq,
gnutls_x509_privkey_t key,
- gnutls_digest_algorithm_t dig,
- unsigned int flags);
+ gnutls_digest_algorithm_t dig, unsigned int flags);
int gnutls_x509_crq_print(gnutls_x509_crq_t crq,
gnutls_certificate_print_formats_t
@@ -1372,53 +1348,46 @@ int gnutls_x509_crq_get_private_key_usage_period(gnutls_x509_crq_t
*critical);
int gnutls_x509_crq_get_dn(gnutls_x509_crq_t crq, char *buf,
- size_t * sizeof_buf);
+ size_t *sizeof_buf);
int gnutls_x509_crq_get_dn2(gnutls_x509_crq_t crq, gnutls_datum_t * dn);
-int gnutls_x509_crq_get_dn3(gnutls_x509_crq_t crq, gnutls_datum_t * dn, unsigned flags);
-int gnutls_x509_crq_get_dn_oid(gnutls_x509_crq_t crq, unsigned indx,
- void *oid, size_t * sizeof_oid);
-int gnutls_x509_crq_get_dn_by_oid(gnutls_x509_crq_t crq,
- const char *oid, unsigned indx,
- unsigned int raw_flag, void *buf,
- size_t * sizeof_buf);
+int gnutls_x509_crq_get_dn3(gnutls_x509_crq_t crq, gnutls_datum_t * dn,
+ unsigned flags);
+int gnutls_x509_crq_get_dn_oid(gnutls_x509_crq_t crq, unsigned indx, void *oid,
+ size_t *sizeof_oid);
+int gnutls_x509_crq_get_dn_by_oid(gnutls_x509_crq_t crq, const char *oid,
+ unsigned indx, unsigned int raw_flag,
+ void *buf, size_t *sizeof_buf);
int gnutls_x509_crq_set_dn(gnutls_x509_crq_t crq, const char *dn,
const char **err);
-int gnutls_x509_crq_set_dn_by_oid(gnutls_x509_crq_t crq,
- const char *oid,
- unsigned int raw_flag,
- const void *data,
+int gnutls_x509_crq_set_dn_by_oid(gnutls_x509_crq_t crq, const char *oid,
+ unsigned int raw_flag, const void *data,
unsigned int sizeof_data);
-int gnutls_x509_crq_set_version(gnutls_x509_crq_t crq,
- unsigned int version);
+int gnutls_x509_crq_set_version(gnutls_x509_crq_t crq, unsigned int version);
int gnutls_x509_crq_get_version(gnutls_x509_crq_t crq);
-int gnutls_x509_crq_set_key(gnutls_x509_crq_t crq,
- gnutls_x509_privkey_t key);
+int gnutls_x509_crq_set_key(gnutls_x509_crq_t crq, gnutls_x509_privkey_t key);
int
gnutls_x509_crq_set_extension_by_oid(gnutls_x509_crq_t crq,
const char *oid, const void *buf,
- size_t sizeof_buf,
- unsigned int critical);
+ size_t sizeof_buf, unsigned int critical);
int gnutls_x509_crq_set_challenge_password(gnutls_x509_crq_t crq,
const char *pass);
int gnutls_x509_crq_get_challenge_password(gnutls_x509_crq_t crq,
- char *pass,
- size_t * sizeof_pass);
+ char *pass, size_t *sizeof_pass);
int gnutls_x509_crq_set_attribute_by_oid(gnutls_x509_crq_t crq,
const char *oid,
void *buf, size_t sizeof_buf);
int gnutls_x509_crq_get_attribute_by_oid(gnutls_x509_crq_t crq,
const char *oid, unsigned indx,
- void *buf, size_t * sizeof_buf);
+ void *buf, size_t *sizeof_buf);
int gnutls_x509_crq_export(gnutls_x509_crq_t crq,
gnutls_x509_crt_fmt_t format,
- void *output_data, size_t * output_data_size);
+ void *output_data, size_t *output_data_size);
int gnutls_x509_crq_export2(gnutls_x509_crq_t crq,
- gnutls_x509_crt_fmt_t format,
- gnutls_datum_t * out);
+ gnutls_x509_crt_fmt_t format, gnutls_datum_t * out);
int gnutls_x509_crt_set_crq(gnutls_x509_crt_t crt, gnutls_x509_crq_t crq);
int gnutls_x509_crt_set_crq_extensions(gnutls_x509_crt_t crt,
@@ -1426,8 +1395,8 @@ int gnutls_x509_crt_set_crq_extensions(gnutls_x509_crt_t crt,
int
gnutls_x509_crt_set_crq_extension_by_oid(gnutls_x509_crt_t crt,
- gnutls_x509_crq_t crq, const char *oid,
- unsigned flags);
+ gnutls_x509_crq_t crq, const char *oid,
+ unsigned flags);
int gnutls_x509_crq_set_private_key_usage_period(gnutls_x509_crq_t
crq,
@@ -1444,59 +1413,56 @@ int gnutls_x509_crq_set_subject_alt_name(gnutls_x509_crq_t crq,
int
gnutls_x509_crq_set_subject_alt_othername(gnutls_x509_crq_t crq,
- const char *oid,
- const void *data,
- unsigned int data_size,
- unsigned int flags);
+ const char *oid,
+ const void *data,
+ unsigned int data_size,
+ unsigned int flags);
-int gnutls_x509_crq_set_key_usage(gnutls_x509_crq_t crq,
- unsigned int usage);
+int gnutls_x509_crq_set_key_usage(gnutls_x509_crq_t crq, unsigned int usage);
int gnutls_x509_crq_set_basic_constraints(gnutls_x509_crq_t crq,
unsigned int ca,
int pathLenConstraint);
int gnutls_x509_crq_set_key_purpose_oid(gnutls_x509_crq_t crq,
- const void *oid,
- unsigned int critical);
+ const void *oid, unsigned int critical);
int gnutls_x509_crq_get_key_purpose_oid(gnutls_x509_crq_t crq,
unsigned indx, void *oid,
- size_t * sizeof_oid,
+ size_t *sizeof_oid,
unsigned int *critical);
int gnutls_x509_crq_get_extension_data(gnutls_x509_crq_t crq,
unsigned indx, void *data,
- size_t * sizeof_data);
+ size_t *sizeof_data);
int
gnutls_x509_crq_get_extension_data2(gnutls_x509_crq_t crq,
- unsigned indx,
- gnutls_datum_t * data);
+ unsigned indx, gnutls_datum_t * data);
int gnutls_x509_crq_get_extension_info(gnutls_x509_crq_t crq,
unsigned indx, void *oid,
- size_t * sizeof_oid,
+ size_t *sizeof_oid,
unsigned int *critical);
int gnutls_x509_crq_get_attribute_data(gnutls_x509_crq_t crq,
unsigned indx, void *data,
- size_t * sizeof_data);
+ size_t *sizeof_data);
int gnutls_x509_crq_get_attribute_info(gnutls_x509_crq_t crq,
unsigned indx, void *oid,
- size_t * sizeof_oid);
-int gnutls_x509_crq_get_pk_algorithm(gnutls_x509_crq_t crq,
- unsigned int *bits);
+ size_t *sizeof_oid);
+int gnutls_x509_crq_get_pk_algorithm(gnutls_x509_crq_t crq, unsigned int *bits);
int gnutls_x509_crq_get_spki(gnutls_x509_crq_t crq, gnutls_x509_spki_t spki,
unsigned int flags);
-int gnutls_x509_crq_set_spki(gnutls_x509_crq_t crq, const gnutls_x509_spki_t spki,
- unsigned int flags);
+int gnutls_x509_crq_set_spki(gnutls_x509_crq_t crq,
+ const gnutls_x509_spki_t spki, unsigned int flags);
-int gnutls_x509_crq_get_signature_oid(gnutls_x509_crq_t crq, char *oid, size_t *oid_size);
-int gnutls_x509_crq_get_pk_oid(gnutls_x509_crq_t crq, char *oid, size_t *oid_size);
+int gnutls_x509_crq_get_signature_oid(gnutls_x509_crq_t crq, char *oid,
+ size_t *oid_size);
+int gnutls_x509_crq_get_pk_oid(gnutls_x509_crq_t crq, char *oid,
+ size_t *oid_size);
int gnutls_x509_crq_get_key_id(gnutls_x509_crq_t crq,
unsigned int flags,
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,
- gnutls_datum_t * m,
- gnutls_datum_t * e);
+ gnutls_datum_t * m, gnutls_datum_t * e);
int gnutls_x509_crq_get_key_usage(gnutls_x509_crq_t crq,
unsigned int *key_usage,
@@ -1507,44 +1473,40 @@ int gnutls_x509_crq_get_basic_constraints(gnutls_x509_crq_t crq,
int gnutls_x509_crq_get_subject_alt_name(gnutls_x509_crq_t crq,
unsigned int seq,
void *ret,
- size_t * ret_size,
+ size_t *ret_size,
unsigned int *ret_type,
unsigned int *critical);
int gnutls_x509_crq_get_subject_alt_othername_oid(gnutls_x509_crq_t
crq,
unsigned int seq,
- void *ret,
- size_t * ret_size);
+ void *ret, size_t *ret_size);
int gnutls_x509_crq_get_extension_by_oid(gnutls_x509_crq_t crq,
const char *oid, unsigned indx,
void *buf,
- size_t * sizeof_buf,
+ size_t *sizeof_buf,
unsigned int *critical);
int gnutls_x509_crq_get_tlsfeatures(gnutls_x509_crq_t crq,
gnutls_x509_tlsfeatures_t features,
- unsigned flags,
- unsigned int *critical);
+ unsigned flags, unsigned int *critical);
int gnutls_x509_crq_set_tlsfeatures(gnutls_x509_crq_t crq,
gnutls_x509_tlsfeatures_t features);
int
gnutls_x509_crt_get_extension_by_oid2(gnutls_x509_crt_t cert,
- const char *oid, unsigned indx,
- gnutls_datum_t *output,
- unsigned int *critical);
+ const char *oid, unsigned indx,
+ gnutls_datum_t * output,
+ unsigned int *critical);
typedef struct gnutls_x509_trust_list_st *gnutls_x509_trust_list_t;
typedef struct gnutls_x509_trust_list_iter *gnutls_x509_trust_list_iter_t;
int
-gnutls_x509_trust_list_init(gnutls_x509_trust_list_t * list,
- unsigned int size);
+gnutls_x509_trust_list_init(gnutls_x509_trust_list_t * list, unsigned int size);
void
-gnutls_x509_trust_list_deinit(gnutls_x509_trust_list_t list,
- unsigned int all);
+gnutls_x509_trust_list_deinit(gnutls_x509_trust_list_t list, unsigned int all);
int gnutls_x509_trust_list_get_issuer(gnutls_x509_trust_list_t
list, gnutls_x509_crt_t cert,
@@ -1552,15 +1514,19 @@ int gnutls_x509_trust_list_get_issuer(gnutls_x509_trust_list_t
unsigned int flags);
int gnutls_x509_trust_list_get_issuer_by_dn(gnutls_x509_trust_list_t list,
- const gnutls_datum_t *dn,
- gnutls_x509_crt_t *issuer,
- unsigned int flags);
-
-int gnutls_x509_trust_list_get_issuer_by_subject_key_id(gnutls_x509_trust_list_t list,
- const gnutls_datum_t *dn,
- const gnutls_datum_t *spki,
- gnutls_x509_crt_t *issuer,
- unsigned int flags);
+ const gnutls_datum_t * dn,
+ gnutls_x509_crt_t * issuer,
+ unsigned int flags);
+
+int gnutls_x509_trust_list_get_issuer_by_subject_key_id(gnutls_x509_trust_list_t
+ list,
+ const gnutls_datum_t *
+ dn,
+ const gnutls_datum_t *
+ spki,
+ gnutls_x509_crt_t *
+ issuer,
+ unsigned int flags);
/**
* gnutls_trust_list_flags_t:
* @GNUTLS_TL_VERIFY_CRL: If any CRLs are provided they will be verified for validity
@@ -1583,17 +1549,17 @@ int gnutls_x509_trust_list_get_issuer_by_subject_key_id(gnutls_x509_trust_list_t
*/
typedef enum gnutls_trust_list_flags_t {
GNUTLS_TL_VERIFY_CRL = 1,
-#define GNUTLS_TL_VERIFY_CRL 1
- GNUTLS_TL_USE_IN_TLS = (1<<1),
-#define GNUTLS_TL_USE_IN_TLS (1<<1)
- GNUTLS_TL_NO_DUPLICATES = (1<<2),
-#define GNUTLS_TL_NO_DUPLICATES (1<<2)
- GNUTLS_TL_NO_DUPLICATE_KEY = (1<<3),
-#define GNUTLS_TL_NO_DUPLICATE_KEY (1<<3)
- GNUTLS_TL_GET_COPY = (1<<4),
-#define GNUTLS_TL_GET_COPY (1<<4)
- GNUTLS_TL_FAIL_ON_INVALID_CRL = (1<<5)
-#define GNUTLS_TL_FAIL_ON_INVALID_CRL (1<<5)
+# define GNUTLS_TL_VERIFY_CRL 1
+ GNUTLS_TL_USE_IN_TLS = (1 << 1),
+# define GNUTLS_TL_USE_IN_TLS (1<<1)
+ GNUTLS_TL_NO_DUPLICATES = (1 << 2),
+# define GNUTLS_TL_NO_DUPLICATES (1<<2)
+ GNUTLS_TL_NO_DUPLICATE_KEY = (1 << 3),
+# define GNUTLS_TL_NO_DUPLICATE_KEY (1<<3)
+ GNUTLS_TL_GET_COPY = (1 << 4),
+# define GNUTLS_TL_GET_COPY (1<<4)
+ GNUTLS_TL_FAIL_ON_INVALID_CRL = (1 << 5)
+# define GNUTLS_TL_FAIL_ON_INVALID_CRL (1<<5)
} gnutls_trust_list_flags_t;
int
@@ -1609,8 +1575,7 @@ int gnutls_x509_trust_list_add_named_crt(gnutls_x509_trust_list_t
list,
gnutls_x509_crt_t cert,
const void *name,
- size_t name_size,
- unsigned int flags);
+ size_t name_size, unsigned int flags);
int
gnutls_x509_trust_list_add_crls(gnutls_x509_trust_list_t list,
@@ -1619,26 +1584,26 @@ gnutls_x509_trust_list_add_crls(gnutls_x509_trust_list_t list,
unsigned int flags,
unsigned int verification_flags);
-
int
gnutls_x509_trust_list_iter_get_ca(gnutls_x509_trust_list_t list,
- gnutls_x509_trust_list_iter_t *iter,
- gnutls_x509_crt_t *crt);
+ gnutls_x509_trust_list_iter_t * iter,
+ gnutls_x509_crt_t * crt);
void gnutls_x509_trust_list_iter_deinit(gnutls_x509_trust_list_iter_t iter);
-typedef int gnutls_verify_output_function(gnutls_x509_crt_t cert, gnutls_x509_crt_t issuer,
- /* The issuer if verification failed
- * because of him. might be null.
- */
+typedef int gnutls_verify_output_function(gnutls_x509_crt_t cert,
+ gnutls_x509_crt_t issuer,
+ /* The issuer if verification failed
+ * because of him. might be null.
+ */
gnutls_x509_crl_t crl, /* The CRL that caused verification failure
* if any. Might be null.
*/
- unsigned int
- verification_output);
+ unsigned int verification_output);
void gnutls_session_set_verify_output_function(gnutls_session_t session,
- gnutls_verify_output_function * func);
+ gnutls_verify_output_function *
+ func);
int gnutls_x509_trust_list_verify_named_crt
(gnutls_x509_trust_list_t list, gnutls_x509_crt_t cert,
@@ -1647,13 +1612,13 @@ int gnutls_x509_trust_list_verify_named_crt
int
gnutls_x509_trust_list_verify_crt2(gnutls_x509_trust_list_t list,
- gnutls_x509_crt_t * cert_list,
- unsigned int cert_list_size,
- gnutls_typed_vdata_st * data,
- unsigned int elements,
- unsigned int flags,
- unsigned int *voutput,
- gnutls_verify_output_function func);
+ gnutls_x509_crt_t * cert_list,
+ unsigned int cert_list_size,
+ gnutls_typed_vdata_st * data,
+ unsigned int elements,
+ unsigned int flags,
+ unsigned int *voutput,
+ gnutls_verify_output_function func);
int
gnutls_x509_trust_list_verify_crt(gnutls_x509_trust_list_t list,
@@ -1683,11 +1648,11 @@ gnutls_x509_trust_list_add_trust_file(gnutls_x509_trust_list_t
int
gnutls_x509_trust_list_add_trust_dir(gnutls_x509_trust_list_t list,
- const char *ca_dir,
- const char *crl_dir,
- gnutls_x509_crt_fmt_t type,
- unsigned int tl_flags,
- unsigned int tl_vflags);
+ const char *ca_dir,
+ const char *crl_dir,
+ gnutls_x509_crt_fmt_t type,
+ unsigned int tl_flags,
+ unsigned int tl_vflags);
int
gnutls_x509_trust_list_remove_trust_file(gnutls_x509_trust_list_t
@@ -1707,13 +1672,18 @@ gnutls_x509_trust_list_add_system_trust(gnutls_x509_trust_list_t
unsigned int tl_flags,
unsigned int tl_vflags);
-typedef int gnutls_x509_trust_list_getissuer_function(gnutls_x509_trust_list_t list,
- const gnutls_x509_crt_t cert,
- gnutls_x509_crt_t **issuers,
- unsigned int *issuers_size);
+typedef int gnutls_x509_trust_list_getissuer_function(gnutls_x509_trust_list_t
+ list,
+ const gnutls_x509_crt_t
+ cert,
+ gnutls_x509_crt_t **
+ issuers, unsigned int
+ *issuers_size);
-void gnutls_x509_trust_list_set_getissuer_function(gnutls_x509_trust_list_t tlist,
- gnutls_x509_trust_list_getissuer_function *func);
+void gnutls_x509_trust_list_set_getissuer_function(gnutls_x509_trust_list_t
+ tlist,
+ gnutls_x509_trust_list_getissuer_function
+ * func);
void gnutls_x509_trust_list_set_ptr(gnutls_x509_trust_list_t tlist, void *ptr);
@@ -1723,8 +1693,7 @@ void gnutls_certificate_set_trust_list
(gnutls_certificate_credentials_t res,
gnutls_x509_trust_list_t tlist, unsigned flags);
void gnutls_certificate_get_trust_list
- (gnutls_certificate_credentials_t res,
- gnutls_x509_trust_list_t *tlist);
+ (gnutls_certificate_credentials_t res, gnutls_x509_trust_list_t * tlist);
typedef struct gnutls_x509_ext_st {
char *oid;
@@ -1732,14 +1701,14 @@ typedef struct gnutls_x509_ext_st {
gnutls_datum_t data;
} gnutls_x509_ext_st;
-void gnutls_x509_ext_deinit(gnutls_x509_ext_st *ext);
+void gnutls_x509_ext_deinit(gnutls_x509_ext_st * ext);
int
-gnutls_x509_ext_print(gnutls_x509_ext_st *exts, unsigned int exts_size,
+gnutls_x509_ext_print(gnutls_x509_ext_st * exts, unsigned int exts_size,
gnutls_certificate_print_formats_t format,
gnutls_datum_t * out);
-#include <gnutls/pkcs7.h>
+# include <gnutls/pkcs7.h>
/* *INDENT-OFF* */
#ifdef __cplusplus
@@ -1747,4 +1716,4 @@ gnutls_x509_ext_print(gnutls_x509_ext_st *exts, unsigned int exts_size,
#endif
/* *INDENT-ON* */
-#endif /* GNUTLS_X509_H */
+#endif /* GNUTLS_X509_H */
View Lorry Controller Status