aboutsummaryrefslogtreecommitdiffstats
path: root/sm/base64.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2001-12-14 19:36:33 +0000
committerWerner Koch <[email protected]>2001-12-14 19:36:33 +0000
commit6d27c940b2f34c6adb33567e3a118b2e3a594433 (patch)
tree5e51ba6930baedb7a16ef118d30c1a87f72c3ecc /sm/base64.c
parent* assuan-listen.c (assuan_close_input_fd): New. (diff)
downloadgnupg-6d27c940b2f34c6adb33567e3a118b2e3a594433.tar.gz
gnupg-6d27c940b2f34c6adb33567e3a118b2e3a594433.zip
* verify.c (gpgsm_verify): Add hash debug helpers
* sign.c (gpgsm_sign): Ditto. * base64.c (base64_reader_cb): Reset the linelen when we need to skip the line and adjusted test; I somehow forgot about DeMorgan. * server.c (cmd_encrypt,cmd_decrypt,cmd_sign,cmd_verify) (cmd_import): Close the FDs on success. (close_message_fd): New. (input_notify): Setting autodetect_encoding to 0 after initializing it to 0 is pretty pointless. Easy to fix.
Diffstat (limited to 'sm/base64.c')
-rw-r--r--sm/base64.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sm/base64.c b/sm/base64.c
index a176c70b2..4d1620975 100644
--- a/sm/base64.c
+++ b/sm/base64.c
@@ -170,10 +170,10 @@ base64_reader_cb (void *cb_value, char *buffer, size_t count, size_t *nread)
if (parm->assume_pem)
{
/* wait for the header line */
+ parm->linelen = parm->readpos = 0;
if (!parm->have_lf || strncmp (parm->line, "-----BEGIN ", 11)
- || strncmp (parm->line+11, "PGP ", 4))
+ || !strncmp (parm->line+11, "PGP ", 4))
goto next;
- parm->linelen = parm->readpos = 0;
parm->is_pem = 1;
}
else if (parm->assume_base64)