security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-06-19 20:37:57 +02:00
Code Activity

* pkclist.c (algo_available): --pgp8 now allows blowfish, zlib, and bzip2.

Browse Source
This commit is contained in:
David Shaw 2004-07-29 23:42:22 +00:00
parent 279fcb429e
commit 7a03f5baa3
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -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> 2004-07-20 David Shaw <dshaw@jabberwocky.com>
* status.c (do_get_from_fd): Flush stdout if status isn't flushing * status.c (do_get_from_fd): Flush stdout if status isn't flushing

22
g10/pkclist.c
View File

@ -1107,15 +1107,17 @@ algo_available( preftype_t preftype, int algo, void *hint )
&& algo != CIPHER_ALGO_CAST5)) && algo != CIPHER_ALGO_CAST5))
return 0; return 0;
if((PGP7 || PGP8) && (algo != CIPHER_ALGO_IDEA if(PGP7 && (algo != CIPHER_ALGO_IDEA
&& algo != CIPHER_ALGO_3DES && algo != CIPHER_ALGO_3DES
&& algo != CIPHER_ALGO_CAST5 && algo != CIPHER_ALGO_CAST5
&& algo != CIPHER_ALGO_AES && algo != CIPHER_ALGO_AES
&& algo != CIPHER_ALGO_AES192 && algo != CIPHER_ALGO_AES192
&& algo != CIPHER_ALGO_AES256 && algo != CIPHER_ALGO_AES256
&& algo != CIPHER_ALGO_TWOFISH)) && algo != CIPHER_ALGO_TWOFISH))
return 0; return 0;
/* PGP8 supports all the ciphers we do.. */
return algo && !check_cipher_algo( algo ); return algo && !check_cipher_algo( algo );
} }
else if( preftype == PREFTYPE_HASH ) else if( preftype == PREFTYPE_HASH )
@ -1143,10 +1145,12 @@ algo_available( preftype_t preftype, int algo, void *hint )
} }
else if( preftype == PREFTYPE_ZIP ) else if( preftype == PREFTYPE_ZIP )
{ {
if((PGP6 || PGP7 || PGP8) && (algo != COMPRESS_ALGO_NONE if((PGP6 || PGP7) && (algo != COMPRESS_ALGO_NONE
&& algo != COMPRESS_ALGO_ZIP)) && algo != COMPRESS_ALGO_ZIP))
return 0; return 0;
/* PGP8 supports all the compression algos we do */
return !check_compress_algo( algo ); return !check_compress_algo( algo );
} }
else else