diff options
| author | Werner Koch <[email protected]> | 2014-01-29 19:35:05 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-01-29 19:35:05 +0000 |
| commit | ea8a1685f75d27f5277d42ea7390ad5aeaf51b1f (patch) | |
| tree | ee6f6e47d7232e0f38f549b9250ed3b5a3fa03c5 /g10/packet.h | |
| parent | include: Remove this directory. (diff) | |
| download | gnupg-ea8a1685f75d27f5277d42ea7390ad5aeaf51b1f.tar.gz gnupg-ea8a1685f75d27f5277d42ea7390ad5aeaf51b1f.zip | |
gpg: Remove cipher.h and put algo ids into a common file.
* common/openpgpdefs.h (cipher_algo_t, pubkey_algo_t, digest_algo_t)
(compress_algo_t): New.
* agent/gpg-agent.c: Remove ../g10/cipher.h. Add openpgpdefs.h.
* g10/cipher.h (DEK): Move to ...
* g10/dek.h: new file.
* g10/cipher.h (is_RSA, is_ELGAMAL, is_DSA)
(PUBKEY_MAX_NPKEY, PUBKEY_MAX_NSKEY, PUBKEY_MAX_NSIG, PUBKEY_MAX_NENC)
(PUBKEY_USAGE_SIG, PUBKEY_USAGE_ENC, PUBKEY_USAGE_CERT)
(PUBKEY_USAGE_AUTH, PUBKEY_USAGE_NONE): Move to
* g10/packet.h: here.
* g10/cipher.h: Remove. Remove from all files.
* g10/filter.h, g10/packet.h: Include dek.h.
* g10/Makefile.am (common_source): Remove cipher.h. Add dek.h.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/packet.h')
| -rw-r--r-- | g10/packet.h | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/g10/packet.h b/g10/packet.h index b3956efb2..b1b82d75b 100644 --- a/g10/packet.h +++ b/g10/packet.h @@ -24,7 +24,7 @@ #include "types.h" #include "../common/iobuf.h" #include "../common/strlist.h" -#include "cipher.h" +#include "dek.h" #include "filter.h" #include "../common/openpgpdefs.h" #include "../common/userids.h" @@ -32,6 +32,31 @@ #define DEBUG_PARSE_PACKET 1 +/* Constants to allocate static MPI arrays. */ +#define PUBKEY_MAX_NPKEY 5 +#define PUBKEY_MAX_NSKEY 7 +#define PUBKEY_MAX_NSIG 2 +#define PUBKEY_MAX_NENC 2 + +/* Usage flags */ +#define PUBKEY_USAGE_SIG GCRY_PK_USAGE_SIGN /* Good for signatures. */ +#define PUBKEY_USAGE_ENC GCRY_PK_USAGE_ENCR /* Good for encryption. */ +#define PUBKEY_USAGE_CERT GCRY_PK_USAGE_CERT /* Also good to certify keys.*/ +#define PUBKEY_USAGE_AUTH GCRY_PK_USAGE_AUTH /* Good for authentication. */ +#define PUBKEY_USAGE_UNKNOWN GCRY_PK_USAGE_UNKN /* Unknown usage flag. */ +#define PUBKEY_USAGE_NONE 256 /* No usage given. */ +#if (GCRY_PK_USAGE_SIGN | GCRY_PK_USAGE_ENCR | GCRY_PK_USAGE_CERT \ + | GCRY_PK_USAGE_AUTH | GCRY_PK_USAGE_UNKN) >= 256 +# error Please choose another value for PUBKEY_USAGE_NONE +#endif + +/* Helper macros. */ +#define is_RSA(a) ((a)==PUBKEY_ALGO_RSA || (a)==PUBKEY_ALGO_RSA_E \ + || (a)==PUBKEY_ALGO_RSA_S ) +#define is_ELGAMAL(a) ((a)==PUBKEY_ALGO_ELGAMAL_E) +#define is_DSA(a) ((a)==PUBKEY_ALGO_DSA) + +/* A pointer to the packet object. */ typedef struct packet_struct PACKET; /* PKT_GPG_CONTROL types */ |