diff options
| author | Werner Koch <wk@gnupg.org> | 2018-01-22 16:23:02 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2018-01-22 16:50:21 +0100 |
| commit | da3015e3c05030fe709c8f922486e73d06d1d16a (patch) | |
| tree | da4271c073ce4051ee7ae7a1b07af89d0d354425 /g10/keydb.h | |
| parent | gpg: Refactor function encrypt_seskey. (diff) | |
| download | gnupg2-da3015e3c05030fe709c8f922486e73d06d1d16a.tar.xz gnupg2-da3015e3c05030fe709c8f922486e73d06d1d16a.zip | |
gpg: Unify AEAD parameter retrieval.
* g10/pkclist.c (select_aead_from_pklist): Return the AEAD_algo.
* g10/encrypt.c (use_aead): Return the AEAD algo.
(encrypt_simple): Adjust for this change.
(encrypt_crypt): Ditto.
(encrypt_filter): Ditto.
* g10/sign.c (sign_symencrypt_file): Ditto.
* g10/misc.c (MY_GCRY_CIPHER_MODE_EAX): New.
(openpgp_aead_algo_info): New.
* g10/cipher-aead.c (MY_GCRY_CIPHER_MODE_EAX): Remove.
(write_header): Use new fucntion.
* g10/decrypt-data.c (MY_GCRY_CIPHER_MODE_EAX): Remove.
(decrypt_data): Use new function. Also allow for chunkbytes other
than 10.
--
Note that other chunk bytes than 10 and in particular 0 (64 byte
chunks) have not yet been tested.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/keydb.h')
| -rw-r--r-- | g10/keydb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/keydb.h b/g10/keydb.h index 9f6064b41..f2ea8a7d2 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -232,7 +232,7 @@ int algo_available( preftype_t preftype, int algo, int select_algo_from_prefs( PK_LIST pk_list, int preftype, int request, const union pref_hint *hint); int select_mdc_from_pklist (PK_LIST pk_list); -int select_aead_from_pklist (pk_list_t pk_list); +aead_algo_t select_aead_from_pklist (pk_list_t pk_list); void warn_missing_mdc_from_pklist (PK_LIST pk_list); void warn_missing_aes_from_pklist (PK_LIST pk_list); |