security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-07 23:27:48 +02:00
Code Activity

* g10.c (main): Fix --export-all do actually do something different than

Browse Source 
--export.
This commit is contained in:
David Shaw 2003-10-17 03:56:30 +00:00
parent 66716c7349
commit cc1e739560
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2003-10-16 David Shaw <dshaw@jabberwocky.com>
* g10.c (main): Fix --export-all do actually do something
different than --export.
2003-10-03 Werner Koch <wk@gnupg.org>
* mainproc.c (check_sig_and_print): Prefix the key ID printed with

4
g10/encode.c
View File

@ -214,9 +214,7 @@ encode_simple( const char *filename, int mode, int use_seskey )
}
if ( use_seskey ) {
seskeylen = cipher_get_keylen( opt.s2k_cipher_algo ?
opt.s2k_cipher_algo:
opt.def_cipher_algo ) / 8;
seskeylen = cipher_get_keylen( opt.s2k_cipher_algo ) / 8;
encode_sesskey( cfx.dek, &dek, enckey );
m_free( cfx.dek ); cfx.dek = dek;
}

10
g10/g10.c
View File

@ -1,5 +1,6 @@
/* g10.c - The GnuPG utility (main for gpg)
* Copyright (C) 1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc.
* Copyright (C) 1998, 1999, 2000, 2001, 2002,
* 2003 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@ -1270,7 +1271,10 @@ main( int argc, char **argv )
case aSearchKeys: set_cmd( &cmd, aSearchKeys); break;
case aRefreshKeys: set_cmd( &cmd, aRefreshKeys); break;
case aExport: set_cmd( &cmd, aExport); break;
case aExportAll: set_cmd( &cmd, aExportAll); break;
case aExportAll:
opt.export_options|=EXPORT_INCLUDE_NON_RFC;
set_cmd(&cmd,aExport);
break;
case aListKeys: set_cmd( &cmd, aListKeys); break;
case aListSigs: set_cmd( &cmd, aListSigs); break;
case aExportSecret: set_cmd( &cmd, aExportSecret); break;
@ -2381,7 +2385,6 @@ main( int argc, char **argv )
break;
case aExport:
case aExportAll:
case aSendKeys:
case aRecvKeys:
sl = NULL;
@ -2409,7 +2412,6 @@ main( int argc, char **argv )
sl = NULL;
for( ; argc; argc--, argv++ )
append_to_strlist2( &sl, *argv, utf8_strings );
rc=keyserver_search( sl );
if(rc)
log_error(_("keyserver search failed: %s\n"),g10_errstr(rc));