gpg: Use only OpenPGP cipher algo ids.
authorWerner Koch <wk@gnupg.org>
Fri, 31 Jan 2014 13:35:49 +0000 (14:35 +0100)
committerWerner Koch <wk@gnupg.org>
Fri, 31 Jan 2014 13:35:49 +0000 (14:35 +0100)
commit16a6311adefff0139056714521214f845315b7f8
tree22b4b6a09eb9a8882fd693f1993d0147c40c77ed
parentb7f8dec6325f1c80640f878ed3080bbc194fbc78
gpg: Use only OpenPGP cipher algo ids.

* g10/misc.c (map_cipher_openpgp_to_gcry): Use explicit mapping and
use enums for the arg and return value.
(map_cipher_gcry_to_openpgp): Ditto.
(openpgp_cipher_blocklen): Use constant macros.
(openpgp_cipher_test_algo): Use mapping function and prepare to
disable algorithms.
(openpgp_cipher_algo_name): Do not use Libgcrypt.

* g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Replace
CGRY_CIPHER_* by CIPHER_ALGO_*.

* common/openpgpdefs.h (cipher_algo_t): Remove unused
CIPHER_ALGO_DUMMY.

Signed-off-by: Werner Koch <wk@gnupg.org>
common/openpgpdefs.h
g10/ecdh.c
g10/main.h
g10/misc.c