diff options
| author | David Shaw <[email protected]> | 2004-08-08 13:28:04 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-08-08 13:28:04 +0000 |
| commit | 5d98f7afe503b10ad2d4d4d11d510b58fb001268 (patch) | |
| tree | 2863ec1f38f48a3252bd1340902d958a637cb950 /g10/pkclist.c | |
| parent | * gpg.sgml: Remove show-long-keyids since it is replaced by (diff) | |
| download | gnupg-5d98f7afe503b10ad2d4d4d11d510b58fb001268.tar.gz gnupg-5d98f7afe503b10ad2d4d4d11d510b58fb001268.zip | |
* plaintext.c (handle_plaintext): Bigger buffer for extra safety.
* g10.c (main): New alias --throw-keyid for --throw-keyids, so that it
continues to work in old configuration files. Noted by Jens Adam.
* pkclist.c (algo_available): --pgp8 now allows blowfish, zlib, and bzip2.
* status.c (do_get_from_fd): Flush stdout if status isn't flushing it for
us. This guarantees that any menus that were displayed before the prompt
don't get stuck in a buffer. Noted by Peter Palfrader. This is Debian
bug #254072.
* sign.c (update_keysig_packet): Revert change of 2004-05-18. It is not
appropriate to strip policy and notations when remaking a sig. That
should only happen when specifically requested by the user.
Diffstat (limited to 'g10/pkclist.c')
| -rw-r--r-- | g10/pkclist.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/g10/pkclist.c b/g10/pkclist.c index c153baad5..45b1c1485 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -1087,15 +1087,17 @@ algo_available( preftype_t preftype, int algo, void *hint ) && algo != CIPHER_ALGO_CAST5)) return 0; - if((PGP7 || PGP8) && (algo != CIPHER_ALGO_IDEA - && algo != CIPHER_ALGO_3DES - && algo != CIPHER_ALGO_CAST5 - && algo != CIPHER_ALGO_AES - && algo != CIPHER_ALGO_AES192 - && algo != CIPHER_ALGO_AES256 - && algo != CIPHER_ALGO_TWOFISH)) + if(PGP7 && (algo != CIPHER_ALGO_IDEA + && algo != CIPHER_ALGO_3DES + && algo != CIPHER_ALGO_CAST5 + && algo != CIPHER_ALGO_AES + && algo != CIPHER_ALGO_AES192 + && algo != CIPHER_ALGO_AES256 + && algo != CIPHER_ALGO_TWOFISH)) return 0; + /* PGP8 supports all the ciphers we do.. */ + return algo && !check_cipher_algo( algo ); } else if( preftype == PREFTYPE_HASH ) @@ -1119,10 +1121,12 @@ algo_available( preftype_t preftype, int algo, void *hint ) } else if( preftype == PREFTYPE_ZIP ) { - if((PGP6 || PGP7 || PGP8) && (algo != COMPRESS_ALGO_NONE - && algo != COMPRESS_ALGO_ZIP)) + if((PGP6 || PGP7) && (algo != COMPRESS_ALGO_NONE + && algo != COMPRESS_ALGO_ZIP)) return 0; + /* PGP8 supports all the compression algos we do */ + return !check_compress_algo( algo ); } else |