diff options
| author | David Shaw <[email protected]> | 2003-10-17 03:56:30 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-10-17 03:56:30 +0000 |
| commit | cc1e7395605be69a3b910d2257c9f1fb2ad2e968 (patch) | |
| tree | 9bb860e14c2b360710e4a3ffcb4425a6727a3ca9 | |
| parent | * POTFILES.in (cipher/primegen.c): Added. (diff) | |
| download | gnupg-cc1e7395605be69a3b910d2257c9f1fb2ad2e968.tar.gz gnupg-cc1e7395605be69a3b910d2257c9f1fb2ad2e968.zip | |
* g10.c (main): Fix --export-all do actually do something different than
--export.
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/encode.c | 4 | ||||
| -rw-r--r-- | g10/g10.c | 10 |
3 files changed, 12 insertions, 7 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 71f8a6ce6..348a39478 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2003-10-16 David Shaw <[email protected]> + + * g10.c (main): Fix --export-all do actually do something + different than --export. + 2003-10-03 Werner Koch <[email protected]> * mainproc.c (check_sig_and_print): Prefix the key ID printed with diff --git a/g10/encode.c b/g10/encode.c index 72201873f..0fb9c5cd8 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -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; } @@ -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)); |