2001-12-14  Marcus Brinkmann  <marcus@g10code.de>

	* assuan-defs.h (LINELENGTH): Define as ASSUAN_LINELENGTH.
	assuan.h: Define ASSUAN_LINELENGTH.

agent/
2001-12-14  Marcus Brinkmann  <marcus@g10code.de>

	* query.c (LINELENGTH): Removed.
	(agent_askpin): Use ASSUAN_LINELENGTH, not LINELENGTH.

sm/
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.
This commit is contained in:
Marcus Brinkmann 2001-12-13 23:20:02 +00:00
parent d7db0736fd
commit e6336cb1ff
7 changed files with 22 additions and 9 deletions

View File

@ -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

View File

@ -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;

View File

@ -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.

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -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;