diff options
| author | Werner Koch <wk@gnupg.org> | 2014-01-29 20:35:05 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-01-29 20:35:05 +0100 |
| commit | ea8a1685f75d27f5277d42ea7390ad5aeaf51b1f (patch) | |
| tree | ee6f6e47d7232e0f38f549b9250ed3b5a3fa03c5 /agent | |
| parent | include: Remove this directory. (diff) | |
| download | gnupg2-ea8a1685f75d27f5277d42ea7390ad5aeaf51b1f.tar.xz gnupg2-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 <wk@gnupg.org>
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/gpg-agent.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 9810983eb..34f8ef34f 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -51,7 +51,7 @@ #include "gc-opt-flags.h" #include "exechelp.h" #include "asshelp.h" -#include "../g10/cipher.h" /* for PUBKEY_ALGO_ECDSA, PUBKEY_ALGO_ECDH */ +#include "openpgpdefs.h" /* for PUBKEY_ALGO_ECDSA, PUBKEY_ALGO_ECDH */ #include "../common/init.h" |