diff options
| author | Werner Koch <wk@gnupg.org> | 2014-01-31 14:35:49 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-01-31 14:35:49 +0100 |
| commit | 16a6311adefff0139056714521214f845315b7f8 (patch) | |
| tree | 22b4b6a09eb9a8882fd693f1993d0147c40c77ed /g10/ecdh.c | |
| parent | gpg: Use only OpenPGP public key algo ids and add the EdDSA algo id. (diff) | |
| download | gnupg2-16a6311adefff0139056714521214f845315b7f8.tar.xz gnupg2-16a6311adefff0139056714521214f845315b7f8.zip | |
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>
Diffstat (limited to 'g10/ecdh.c')
| -rw-r--r-- | g10/ecdh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/ecdh.c b/g10/ecdh.c index 752181ee5..0b062394c 100644 --- a/g10/ecdh.c +++ b/g10/ecdh.c @@ -183,9 +183,9 @@ pk_ecdh_encrypt_with_shared_point (int is_encrypt, gcry_mpi_t shared_mpi, xfree (secret_x); return gpg_error (GPG_ERR_BAD_PUBKEY); } - if (kdf_encr_algo != GCRY_CIPHER_AES128 - && kdf_encr_algo != GCRY_CIPHER_AES192 - && kdf_encr_algo != GCRY_CIPHER_AES256) + if (kdf_encr_algo != CIPHER_ALGO_AES + && kdf_encr_algo != CIPHER_ALGO_AES192 + && kdf_encr_algo != CIPHER_ALGO_AES256) { xfree (secret_x); return gpg_error (GPG_ERR_BAD_PUBKEY); |