mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* options.h, main.h, g10.c (main), import.c (parse_import_options,
delete_inv_parts), keyserver.c (parse_keyserver_options): add new --import-options option. The only current flag is "allow-local-sigs". * g10.c (main): Don't disable MDC in pgp7 mode. * options.h, g10.c (main), keyserver.c (parse_keyserver_options): Remove old keyserver-option include-attributes now that there is an export-option for the same thing.
This commit is contained in:
parent
002f085c23
commit
125613737c
6 changed files with 91 additions and 12 deletions
13
g10/main.h
13
g10/main.h
|
@ -150,6 +150,11 @@ KBNODE make_comment_node( const char *s );
|
|||
KBNODE make_mpi_comment_node( const char *s, MPI a );
|
||||
|
||||
/*-- import.c --*/
|
||||
/* 1, 4, and 8 are reserved so they match the EXPORT_* flags below */
|
||||
#define IMPORT_ALLOW_LOCAL_SIGS 2
|
||||
#define IMPORT_DEFAULT 0
|
||||
|
||||
int parse_import_options(char *str,unsigned int *options);
|
||||
void import_keys( char **fnames, int nnames, int fast, void *stats_hd );
|
||||
int import_keys_stream( IOBUF inp, int fast, void *stats_hd );
|
||||
void *import_new_stats_handle (void);
|
||||
|
@ -159,11 +164,11 @@ void import_print_stats (void *hd);
|
|||
int collapse_uids( KBNODE *keyblock );
|
||||
|
||||
/*-- export.c --*/
|
||||
#define EXPORT_INCLUDE_NON_RFC 1
|
||||
#define EXPORT_INCLUDE_LOCAL_SIGS 2
|
||||
#define EXPORT_INCLUDE_ATTRIBUTES 4
|
||||
#define EXPORT_INCLUDE_NON_RFC 1
|
||||
#define EXPORT_INCLUDE_LOCAL_SIGS 2
|
||||
#define EXPORT_INCLUDE_ATTRIBUTES 4
|
||||
#define EXPORT_INCLUDE_SENSITIVE_REVKEYS 8
|
||||
#define EXPORT_DEFAULT (1|4)
|
||||
#define EXPORT_DEFAULT (1|4)
|
||||
|
||||
int parse_export_options(char *str,unsigned int *options);
|
||||
int export_pubkeys( STRLIST users, unsigned int options );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue