From ea8a1685f75d27f5277d42ea7390ad5aeaf51b1f Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 29 Jan 2014 20:35:05 +0100 Subject: 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 --- g10/decrypt-data.c | 1 - 1 file changed, 1 deletion(-) (limited to 'g10/decrypt-data.c') diff --git a/g10/decrypt-data.c b/g10/decrypt-data.c index 4ad47cb8e..22a6aefbd 100644 --- a/g10/decrypt-data.c +++ b/g10/decrypt-data.c @@ -27,7 +27,6 @@ #include "gpg.h" #include "util.h" #include "packet.h" -#include "cipher.h" #include "options.h" #include "i18n.h" #include "status.h" -- cgit v1.2.3