security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-26 15:37:03 +01:00
Code Activity

* pkclist.c (expand_groups): Maintain the strlist flags while expanding.

Browse Source 
Members of an expansion inherit their flags from the expansion key.

* options.h, cipher.c (write_header), g10.c (main), keygen.c
(keygen_set_std_prefs): remove the personal_mdc flag.  It no longer serves
a purpose now that the personal preference lists are split into
cipher/digest/zip.
This commit is contained in:
David Shaw 2002-06-14 17:42:47 +00:00
parent 08ad6bc159
commit ecc02567a6
6 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
g10/ChangeLog
View File

@ -1,3 +1,14 @@
2002-06-14 David Shaw <dshaw@jabberwocky.com>
* pkclist.c (expand_groups): Maintain the strlist flags while
expanding. Members of an expansion inherit their flags from the
expansion key.
* options.h, cipher.c (write_header), g10.c (main), keygen.c
(keygen_set_std_prefs): remove the personal_mdc flag. It no
longer serves a purpose now that the personal preference lists are
split into cipher/digest/zip.
2002-06-14 Timo Schulz <ts@winpt.org> 2002-06-14 Timo Schulz <ts@winpt.org>
* skclist.c (is_insecure): Implemented. * skclist.c (is_insecure): Implemented.

2
g10/cipher.c
View File

@ -64,7 +64,7 @@ write_header( cipher_filter_context_t *cfx, IOBUF a )
if (opt.force_mdc) if (opt.force_mdc)
use_mdc = 1; use_mdc = 1;
if( opt.rfc2440 || opt.rfc1991 || opt.disable_mdc || !opt.personal_mdc ) if( opt.rfc2440 || opt.rfc1991 || opt.disable_mdc )
use_mdc = 0; /* override - rfc2440 does not know about MDC */ use_mdc = 0; /* override - rfc2440 does not know about MDC */
memset( &ed, 0, sizeof ed ); memset( &ed, 0, sizeof ed );

1
g10/g10.c
View File

@ -897,7 +897,6 @@ main( int argc, char **argv )
opt.def_digest_algo = 0; opt.def_digest_algo = 0;
opt.cert_digest_algo = 0; opt.cert_digest_algo = 0;
opt.def_compress_algo = -1; opt.def_compress_algo = -1;
opt.personal_mdc = 1; /* default - we like to use mdc if we can */
opt.s2k_mode = 3; /* iterated+salted */ opt.s2k_mode = 3; /* iterated+salted */
opt.s2k_digest_algo = DIGEST_ALGO_SHA1; opt.s2k_digest_algo = DIGEST_ALGO_SHA1;
opt.s2k_cipher_algo = CIPHER_ALGO_CAST5; opt.s2k_cipher_algo = CIPHER_ALGO_CAST5;

2
g10/keygen.c
View File

@ -344,8 +344,6 @@ keygen_set_std_prefs (const char *string,int personal)
opt.personal_compress_prefs[i].value = 0; opt.personal_compress_prefs[i].value = 0;
} }
} }
opt.personal_mdc = mdc;
} }
else else
{ {

1
g10/options.h
View File

@ -133,7 +133,6 @@ struct {
prefitem_t *personal_cipher_prefs, prefitem_t *personal_cipher_prefs,
*personal_digest_prefs, *personal_digest_prefs,
*personal_compress_prefs; *personal_compress_prefs;
int personal_mdc;
int no_perm_warn; int no_perm_warn;
char *temp_dir; char *temp_dir;
int no_encrypt_to; int no_encrypt_to;

13
g10/pkclist.c
View File

@ -695,7 +695,7 @@ default_recipient(void)
static STRLIST static STRLIST
expand_groups(STRLIST input) expand_groups(STRLIST input)
{ {
STRLIST output=NULL,rover; STRLIST sl,output=NULL,rover;
struct groupitem *groups; struct groupitem *groups;
for(rover=input;rover;rover=rover->next) for(rover=input;rover;rover=rover->next)
@ -709,7 +709,11 @@ expand_groups(STRLIST input)
/* maintain current utf8-ness */ /* maintain current utf8-ness */
for(each=groups->values;each;each=each->next) for(each=groups->values;each;each=each->next)
add_to_strlist(&output,each->d); {
sl=add_to_strlist(&output,each->d);
/* maintain the flags from the original */
sl->flags=each->flags;
}
break; break;
} }
@ -717,7 +721,10 @@ expand_groups(STRLIST input)
/* Didn't find any groups, so use the existing string */ /* Didn't find any groups, so use the existing string */
if(!groups) if(!groups)
add_to_strlist(&output,rover->d); {
sl=add_to_strlist(&output,rover->d);
sl->flags=rover->flags;
}
} }
return output; return output;