mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
* pkclist.c (algo_available): --pgp8 now allows blowfish, zlib, and bzip2.
This commit is contained in:
parent
279fcb429e
commit
7a03f5baa3
@ -1,3 +1,8 @@
|
||||
2004-07-29 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* pkclist.c (algo_available): --pgp8 now allows blowfish, zlib,
|
||||
and bzip2.
|
||||
|
||||
2004-07-20 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* status.c (do_get_from_fd): Flush stdout if status isn't flushing
|
||||
|
@ -1107,7 +1107,7 @@ algo_available( preftype_t preftype, int algo, void *hint )
|
||||
&& algo != CIPHER_ALGO_CAST5))
|
||||
return 0;
|
||||
|
||||
if((PGP7 || PGP8) && (algo != CIPHER_ALGO_IDEA
|
||||
if(PGP7 && (algo != CIPHER_ALGO_IDEA
|
||||
&& algo != CIPHER_ALGO_3DES
|
||||
&& algo != CIPHER_ALGO_CAST5
|
||||
&& algo != CIPHER_ALGO_AES
|
||||
@ -1116,6 +1116,8 @@ algo_available( preftype_t preftype, int algo, void *hint )
|
||||
&& 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
|
||||
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
|
||||
|
Loading…
x
Reference in New Issue
Block a user