security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

Fix preference setting in new keys

Browse source
This commit is contained in:
Werner Koch 2010-04-26 11:53:14 +00:00
parent 8e5010a958
commit 31bbe71ad6
7 changed files with 56 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
g10/ChangeLog
View file

@ -1,3 +1,9 @@
2010-04-26 Werner Koch <wk@g10code.com>
* keygen.c (keygen_set_std_prefs): Explicitly include Z0 in the
default preferences if no compression algorithms are available.
Remove a possible trailing space in the dummy_string.
2010-04-23 Werner Koch <wk@g10code.com>
* pubkey-enc.c (get_it): Use the agent for decryption.

2
g10/decrypt.c
View file

@ -132,7 +132,7 @@ decrypt_message_fd (int input_fd, int output_fd)
}
#ifdef HAVE_W32CE_SYSTEM
#warning Ned to fix this
#warning Need to fix this
opt.outfp = NULL;
#else
opt.outfp = fdopen (dup (output_fd), "wb");

25
g10/keygen.c
View file

@ -315,6 +315,7 @@ keygen_set_std_prefs (const char *string,int personal)
string=opt.def_preference_list;
else
{
int any_compress = 0;
dummy_string[0]='\0';
/* The rationale why we use the order AES256,192,128 is
@ -375,13 +376,31 @@ keygen_set_std_prefs (const char *string,int personal)
strcat (dummy_string, "H11 ");
if(!check_compress_algo(COMPRESS_ALGO_ZLIB))
strcat(dummy_string,"Z2 ");
{
strcat(dummy_string,"Z2 ");
any_compress = 1;
}
if(!check_compress_algo(COMPRESS_ALGO_BZIP2))
strcat(dummy_string,"Z3 ");
{
strcat(dummy_string,"Z3 ");
any_compress = 1;
}
if(!check_compress_algo(COMPRESS_ALGO_ZIP))
strcat(dummy_string,"Z1");
{
strcat(dummy_string,"Z1 ");
any_compress = 1;
}
/* In case we have no compress algo at all, declare that
we prefer no compresssion. */
if (!any_compress)
strcat(dummy_string,"Z0 ");
/* Remove the trailing space. */
if (*dummy_string && dummy_string[strlen (dummy_string)-1] == ' ')
dummy_string[strlen (dummy_string)-1] = 0;
string=dummy_string;
}

3
g10/seckey-cert.c
View file

@ -35,6 +35,7 @@
#include "status.h"
#include "pkglue.h"
#if 0 /* Not anymore used - kept for reference. */
static int
do_check( PKT_secret_key *sk, const char *tryagain_text, int mode,
int *canceled )
@ -256,7 +257,7 @@ do_check( PKT_secret_key *sk, const char *tryagain_text, int mode,
return 0;
}
#endif /*0*/
/****************