diff options
| author | David Shaw <[email protected]> | 2004-07-29 23:42:22 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-07-29 23:42:22 +0000 |
| commit | 7a03f5baa353bc1760317a078c6ea27da5821730 (patch) | |
| tree | d13d1a8a2fd3d5d4a1c8580d1a821c6a6dbea810 | |
| parent | This commit was manufactured by cvs2svn to create branch (diff) | |
| download | gnupg-7a03f5baa353bc1760317a078c6ea27da5821730.tar.gz gnupg-7a03f5baa353bc1760317a078c6ea27da5821730.zip | |
* pkclist.c (algo_available): --pgp8 now allows blowfish, zlib, and bzip2.
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/pkclist.c | 22 |
2 files changed, 18 insertions, 9 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index f4205f067..b63fdbdc9 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2004-07-29 David Shaw <[email protected]> + + * pkclist.c (algo_available): --pgp8 now allows blowfish, zlib, + and bzip2. + 2004-07-20 David Shaw <[email protected]> * status.c (do_get_from_fd): Flush stdout if status isn't flushing diff --git a/g10/pkclist.c b/g10/pkclist.c index 5eb155016..2ec2fe141 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -1107,15 +1107,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 ) @@ -1143,10 +1145,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 |