From 72a3fd4868ed18faa4921968c1d707e6cc8b8624 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Wed, 24 Jul 2002 03:37:55 +0000 Subject: [PATCH] * import.c (parse_import_options), export.c (parse_export_options): Fix offset problem with reversed ("no-") meanings. --- g10/ChangeLog | 4 ++++ g10/export.c | 5 ++++- g10/import.c | 5 ++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index 9a5e75df2..969283543 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,9 @@ 2002-07-23 David Shaw + * import.c (parse_import_options), export.c + (parse_export_options): Fix offset problem with reversed ("no-") + meanings. + * import.c (delete_inv_parts): Discard subkey signatures (0x18 and 0x28) if found in the userid section of the key. diff --git a/g10/export.c b/g10/export.c index 853be3b96..cc9c27dc6 100644 --- a/g10/export.c +++ b/g10/export.c @@ -62,7 +62,10 @@ parse_export_options(char *str,unsigned int *options) int i,rev=0; if(ascii_memcasecmp("no-",tok,3)==0) - rev=1; + { + rev=1; + tok+=3; + } for(i=0;export_opts[i].name;i++) { diff --git a/g10/import.c b/g10/import.c index ddb483105..415e26ef6 100644 --- a/g10/import.c +++ b/g10/import.c @@ -101,7 +101,10 @@ parse_import_options(char *str,unsigned int *options) int i,rev=0; if(ascii_memcasecmp("no-",tok,3)==0) - rev=1; + { + rev=1; + tok+=3; + } for(i=0;import_opts[i].name;i++) {