mirror of git://git.gnupg.org/gnupg.git
agent,common,gpg: Use unsigned int for 1-bit field.
* agent/trustlist.c (struct trustitem_s): Use unsigned int. * common/audit.c (struct log_item_s): Likewise. * g10/packet.h (struct seckey_info): Likewise. -- Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
a8618fdccd
commit
459bd577fc
|
@ -38,14 +38,14 @@ struct trustitem_s
|
||||||
{
|
{
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
int disabled:1; /* This entry is disabled. */
|
unsigned int disabled:1; /* This entry is disabled. */
|
||||||
int for_pgp:1; /* Set by '*' or 'P' as first flag. */
|
unsigned int for_pgp:1; /* Set by '*' or 'P' as first flag. */
|
||||||
int for_smime:1; /* Set by '*' or 'S' as first flag. */
|
unsigned int for_smime:1; /* Set by '*' or 'S' as first flag. */
|
||||||
int relax:1; /* Relax checking of root certificate
|
unsigned int relax:1; /* Relax checking of root certificate
|
||||||
constraints. */
|
constraints. */
|
||||||
int cm:1; /* Use chain model for validation. */
|
unsigned int cm:1; /* Use chain model for validation. */
|
||||||
int qual:1; /* Root CA for qualified signatures. */
|
unsigned int qual:1; /* Root CA for qualified signatures. */
|
||||||
int de_vs:1; /* Root CA for de-vs compliant PKI. */
|
unsigned int de_vs:1; /* Root CA for de-vs compliant PKI. */
|
||||||
} flags;
|
} flags;
|
||||||
unsigned char fpr[20]; /* The binary fingerprint. */
|
unsigned char fpr[20]; /* The binary fingerprint. */
|
||||||
};
|
};
|
||||||
|
|
|
@ -45,8 +45,8 @@ struct log_item_s
|
||||||
int intvalue; /* A logged integer value. */
|
int intvalue; /* A logged integer value. */
|
||||||
char *string; /* A malloced string or NULL. */
|
char *string; /* A malloced string or NULL. */
|
||||||
ksba_cert_t cert; /* A certifciate or NULL. */
|
ksba_cert_t cert; /* A certifciate or NULL. */
|
||||||
int have_err:1;
|
unsigned int have_err:1;
|
||||||
int have_intvalue:1;
|
unsigned int have_intvalue:1;
|
||||||
};
|
};
|
||||||
typedef struct log_item_s *log_item_t;
|
typedef struct log_item_s *log_item_t;
|
||||||
|
|
||||||
|
|
|
@ -342,11 +342,11 @@ struct revoke_info
|
||||||
/* Information pertaining to secret keys. */
|
/* Information pertaining to secret keys. */
|
||||||
struct seckey_info
|
struct seckey_info
|
||||||
{
|
{
|
||||||
int is_protected:1; /* The secret info is protected and must */
|
unsigned int is_protected:1; /* The secret info is protected and must */
|
||||||
/* be decrypted before use, the protected */
|
/* be decrypted before use, the protected */
|
||||||
/* MPIs are simply (void*) pointers to memory */
|
/* MPIs are simply (void*) pointers to memory */
|
||||||
/* and should never be passed to a mpi_xxx() */
|
/* and should never be passed to a mpi_xxx() */
|
||||||
int sha1chk:1; /* SHA1 is used instead of a 16 bit checksum */
|
unsigned int sha1chk:1; /* SHA1 is used instead of a 16 bit checksum */
|
||||||
u16 csum; /* Checksum for old protection modes. */
|
u16 csum; /* Checksum for old protection modes. */
|
||||||
byte algo; /* Cipher used to protect the secret information. */
|
byte algo; /* Cipher used to protect the secret information. */
|
||||||
STRING2KEY s2k; /* S2K parameter. */
|
STRING2KEY s2k; /* S2K parameter. */
|
||||||
|
|
Loading…
Reference in New Issue