diff options
author | Simon Josefsson <simon@josefsson.org> | 2008-11-17 15:20:38 +0100 |
---|---|---|
committer | Simon Josefsson <simon@josefsson.org> | 2008-11-17 15:20:38 +0100 |
commit | cd48b36ca46b1596c0c48314de09c4ee74ef39a9 (patch) | |
tree | 88b1759e75bf81a6fa8afb4b29f8347e309b6bf0 /lib/includes/gnutls/crypto.h | |
parent | 846753877d38adda50cb94991f5427529cbd0c5e (diff) | |
download | gnutls-cd48b36ca46b1596c0c48314de09c4ee74ef39a9.tar.gz |
Fix cosmetic nits in header files.
Diffstat (limited to 'lib/includes/gnutls/crypto.h')
-rw-r--r-- | lib/includes/gnutls/crypto.h | 297 |
1 files changed, 156 insertions, 141 deletions
diff --git a/lib/includes/gnutls/crypto.h b/lib/includes/gnutls/crypto.h index 24813c0935..52a6b98aa0 100644 --- a/lib/includes/gnutls/crypto.h +++ b/lib/includes/gnutls/crypto.h @@ -25,46 +25,50 @@ #ifndef GNUTLS_CRYPTO_H # define GNUTLS_CRYPTO_H -#define GNUTLS_CRYPTO_API_VERSION 0x01 +# define GNUTLS_CRYPTO_API_VERSION 0x01 -typedef struct { - int (*init) (void** ctx); - int (*setkey) (void* ctx, const void * key, size_t keysize); - int (*setiv) (void* ctx, const void* iv, size_t ivsize); - int (*encrypt) (void* ctx, const void* plain, size_t plainsize, - void* encr, size_t encrsize); - int (*decrypt) (void* ctx, const void* encr, size_t encrsize, - void* plain, size_t plainsize); - void (*deinit) (void* ctx); +typedef struct +{ + int (*init) (void **ctx); + int (*setkey) (void *ctx, const void *key, size_t keysize); + int (*setiv) (void *ctx, const void *iv, size_t ivsize); + int (*encrypt) (void *ctx, const void *plain, size_t plainsize, + void *encr, size_t encrsize); + int (*decrypt) (void *ctx, const void *encr, size_t encrsize, + void *plain, size_t plainsize); + void (*deinit) (void *ctx); } gnutls_crypto_single_cipher_st; -typedef struct { - int (*init) (void** ctx); - int (*setkey) (void* ctx, const void * key, size_t keysize); - int (*hash) (void* ctx, const void * text, size_t textsize); - int (*copy) (void** dst_ctx, void* src_ctx); - int (*output) (void* src_ctx, void* digest, size_t digestsize); - void (*deinit)(void* ctx); +typedef struct +{ + int (*init) (void **ctx); + int (*setkey) (void *ctx, const void *key, size_t keysize); + int (*hash) (void *ctx, const void *text, size_t textsize); + int (*copy) (void **dst_ctx, void *src_ctx); + int (*output) (void *src_ctx, void *digest, size_t digestsize); + void (*deinit) (void *ctx); } gnutls_crypto_single_mac_st; -typedef struct { - int (*init) (gnutls_cipher_algorithm_t, void** ctx); - int (*setkey) (void* ctx, const void * key, size_t keysize); - int (*setiv) (void* ctx, const void* iv, size_t ivsize); - int (*encrypt) (void* ctx, const void* plain, size_t plainsize, - void* encr, size_t encrsize); - int (*decrypt) (void* ctx, const void* encr, size_t encrsize, - void* plain, size_t plainsize); - void (*deinit) (void* ctx); +typedef struct +{ + int (*init) (gnutls_cipher_algorithm_t, void **ctx); + int (*setkey) (void *ctx, const void *key, size_t keysize); + int (*setiv) (void *ctx, const void *iv, size_t ivsize); + int (*encrypt) (void *ctx, const void *plain, size_t plainsize, + void *encr, size_t encrsize); + int (*decrypt) (void *ctx, const void *encr, size_t encrsize, + void *plain, size_t plainsize); + void (*deinit) (void *ctx); } gnutls_crypto_cipher_st; -typedef struct { - int (*init) (gnutls_mac_algorithm_t, void** ctx); - int (*setkey) (void* ctx, const void * key, size_t keysize); - int (*hash) (void* ctx, const void * text, size_t textsize); - int (*copy) (void** dst_ctx, void* src_ctx); - int (*output) (void* src_ctx, void* digest, size_t digestsize); - void (*deinit)(void* ctx); +typedef struct +{ + int (*init) (gnutls_mac_algorithm_t, void **ctx); + int (*setkey) (void *ctx, const void *key, size_t keysize); + int (*hash) (void *ctx, const void *text, size_t textsize); + int (*copy) (void **dst_ctx, void *src_ctx); + int (*output) (void *src_ctx, void *digest, size_t digestsize); + void (*deinit) (void *ctx); } gnutls_crypto_mac_st; /* the same... setkey should be null */ @@ -72,112 +76,115 @@ typedef gnutls_crypto_single_mac_st gnutls_crypto_single_digest_st; typedef gnutls_crypto_mac_st gnutls_crypto_digest_st; typedef enum gnutls_rnd_level - { - /* fatal in parts of session if broken, i.e., vulnerable to - statistical analysis */ - GNUTLS_RND_NONCE = 0, - /* fatal in session if broken */ - GNUTLS_RND_RANDOM = 1, - /* fatal in many sessions if broken */ - GNUTLS_RND_KEY = 2 - } gnutls_rnd_level_t; +{ + /* fatal in parts of session if broken, i.e., vulnerable to + statistical analysis */ + GNUTLS_RND_NONCE = 0, + /* fatal in session if broken */ + GNUTLS_RND_RANDOM = 1, + /* fatal in many sessions if broken */ + GNUTLS_RND_KEY = 2 +} gnutls_rnd_level_t; typedef enum - { - GNUTLS_PK_FLAG_NONE = 0 - } gnutls_pk_flag_t; +{ + GNUTLS_PK_FLAG_NONE = 0 +} gnutls_pk_flag_t; -typedef struct gnutls_crypto_rnd { - int (*init)( void** ctx); - int (*rnd) ( void* ctx, int /* gnutls_rnd_level_t */ level, - void* data, size_t datasize); - void (*deinit)( void* ctx); +typedef struct gnutls_crypto_rnd +{ + int (*init) (void **ctx); + int (*rnd) (void *ctx, int /* gnutls_rnd_level_t */ level, + void *data, size_t datasize); + void (*deinit) (void *ctx); } gnutls_crypto_rnd_st; -typedef void* bigint_t; +typedef void *bigint_t; typedef enum - { - /* raw unsigned integer format */ - GNUTLS_MPI_FORMAT_USG = 0, - /* raw signed integer format - always a leading zero when positive */ - GNUTLS_MPI_FORMAT_STD = 1, - /* the pgp integer format */ - GNUTLS_MPI_FORMAT_PGP = 2 - } gnutls_bigint_format_t; +{ + /* raw unsigned integer format */ + GNUTLS_MPI_FORMAT_USG = 0, + /* raw signed integer format - always a leading zero when positive */ + GNUTLS_MPI_FORMAT_STD = 1, + /* the pgp integer format */ + GNUTLS_MPI_FORMAT_PGP = 2 +} gnutls_bigint_format_t; typedef struct { - bigint_t g; /* group generator */ - bigint_t p; /* prime */ + bigint_t g; /* group generator */ + bigint_t p; /* prime */ } gnutls_group_st; /* Multi precision integer arithmetic */ -typedef struct gnutls_crypto_bigint { - bigint_t (*bigint_new)( int nbits); - void (*bigint_release)( bigint_t n); +typedef struct gnutls_crypto_bigint +{ + bigint_t (*bigint_new) (int nbits); + void (*bigint_release) (bigint_t n); /* 0 for equality, > 0 for m1>m2, < 0 for m1<m2 */ - int (*bigint_cmp)(const bigint_t m1, const bigint_t m2); + int (*bigint_cmp) (const bigint_t m1, const bigint_t m2); /* as bigint_cmp */ - int (*bigint_cmp_ui)(const bigint_t m1, unsigned long m2); + int (*bigint_cmp_ui) (const bigint_t m1, unsigned long m2); /* ret = a % b */ - bigint_t (*bigint_mod) (const bigint_t a, const bigint_t b); + bigint_t (*bigint_mod) (const bigint_t a, const bigint_t b); /* a = b -> ret == a */ - bigint_t (*bigint_set) (bigint_t a, const bigint_t b); + bigint_t (*bigint_set) (bigint_t a, const bigint_t b); /* a = b -> ret == a */ - bigint_t (*bigint_set_ui) (bigint_t a, unsigned long b); - unsigned int (*bigint_get_nbits)(const bigint_t a); + bigint_t (*bigint_set_ui) (bigint_t a, unsigned long b); + unsigned int (*bigint_get_nbits) (const bigint_t a); /* w = b ^ e mod m */ - bigint_t (*bigint_powm) (bigint_t w, const bigint_t b, - const bigint_t e, const bigint_t m); + bigint_t (*bigint_powm) (bigint_t w, const bigint_t b, + const bigint_t e, const bigint_t m); /* w = a + b mod m */ - bigint_t (*bigint_addm) (bigint_t w, const bigint_t a, - const bigint_t b, const bigint_t m); + bigint_t (*bigint_addm) (bigint_t w, const bigint_t a, + const bigint_t b, const bigint_t m); /* w = a - b mod m */ - bigint_t (*bigint_subm) (bigint_t w, const bigint_t a, const bigint_t b, - const bigint_t m); + bigint_t (*bigint_subm) (bigint_t w, const bigint_t a, const bigint_t b, + const bigint_t m); /* w = a * b mod m */ - bigint_t (*bigint_mulm) (bigint_t w, const bigint_t a, const bigint_t b, - const bigint_t m); - /* w = a + b */bigint_t (*bigint_add) (bigint_t w, const bigint_t a, - const bigint_t b); - /* w = a - b */bigint_t (*bigint_sub) (bigint_t w, const bigint_t a, - const bigint_t b); + bigint_t (*bigint_mulm) (bigint_t w, const bigint_t a, const bigint_t b, + const bigint_t m); + /* w = a + b */ bigint_t (*bigint_add) (bigint_t w, const bigint_t a, + const bigint_t b); + /* w = a - b */ bigint_t (*bigint_sub) (bigint_t w, const bigint_t a, + const bigint_t b); /* w = a * b */ - bigint_t (*bigint_mul) (bigint_t w, const bigint_t a, const bigint_t b); + bigint_t (*bigint_mul) (bigint_t w, const bigint_t a, const bigint_t b); /* w = a + b */ - bigint_t (*bigint_add_ui) (bigint_t w, const bigint_t a, unsigned long b); + bigint_t (*bigint_add_ui) (bigint_t w, const bigint_t a, unsigned long b); /* w = a - b */ - bigint_t (*bigint_sub_ui) (bigint_t w, const bigint_t a, unsigned long b); + bigint_t (*bigint_sub_ui) (bigint_t w, const bigint_t a, unsigned long b); /* w = a * b */ - bigint_t (*bigint_mul_ui) (bigint_t w, const bigint_t a, unsigned long b); + bigint_t (*bigint_mul_ui) (bigint_t w, const bigint_t a, unsigned long b); /* q = a / b */ - bigint_t (*bigint_div) (bigint_t q, const bigint_t a, const bigint_t b); + bigint_t (*bigint_div) (bigint_t q, const bigint_t a, const bigint_t b); /* 0 if prime */ int (*bigint_prime_check) (const bigint_t pp); - int (*bigint_generate_group) (gnutls_group_st* gg, unsigned int bits); + int (*bigint_generate_group) (gnutls_group_st * gg, unsigned int bits); /* reads an bigint from a buffer */ /* stores an bigint into the buffer. returns * GNUTLS_E_SHORT_MEMORY_BUFFER if buf_size is not sufficient to * store this integer, and updates the buf_size; */ - bigint_t (*bigint_scan) (const void* buf, size_t buf_size, - gnutls_bigint_format_t format); - int (*bigint_print) (const bigint_t a, void* buf, size_t* buf_size, + bigint_t (*bigint_scan) (const void *buf, size_t buf_size, + gnutls_bigint_format_t format); + int (*bigint_print) (const bigint_t a, void *buf, size_t * buf_size, gnutls_bigint_format_t format); } gnutls_crypto_bigint_st; #define GNUTLS_MAX_PK_PARAMS 6 -typedef struct { +typedef struct +{ bigint_t params[GNUTLS_MAX_PK_PARAMS]; - unsigned int params_nr; /* the number of parameters */ + unsigned int params_nr; /* the number of parameters */ unsigned int flags; } gnutls_pk_params_st; -void gnutls_pk_params_release (gnutls_pk_params_st* p); -void gnutls_pk_params_init (gnutls_pk_params_st* p); +void gnutls_pk_params_release (gnutls_pk_params_st * p); +void gnutls_pk_params_init (gnutls_pk_params_st * p); /* params are: * RSA: @@ -206,79 +213,87 @@ typedef enum } gnutls_direction_t; /* Public key algorithms */ -typedef struct gnutls_crypto_pk { +typedef struct gnutls_crypto_pk +{ /* The params structure should contain the private or public key * parameters, depending on the operation */ - int (*encrypt)( gnutls_pk_algorithm_t, gnutls_datum_t* ciphertext, - const gnutls_datum_t* plaintext, const gnutls_pk_params_st* /* public */); - int (*decrypt)( gnutls_pk_algorithm_t, gnutls_datum_t* plaintext, - const gnutls_datum_t* ciphertext, - const gnutls_pk_params_st* /* private */); - - int (*sign)( gnutls_pk_algorithm_t, gnutls_datum_t* signature, - const gnutls_datum_t* data, - const gnutls_pk_params_st* /* private */); - int (*verify)( gnutls_pk_algorithm_t, const gnutls_datum_t* data, - const gnutls_datum_t* signature, - const gnutls_pk_params_st* /* public */); - - int (*generate)( gnutls_pk_algorithm_t, unsigned int level /*bits*/, - gnutls_pk_params_st*); + int (*encrypt) (gnutls_pk_algorithm_t, gnutls_datum_t * ciphertext, + const gnutls_datum_t * plaintext, + const gnutls_pk_params_st * /* public */ ); + int (*decrypt) (gnutls_pk_algorithm_t, gnutls_datum_t * plaintext, + const gnutls_datum_t * ciphertext, + const gnutls_pk_params_st * /* private */ ); + + int (*sign) (gnutls_pk_algorithm_t, gnutls_datum_t * signature, + const gnutls_datum_t * data, + const gnutls_pk_params_st * /* private */ ); + int (*verify) (gnutls_pk_algorithm_t, const gnutls_datum_t * data, + const gnutls_datum_t * signature, + const gnutls_pk_params_st * /* public */ ); + + int (*generate) (gnutls_pk_algorithm_t, unsigned int level /*bits */ , + gnutls_pk_params_st *); /* this function should convert params to ones suitable * for the above functions */ - int (*pk_fixup_private_params)( gnutls_pk_algorithm_t, gnutls_direction_t, - gnutls_pk_params_st*); + int (*pk_fixup_private_params) (gnutls_pk_algorithm_t, gnutls_direction_t, + gnutls_pk_params_st *); } gnutls_crypto_pk_st; /* priority: infinity for backend algorithms, 90 for kernel algorithms, lowest wins */ -#define gnutls_crypto_single_cipher_register(algo, prio, st) \ - gnutls_crypto_single_cipher_register2 (algo, prio, GNUTLS_CRYPTO_API_VERSION, st) -#define gnutls_crypto_single_mac_register(algo, prio, st) \ - gnutls_crypto_single_mac_register2 (algo, prio, GNUTLS_CRYPTO_API_VERSION, st) -#define gnutls_crypto_single_digest_register(algo, prio, st) \ - gnutls_crypto_single_digest_register2(algo, prio, GNUTLS_CRYPTO_API_VERSION, st) - -int gnutls_crypto_single_cipher_register2 (gnutls_cipher_algorithm_t algorithm, - int priority, int version, - gnutls_crypto_single_cipher_st* s); +# define gnutls_crypto_single_cipher_register(algo, prio, st) \ + gnutls_crypto_single_cipher_register2 (algo, prio, \ + GNUTLS_CRYPTO_API_VERSION, st) +# define gnutls_crypto_single_mac_register(algo, prio, st) \ + gnutls_crypto_single_mac_register2 (algo, prio, \ + GNUTLS_CRYPTO_API_VERSION, st) +# define gnutls_crypto_single_digest_register(algo, prio, st) \ + gnutls_crypto_single_digest_register2(algo, prio, \ + GNUTLS_CRYPTO_API_VERSION, st) + +int gnutls_crypto_single_cipher_register2 (gnutls_cipher_algorithm_t + algorithm, int priority, + int version, + gnutls_crypto_single_cipher_st * + s); int gnutls_crypto_single_mac_register2 (gnutls_mac_algorithm_t algorithm, int priority, int version, - gnutls_crypto_single_mac_st* s); -int gnutls_crypto_single_digest_register2 (gnutls_digest_algorithm_t algorithm, - int priority, int version, - gnutls_crypto_single_digest_st* s); - -#define gnutls_crypto_cipher_register(prio, st) \ + gnutls_crypto_single_mac_st * s); +int gnutls_crypto_single_digest_register2 (gnutls_digest_algorithm_t + algorithm, int priority, + int version, + gnutls_crypto_single_digest_st * + s); + +# define gnutls_crypto_cipher_register(prio, st) \ gnutls_crypto_cipher_register2 (prio, GNUTLS_CRYPTO_API_VERSION, st) -#define gnutls_crypto_mac_register(prio, st) \ +# define gnutls_crypto_mac_register(prio, st) \ gnutls_crypto_mac_register2 (prio, GNUTLS_CRYPTO_API_VERSION, st) -#define gnutls_crypto_digest_register(prio, st) \ +# define gnutls_crypto_digest_register(prio, st) \ gnutls_crypto_digest_register2 (prio, GNUTLS_CRYPTO_API_VERSION, st) int gnutls_crypto_cipher_register2 (int priority, int version, - gnutls_crypto_cipher_st* s); + gnutls_crypto_cipher_st * s); int gnutls_crypto_mac_register2 (int priority, int version, - gnutls_crypto_mac_st* s); + gnutls_crypto_mac_st * s); int gnutls_crypto_digest_register2 (int priority, int version, - gnutls_crypto_digest_st* s); + gnutls_crypto_digest_st * s); -#define gnutls_crypto_rnd_register(prio, st) \ +# define gnutls_crypto_rnd_register(prio, st) \ gnutls_crypto_rnd_register2 (prio, GNUTLS_CRYPTO_API_VERSION, st) -#define gnutls_crypto_pk_register(prio, st) \ +# define gnutls_crypto_pk_register(prio, st) \ gnutls_crypto_pk_register2 (prio, GNUTLS_CRYPTO_API_VERSION, st) -#define gnutls_crypto_bigint_register(prio, st) \ +# define gnutls_crypto_bigint_register(prio, st) \ gnutls_crypto_bigint_register2 (prio, GNUTLS_CRYPTO_API_VERSION, st) int gnutls_crypto_rnd_register2 (int priority, int version, - gnutls_crypto_rnd_st* s); + gnutls_crypto_rnd_st * s); int gnutls_crypto_pk_register2 (int priority, int version, - gnutls_crypto_pk_st* s); + gnutls_crypto_pk_st * s); int gnutls_crypto_bigint_register2 (int priority, int version, - gnutls_crypto_bigint_st* s); + gnutls_crypto_bigint_st * s); #endif - |