diff options
| author | Simon Josefsson <simon@josefsson.org> | 2005-12-18 13:32:55 +0000 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2005-12-18 13:32:55 +0000 |
| commit | 88e5a063388366544684d92385b7594f615b26ee (patch) | |
| tree | 0127c0f6d8f332f63a8034b5c860168e7370b6ed /includes | |
| parent | b1197067cdc4ddcc00df5c761796946d9c53e531 (diff) | |
| download | gnutls-88e5a063388366544684d92385b7594f615b26ee.tar.gz | |
Cosmetic changes.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/gnutls/gnutls.h.in | 41 |
1 files changed, 13 insertions, 28 deletions
diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in index 14462b1eb3..f8fc2296e4 100644 --- a/includes/gnutls/gnutls.h.in +++ b/includes/gnutls/gnutls.h.in @@ -887,10 +887,6 @@ extern "C" res, gnutls_params_function * func); - -#ifndef GNUTLS_UI_H -# define GNUTLS_UI_H - typedef enum gnutls_x509_subject_alt_name_t { GNUTLS_SAN_DNSNAME = 1, @@ -899,8 +895,6 @@ extern "C" GNUTLS_SAN_IPADDRESS } gnutls_x509_subject_alt_name_t; -# ifdef LIBGNUTLS_VERSION /* These are defined only in gnutls.h */ - struct gnutls_openpgp_key_int; typedef struct gnutls_openpgp_key_int *gnutls_openpgp_key_t; @@ -1017,36 +1011,27 @@ extern "C" /* key_usage will be an OR of the following values: */ -#define GNUTLS_KEY_DIGITAL_SIGNATURE 128 /* when the key is to be - * used for signing. - */ -#define GNUTLS_KEY_NON_REPUDIATION 64 -#define GNUTLS_KEY_KEY_ENCIPHERMENT 32 /* when the key is to be - * used for encryption. - */ -#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 + /* when the key is to be used for signing: */ +#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 void - gnutls_certificate_set_params_function (gnutls_certificate_credentials_t - res, - gnutls_params_function * func); + gnutls_certificate_set_params_function (gnutls_certificate_credentials_t res, + gnutls_params_function * func); void gnutls_anon_set_params_function (gnutls_anon_server_credentials_t res, gnutls_params_function * func); - void gnutls_psk_set_params_function (gnutls_psk_server_credentials_t res, gnutls_params_function * func); - -# endif /* LIBGNUTLS_VERSION */ - -#endif /* GNUTLS_UI_H */ - /* Gnutls error codes. The mapping to a TLS alert is also shown in * comments. */ |