diff options
| author | Werner Koch <[email protected]> | 2006-11-05 15:08:58 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2006-11-05 15:08:58 +0000 |
| commit | 10d563da0879d9892e3bf44dc399273eb68e2343 (patch) | |
| tree | 9cec0b6724670532f55d7f1395ba2199cadb0e3b /g10/encode.c | |
| parent | Post release update (diff) | |
| download | gnupg-10d563da0879d9892e3bf44dc399273eb68e2343.tar.gz gnupg-10d563da0879d9892e3bf44dc399273eb68e2343.zip | |
Collected fixes.
Diffstat (limited to 'g10/encode.c')
| -rw-r--r-- | g10/encode.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/g10/encode.c b/g10/encode.c index b5045ac15..f55f4732c 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -147,6 +147,9 @@ use_mdc(PK_LIST pk_list,int algo) if (gcry_cipher_get_algo_blklen (algo) != 8) return 1; + if (opt.verbose) + warn_missing_mdc_from_pklist (pk_list); + return 0; /* No MDC */ } @@ -521,6 +524,14 @@ encode_crypt( const char *filename, strlist_t remusr, int use_symkey ) compliance_failure(); } } + + /* In case 3DES has been selected, print a warning if + any key does not have a preference for AES. This + should help to indentify why encrypting to several + recipients falls back to 3DES. */ + if (opt.verbose + && cfx.dek->algo == CIPHER_ALGO_3DES) + warn_missing_aes_from_pklist (pk_list); } else { if(!opt.expert && @@ -533,7 +544,7 @@ encode_crypt( const char *filename, strlist_t remusr, int use_symkey ) cfx.dek->algo = opt.def_cipher_algo; } - + cfx.dek->use_mdc=use_mdc(pk_list,cfx.dek->algo); /* Only do the is-file-already-compressed check if we are using a @@ -716,6 +727,14 @@ encrypt_filter( void *opaque, int control, * happen if we do not have any public keys in the list */ efx->cfx.dek->algo = DEFAULT_CIPHER_ALGO; } + + /* In case 3DES has been selected, print a warning if + any key does not have a preference for AES. This + should help to indentify why encrypting to several + recipients falls back to 3DES. */ + if (opt.verbose + && efx->cfx.dek->algo == CIPHER_ALGO_3DES) + warn_missing_aes_from_pklist (efx->pk_list); } else { if(!opt.expert && |