diff options
Diffstat (limited to 'src/certtool-common.h')
-rw-r--r-- | src/certtool-common.h | 85 |
1 files changed, 44 insertions, 41 deletions
diff --git a/src/certtool-common.h b/src/certtool-common.h index 0c8c69540f..071ddd4fbe 100644 --- a/src/certtool-common.h +++ b/src/certtool-common.h @@ -20,22 +20,22 @@ */ #ifndef GNUTLS_SRC_CERTTOOL_COMMON_H -#define GNUTLS_SRC_CERTTOOL_COMMON_H +# define GNUTLS_SRC_CERTTOOL_COMMON_H -#include <gnutls/x509.h> -#include <stdio.h> -#include <stdbool.h> -#include "attribute.h" +# include <gnutls/x509.h> +# include <stdio.h> +# include <stdbool.h> +# include "attribute.h" -#define TYPE_CRT 1 -#define TYPE_CRQ 2 +# define TYPE_CRT 1 +# define TYPE_CRQ 2 -#define SERIAL_MAX_BYTES 20 +# define SERIAL_MAX_BYTES 20 void certtool_version(void); -#include <gnutls/x509.h> -#include <gnutls/abstract.h> +# include <gnutls/x509.h> +# include <gnutls/abstract.h> typedef struct common_info { const char *secret_key; @@ -86,26 +86,33 @@ typedef struct common_info { } common_info_st; static inline -void switch_to_pkcs8_when_needed(common_info_st *cinfo, gnutls_x509_privkey_t key, unsigned key_type) + void switch_to_pkcs8_when_needed(common_info_st * cinfo, + gnutls_x509_privkey_t key, + unsigned key_type) { if (cinfo->pkcs8) return; - if (key_type == GNUTLS_PK_RSA_PSS || key_type == GNUTLS_PK_EDDSA_ED25519 || key_type == GNUTLS_PK_EDDSA_ED448 || - key_type == GNUTLS_PK_ECDH_X25519 || key_type == GNUTLS_PK_ECDH_X448 || - key_type == GNUTLS_PK_GOST_01 || key_type == GNUTLS_PK_GOST_12_256 || - key_type == GNUTLS_PK_GOST_12_512) { + if (key_type == GNUTLS_PK_RSA_PSS || key_type == GNUTLS_PK_EDDSA_ED25519 + || key_type == GNUTLS_PK_EDDSA_ED448 + || key_type == GNUTLS_PK_ECDH_X25519 + || key_type == GNUTLS_PK_ECDH_X448 || key_type == GNUTLS_PK_GOST_01 + || key_type == GNUTLS_PK_GOST_12_256 + || key_type == GNUTLS_PK_GOST_12_512) { if (cinfo->verbose) - fprintf(stderr, "Assuming --pkcs8 is given; %s private keys can only be exported in PKCS#8 format\n", + fprintf(stderr, + "Assuming --pkcs8 is given; %s private keys can only be exported in PKCS#8 format\n", gnutls_pk_algorithm_get_name(key_type)); cinfo->pkcs8 = 1; if (cinfo->password == NULL) cinfo->password = ""; } - if (gnutls_x509_privkey_get_seed(key, NULL, NULL, 0) != GNUTLS_E_INVALID_REQUEST) { + if (gnutls_x509_privkey_get_seed(key, NULL, NULL, 0) != + GNUTLS_E_INVALID_REQUEST) { if (cinfo->verbose) - fprintf(stderr, "Assuming --pkcs8 is given; provable private keys can only be exported in PKCS#8 format\n"); + fprintf(stderr, + "Assuming --pkcs8 is given; provable private keys can only be exported in PKCS#8 format\n"); cinfo->pkcs8 = 1; if (cinfo->password == NULL) cinfo->password = ""; @@ -116,21 +123,20 @@ void switch_to_pkcs8_when_needed(common_info_st *cinfo, gnutls_x509_privkey_t ke const char *get_pass(void); const char *get_confirmed_pass(bool empty_ok); void app_exit(int val) -#ifdef __GNUC__ -__attribute__ ((__noreturn__)) -#endif -; +# ifdef __GNUC__ + __attribute__((__noreturn__)) +# endif + ; int cipher_to_flags(const char *cipher); void -print_private_key(FILE *outfile, common_info_st * cinfo, gnutls_x509_privkey_t key); -gnutls_pubkey_t load_public_key_or_import(int mand, - gnutls_privkey_t privkey, +print_private_key(FILE * outfile, common_info_st * cinfo, + gnutls_x509_privkey_t key); +gnutls_pubkey_t load_public_key_or_import(int mand, gnutls_privkey_t privkey, common_info_st * info); gnutls_privkey_t load_private_key(int mand, common_info_st * info); -gnutls_x509_privkey_t load_x509_private_key(int mand, - common_info_st * info); -gnutls_x509_privkey_t *load_privkey_list(int mand, size_t * privkey_size, +gnutls_x509_privkey_t load_x509_private_key(int mand, common_info_st * info); +gnutls_x509_privkey_t *load_privkey_list(int mand, size_t *privkey_size, common_info_st * info); gnutls_x509_crq_t load_request(common_info_st * info); gnutls_privkey_t load_ca_private_key(common_info_st * info); @@ -138,10 +144,9 @@ gnutls_x509_crt_t load_ca_cert(unsigned mand, common_info_st * info); gnutls_x509_crt_t load_cert(int mand, common_info_st * info); gnutls_datum_t *load_secret_key(int mand, common_info_st * info); gnutls_pubkey_t load_pubkey(int mand, common_info_st * info); -gnutls_x509_crt_t *load_cert_list(int mand, size_t * size, - common_info_st * info); -gnutls_x509_crl_t *load_crl_list(int mand, size_t * size, +gnutls_x509_crt_t *load_cert_list(int mand, size_t *size, common_info_st * info); +gnutls_x509_crl_t *load_crl_list(int mand, size_t *size, common_info_st * info); int get_bits(gnutls_pk_algorithm_t key_type, int info_bits, const char *info_sec_param, int warn); @@ -152,11 +157,11 @@ gnutls_ecc_curve_t str_to_curve(const char *str); int generate_prime(FILE * outfile, int how, common_info_st * info); void dh_info(FILE * infile, FILE * outfile, common_info_st * ci); -gnutls_x509_privkey_t *load_privkey_list(int mand, size_t * privkey_size, +gnutls_x509_privkey_t *load_privkey_list(int mand, size_t *privkey_size, common_info_st * info); void print_pubkey_info(gnutls_pubkey_t pubkey, - FILE *outfile, + FILE * outfile, gnutls_certificate_print_formats_t format, gnutls_x509_crt_fmt_t outcert_format, unsigned int outtext); @@ -171,14 +176,12 @@ void print_gost_pkey(FILE * outfile, gnutls_ecc_curve_t curve, void print_rsa_pkey(FILE * outfile, 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 * exp1, gnutls_datum_t * exp2, - int cprint); + gnutls_datum_t * exp1, gnutls_datum_t * exp2, int cprint); void print_dsa_pkey(FILE * outfile, gnutls_datum_t * x, gnutls_datum_t * y, gnutls_datum_t * p, gnutls_datum_t * q, gnutls_datum_t * g, int cprint); -ATTRIBUTE_MALLOC -FILE *safe_open_rw(const char *file, int privkey_op); +ATTRIBUTE_MALLOC FILE *safe_open_rw(const char *file, int privkey_op); const char *get_password(common_info_st * cinfo, unsigned int *flags, int confirm); @@ -188,14 +191,14 @@ extern unsigned long lbuffer_size; void fix_lbuffer(unsigned long); -void decode_seed(gnutls_datum_t *seed, const char *hex, unsigned hex_size); +void decode_seed(gnutls_datum_t * seed, const char *hex, unsigned hex_size); -#define GNUTLS_PK_IS_RSA(pk) ((pk) == GNUTLS_PK_RSA || (pk) == GNUTLS_PK_RSA_PSS) +# define GNUTLS_PK_IS_RSA(pk) ((pk) == GNUTLS_PK_RSA || (pk) == GNUTLS_PK_RSA_PSS) gnutls_pk_algorithm_t figure_key_type(const char *key_type); gnutls_digest_algorithm_t hash_to_id(const char *hash); -void sign_params_to_flags(common_info_st *cinfo, const char *params); +void sign_params_to_flags(common_info_st * cinfo, const char *params); -#endif /* GNUTLS_SRC_CERTTOOL_COMMON_H */ +#endif /* GNUTLS_SRC_CERTTOOL_COMMON_H */ |