diff options
| author | David Shaw <[email protected]> | 2006-04-09 03:34:09 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2006-04-09 03:34:09 +0000 |
| commit | 51e88a5fdb92797c5109d2948c1f6e1c5230e6ad (patch) | |
| tree | e7e0c80e14d0a4a4c27fa41fb9bda7946b06e5ab /g10/armor.c | |
| parent | Fixed segv (diff) | |
| download | gnupg-51e88a5fdb92797c5109d2948c1f6e1c5230e6ad.tar.gz gnupg-51e88a5fdb92797c5109d2948c1f6e1c5230e6ad.zip | |
* getkey.c (parse_auto_key_locate): Fix dupe-removal code.
* keyedit.c (menu_backsign): Allow backsigning even if the secret
subkey doesn't have a binding signature.
* armor.c (radix64_read): Don't report EOF when reading only a pad (=)
character. The EOF actually starts after the pad.
* gpg.c (main): Make --export, --send-keys, --recv-keys,
--refresh-keys, and --fetch-keys follow their arguments from left to
right. Suggested by Peter Palfrader.
Diffstat (limited to 'g10/armor.c')
| -rw-r--r-- | g10/armor.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/g10/armor.c b/g10/armor.c index 24c1ee88c..84d25daec 100644 --- a/g10/armor.c +++ b/g10/armor.c @@ -676,7 +676,7 @@ radix64_read( armor_filter_context_t *afx, IOBUF a, size_t *retn, int checkcrc=0; int rc = 0; size_t n = 0; - int idx, i; + int idx, i, onlypad=0; u32 crc; crc = afx->crc; @@ -720,6 +720,8 @@ radix64_read( armor_filter_context_t *afx, IOBUF a, size_t *retn, goto again; } } + else if(n==0) + onlypad=1; if( idx == 1 ) buf[n++] = val; @@ -848,7 +850,7 @@ radix64_read( armor_filter_context_t *afx, IOBUF a, size_t *retn, } } - if( !n ) + if( !n && !onlypad ) rc = -1; *retn = n; |