gpg: Remove cipher.h and put algo ids into a common file.
authorWerner Koch <wk@gnupg.org>
Wed, 29 Jan 2014 19:35:05 +0000 (20:35 +0100)
committerWerner Koch <wk@gnupg.org>
Wed, 29 Jan 2014 19:35:05 +0000 (20:35 +0100)
commitea8a1685f75d27f5277d42ea7390ad5aeaf51b1f
treeee6f6e47d7232e0f38f549b9250ed3b5a3fa03c5
parent25b4c2acbd01f9b4c2c364f44c53b73498ed8469
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>
25 files changed:
agent/gpg-agent.c
common/openpgpdefs.h
g10/Makefile.am
g10/build-packet.c
g10/cipher.h [deleted file]
g10/cpr.c
g10/decrypt-data.c
g10/dek.h [new file with mode: 0644]
g10/filter.h
g10/free-packet.c
g10/gpg.c
g10/gpg.h
g10/gpgv.c
g10/keydb.h
g10/keygen.c
g10/main.h
g10/mainproc.c
g10/options.h
g10/packet.h
g10/parse-packet.c
g10/passphrase.c
g10/pubkey-enc.c
g10/seskey.c
g10/sig-check.c
g10/skclist.c