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

* main.h, import.c (parse_import_options, fix_hkp_corruption, import_one,

delete_inv_parts), g10.c (main): New import-option
"repair-hkp-subkey-bug", which repairs as much as possible the HKP
mangling multiple subkeys bug.  It is on by default for keyserver
receives, and off by default for regular --import.

* main.h, import.c (import, import_one, delete_inv_parts), hkp.c
(hkp_ask_import), keyserver.c (keyserver_spawn): Use keyserver import
options when doing keyserver receives.
This commit is contained in:
David Shaw 2002-07-24 21:17:19 +00:00
parent d0c643a6c5
commit 553ac3f08c
6 changed files with 116 additions and 26 deletions

View file

@ -150,13 +150,14 @@ 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
#define IMPORT_ALLOW_LOCAL_SIGS 1
#define IMPORT_REPAIR_HKP_SUBKEY_BUG 2
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_keys( char **fnames, int nnames, int fast,
void *stats_hd, unsigned int options );
int import_keys_stream( IOBUF inp, int fast,
void *stats_hd, unsigned int options );
void *import_new_stats_handle (void);
void import_release_stats_handle (void *p);
void import_print_stats (void *hd);
@ -168,7 +169,6 @@ int collapse_uids( KBNODE *keyblock );
#define EXPORT_INCLUDE_LOCAL_SIGS 2
#define EXPORT_INCLUDE_ATTRIBUTES 4
#define EXPORT_INCLUDE_SENSITIVE_REVKEYS 8
#define EXPORT_DEFAULT (1|4)
int parse_export_options(char *str,unsigned int *options);
int export_pubkeys( STRLIST users, unsigned int options );