From 16a6311adefff0139056714521214f845315b7f8 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 31 Jan 2014 14:35:49 +0100 Subject: 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 --- common/openpgpdefs.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'common') diff --git a/common/openpgpdefs.h b/common/openpgpdefs.h index 0a5844227..ac1af3788 100644 --- a/common/openpgpdefs.h +++ b/common/openpgpdefs.h @@ -107,9 +107,7 @@ typedef enum CIPHER_ALGO_TWOFISH = 10, /* 256 bit */ CIPHER_ALGO_CAMELLIA128 = 11, CIPHER_ALGO_CAMELLIA192 = 12, - CIPHER_ALGO_CAMELLIA256 = 13, - - CIPHER_ALGO_DUMMY = 110 /* No encryption at all (private). */ + CIPHER_ALGO_CAMELLIA256 = 13 } cipher_algo_t; -- cgit v1.2.3