diff options
| author | Werner Koch <wk@gnupg.org> | 1999-03-20 14:01:11 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 1999-03-20 14:01:11 +0100 |
| commit | e5521243bc960e1fd5fdb48fafa280eeeb55e327 (patch) | |
| tree | 78f1152794b2d746d22ff2535b2331ba9b9afe8c /g10 | |
| parent | See ChangeLog: Sat Mar 20 12:55:33 CET 1999 Werner Koch (diff) | |
| download | gnupg2-e5521243bc960e1fd5fdb48fafa280eeeb55e327.tar.xz gnupg2-e5521243bc960e1fd5fdb48fafa280eeeb55e327.zip | |
See ChangeLog: Sat Mar 20 13:59:47 CET 1999 Werner KochV0-9-5
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/armor.c | 17 |
2 files changed, 15 insertions, 6 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index f46837283..274637a4b 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +Sat Mar 20 13:59:47 CET 1999 Werner Koch <wk@isil.d.shuttle.de> + + * armor.c (fake_packet): Fix for not not-dash-escaped + Sat Mar 20 11:44:21 CET 1999 Werner Koch <wk@isil.d.shuttle.de> * g10.c (main): Added command --recv-keys diff --git a/g10/armor.c b/g10/armor.c index a6daf7110..cadebadbb 100644 --- a/g10/armor.c +++ b/g10/armor.c @@ -503,13 +503,18 @@ fake_packet( armor_filter_context_t *afx, IOBUF a, afx->buffer_pos = 2; /* skip */ } else if( n >= 15 && p[1] == '-' && p[2] == '-' && p[3] == '-' ) { - if( is_armor_header( p, n ) != BEGIN_SIGNATURE ) { - log_info(_("unexpected armor:")); - print_string( stderr, p, n, 0 ); - putc('\n', stderr); + int type = is_armor_header( p, n ); + if( afx->not_dash_escaped && type != BEGIN_SIGNATURE ) + ; /* this is okay */ + else { + if( type != BEGIN_SIGNATURE ) { + log_info(_("unexpected armor:")); + print_string( stderr, p, n, 0 ); + putc('\n', stderr); + } + lastline = 1; + rc = -1; } - lastline = 1; - rc = -1; } } } |