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

* g10.c (main): Add --no-groups to zero --group list.

Browse source 
* encode.c (encode_simple): Allow for 32 bytes (256 bits) of symmetrically
encrypted session key.  Use --s2k-cipher-algo to choose cipher, rather
than the default cipher.

* parse-packet.c (parse_subkeyenc): Give a warning if an symmetrically
encrypted session key is seen without salt.  Show in --list-packets if a
symetrically encrypted session key is present.

* pubkey-enc.c (get_it): Always show cipher-not-in-prefs warning unless
--quiet is set.  Use text name of cipher in warning.
This commit is contained in:
David Shaw 2003-10-01 15:15:58 +00:00
parent e398ea2dc2
commit b0fe35f60e
5 changed files with 77 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

28
g10/g10.c
View file

@ -52,7 +52,9 @@
#include "keyserver-internal.h"
#include "exec.h"
enum cmd_and_opt_values { aNull = 0,
enum cmd_and_opt_values
{
aNull = 0,
oArmor = 'a',
aDetachedSign = 'b',
aSym = 'c',
@ -315,6 +317,7 @@ enum cmd_and_opt_values { aNull = 0,
oLCctype,
oLCmessages,
oGroup,
oNoGroups,
oStrict,
oNoStrict,
oMangleDosFilenames,
@ -327,7 +330,8 @@ enum cmd_and_opt_values { aNull = 0,
opcscDriver,
oDisableCCID,
aTest };
aTest
};
static ARGPARSE_OPTS opts[] = {
@ -630,6 +634,7 @@ static ARGPARSE_OPTS opts[] = {
{ oLCctype, "lc-ctype", 2, "@" },
{ oLCmessages, "lc-messages", 2, "@" },
{ oGroup, "group", 2, "@" },
{ oNoGroups, "no-groups", 0, "@" },
{ oStrict, "strict", 0, "@" },
{ oNoStrict, "no-strict", 0, "@" },
{ oMangleDosFilenames, "mangle-dos-filenames", 0, "@" },
@ -1347,8 +1352,10 @@ main( int argc, char **argv )
}
while( optfile_parse( configfp, configname, &configlineno,
&pargs, opts) ) {
switch( pargs.r_opt ) {
&pargs, opts) )
{
switch( pargs.r_opt )
{
case aCheckKeys: set_cmd( &cmd, aCheckKeys); break;
case aListPackets: set_cmd( &cmd, aListPackets); break;
case aImport: set_cmd( &cmd, aImport); break;
@ -1938,6 +1945,15 @@ main( int argc, char **argv )
case oLCctype: opt.lc_ctype = pargs.r.ret_str; break;
case oLCmessages: opt.lc_messages = pargs.r.ret_str; break;
case oGroup: add_group(pargs.r.ret_str); break;
case oNoGroups:
while(opt.grouplist)
{
struct groupitem *iter=opt.grouplist;
free_strlist(iter->values);
opt.grouplist=opt.grouplist->next;
m_free(iter);
}
break;
case oStrict: opt.strict=1; log_set_strict(1); break;
case oNoStrict: opt.strict=0; log_set_strict(0); break;
case oMangleDosFilenames: opt.mangle_dos_filenames = 1; break;
@ -1946,8 +1962,8 @@ main( int argc, char **argv )
case oMultifile: multifile=1; break;
default : pargs.err = configfp? 1:2; break;
}
}
}
}
if( configfp ) {
fclose( configfp );