summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--agent/ChangeLog5
-rw-r--r--agent/query.c4
-rw-r--r--assuan/ChangeLog7
-rw-r--r--assuan/assuan-defs.h2
-rw-r--r--assuan/assuan.h1
-rw-r--r--sm/ChangeLog6
-rw-r--r--sm/call-agent.c6
7 files changed, 22 insertions, 9 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog
index 1ccdf29ce..0d59e84e4 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-14 Marcus Brinkmann <marcus@g10code.de>
+
+ * query.c (LINELENGTH): Removed.
+ (agent_askpin): Use ASSUAN_LINELENGTH, not LINELENGTH.
+
2001-11-19 Werner Koch <wk@gnupg.org>
* gpg-agent.c: Removed all GUI code, removed code for old
diff --git a/agent/query.c b/agent/query.c
index 27dc6dba9..dd2139fad 100644
--- a/agent/query.c
+++ b/agent/query.c
@@ -37,8 +37,6 @@
#define MAX_OPEN_FDS 20
#endif
-#define LINELENGTH 1002 /* 1000 + [CR,]LF */
-
static ASSUAN_CONTEXT entry_ctx = NULL;
/* data to be passed to our callbacks */
@@ -144,7 +142,7 @@ agent_askpin (const char *desc_text,
struct pin_entry_info_s *pininfo)
{
int rc;
- char line[LINELENGTH];
+ char line[ASSUAN_LINELENGTH];
struct entry_parm_s parm;
const char *errtext = NULL;
diff --git a/assuan/ChangeLog b/assuan/ChangeLog
index 8d05c0e92..b7d32a6d1 100644
--- a/assuan/ChangeLog
+++ b/assuan/ChangeLog
@@ -1,4 +1,9 @@
-2001-12-13 Marcus Brinkmann <marcus@gnu.org>
+2001-12-14 Marcus Brinkmann <marcus@g10code.de>
+
+ * assuan-defs.h (LINELENGTH): Define as ASSUAN_LINELENGTH.
+ assuan.h: Define ASSUAN_LINELENGTH.
+
+2001-12-13 Marcus Brinkmann <marcus@g10code.de>
* assuan-buffer.c (assuan_read_line): Fix order of execution to
get correct return values.
diff --git a/assuan/assuan-defs.h b/assuan/assuan-defs.h
index e0a38a8f0..ecabd3828 100644
--- a/assuan/assuan-defs.h
+++ b/assuan/assuan-defs.h
@@ -24,7 +24,7 @@
#include <sys/types.h>
#include "assuan.h"
-#define LINELENGTH 1002 /* 1000 + [CR,]LF */
+#define LINELENGTH ASSUAN_LINELENGTH
struct cmdtbl_s {
const char *name;
diff --git a/assuan/assuan.h b/assuan/assuan.h
index f97493dc0..485ad2225 100644
--- a/assuan/assuan.h
+++ b/assuan/assuan.h
@@ -101,6 +101,7 @@ typedef enum {
ASSUAN_CMD_USER = 256 /* Other commands should be used with this offset*/
} AssuanCommand;
+#define ASSUAN_LINELENGTH 1002 /* 1000 + [CR,]LF */
struct assuan_context_s;
typedef struct assuan_context_s *ASSUAN_CONTEXT;
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 20d8558eb..39049c91b 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-14 Marcus Brinkmann <marcus@g10code.de>
+
+ * call-agent.c (LINELENGTH): Removed.
+ (gpgsm_agent_pksign): Use ASSUAN_LINELENGTH, not LINELENGTH.
+ (gpgsm_agent_pkdecrypt): Likewise.
+
2001-12-13 Werner Koch <wk@gnupg.org>
* keylist.c (list_cert_colon): Print alternative names of subject
diff --git a/sm/call-agent.c b/sm/call-agent.c
index 9aa6cc316..f23a6dfb0 100644
--- a/sm/call-agent.c
+++ b/sm/call-agent.c
@@ -39,8 +39,6 @@
#define MAX_OPEN_FDS 20
#endif
-#define LINELENGTH 1002 /* 1000 + [CR,]LF */
-
#define xtoi_1(p) (*(p) <= '9'? (*(p)- '0'): \
*(p) <= 'F'? (*(p)-'A'+10):(*(p)-'a'+10))
#define xtoi_2(p) ((xtoi_1(p) * 16) + xtoi_1((p)+1))
@@ -221,7 +219,7 @@ gpgsm_agent_pksign (const char *keygrip,
char **r_buf, size_t *r_buflen )
{
int rc, i;
- char *p, line[LINELENGTH];
+ char *p, line[ASSUAN_LINELENGTH];
struct membuf data;
size_t len;
@@ -287,7 +285,7 @@ gpgsm_agent_pkdecrypt (const char *keygrip,
char **r_buf, size_t *r_buflen )
{
int rc;
- char line[LINELENGTH];
+ char line[ASSUAN_LINELENGTH];
struct membuf data;
struct cipher_parm_s cipher_parm;
size_t n, len;