security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00
Code Activity

g10: Don't limit at the frontend side for card capability.

Browse Source 
* g10/card-util.c (MAX_GET_DATA_FROM_FILE): New.
(get_data_from_file): Use MAX_GET_DATA_FROM_FILE.
(change_url, change_login, change_private_do): Don't limit.

--

V3.3 card support longer data for URL, Login and Private DOs.
It's scdaemon which knows that.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2017-07-21 11:22:38 +09:00
parent 892e86b0dc
commit a76b6cf970
1 changed files with 12 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
g10/card-util.c
View File

@ -777,14 +777,6 @@ change_url (void)
trim_spaces (url); trim_spaces (url);
cpr_kill_prompt (); cpr_kill_prompt ();
if (strlen (url) > 254 )
{
tty_printf (_("Error: URL too long "
"(limit is %d characters).\n"), 254);
xfree (url);
return -1;
}
rc = agent_scd_setattr ("PUBKEY-URL", url, strlen (url), NULL ); rc = agent_scd_setattr ("PUBKEY-URL", url, strlen (url), NULL );
if (rc) if (rc)
log_error ("error setting URL: %s\n", gpg_strerror (rc)); log_error ("error setting URL: %s\n", gpg_strerror (rc));
@ -831,12 +823,14 @@ fetch_url (ctrl_t ctrl)
} }
/* Read data from file FNAME up to MAXLEN characters. On error return #define MAX_GET_DATA_FROM_FILE 16384
-1 and store NULL at R_BUFFER; on success return the number of
bytes read and store the address of a newly allocated buffer at /* Read data from file FNAME up to MAX_GET_DATA_FROM_FILE characters.
R_BUFFER. */ On error return -1 and store NULL at R_BUFFER; on success return
the number of bytes read and store the address of a newly allocated
buffer at R_BUFFER. */
static int static int
get_data_from_file (const char *fname, size_t maxlen, char **r_buffer) get_data_from_file (const char *fname, char **r_buffer)
{ {
estream_t fp; estream_t fp;
char *data; char *data;
@ -859,7 +853,7 @@ get_data_from_file (const char *fname, size_t maxlen, char **r_buffer)
return -1; return -1;
} }
data = xtrymalloc (maxlen? maxlen:1); data = xtrymalloc (MAX_GET_DATA_FROM_FILE);
if (!data) if (!data)
{ {
tty_printf (_("error allocating enough memory: %s\n"), strerror (errno)); tty_printf (_("error allocating enough memory: %s\n"), strerror (errno));
@ -867,10 +861,7 @@ get_data_from_file (const char *fname, size_t maxlen, char **r_buffer)
return -1; return -1;
} }
if (maxlen) n = es_fread (data, 1, MAX_GET_DATA_FROM_FILE, fp);
n = es_fread (data, 1, maxlen, fp);
else
n = 0;
es_fclose (fp); es_fclose (fp);
if (n < 0) if (n < 0)
{ {
@ -927,7 +918,7 @@ change_login (const char *args)
{ {
for (args++; spacep (args); args++) for (args++; spacep (args); args++)
; ;
n = get_data_from_file (args, 254, &data); n = get_data_from_file (args, &data);
if (n < 0) if (n < 0)
return -1; return -1;
} }
@ -942,14 +933,6 @@ change_login (const char *args)
n = strlen (data); n = strlen (data);
} }
if (n > 254 )
{
tty_printf (_("Error: Login data too long "
"(limit is %d characters).\n"), 254);
xfree (data);
return -1;
}
rc = agent_scd_setattr ("LOGIN-DATA", data, n, NULL ); rc = agent_scd_setattr ("LOGIN-DATA", data, n, NULL );
if (rc) if (rc)
log_error ("error setting login data: %s\n", gpg_strerror (rc)); log_error ("error setting login data: %s\n", gpg_strerror (rc));
@ -973,7 +956,7 @@ change_private_do (const char *args, int nr)
{ {
for (args++; spacep (args); args++) for (args++; spacep (args); args++)
; ;
n = get_data_from_file (args, 254, &data); n = get_data_from_file (args, &data);
if (n < 0) if (n < 0)
return -1; return -1;
} }
@ -988,14 +971,6 @@ change_private_do (const char *args, int nr)
n = strlen (data); n = strlen (data);
} }
if (n > 254 )
{
tty_printf (_("Error: Private DO too long "
"(limit is %d characters).\n"), 254);
xfree (data);
return -1;
}
rc = agent_scd_setattr (do_name, data, n, NULL ); rc = agent_scd_setattr (do_name, data, n, NULL );
if (rc) if (rc)
log_error ("error setting private DO: %s\n", gpg_strerror (rc)); log_error ("error setting private DO: %s\n", gpg_strerror (rc));
@ -1016,7 +991,7 @@ change_cert (const char *args)
{ {
for (args++; spacep (args); args++) for (args++; spacep (args); args++)
; ;
n = get_data_from_file (args, 16384, &data); n = get_data_from_file (args, &data);
if (n < 0) if (n < 0)
return -1; return -1;
} }