security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-06-14 18:31:03 +02:00
Code Activity

common: Minor rework of tty_get.

Browse Source 
* common/ttyio.c (do_get): Re-indent and remove the checking for char
values larger than 0xa0.  Use explicy control character checking.
--

The code is really old (mid 1998) and with the checking for 0xa0 it
has an implicit assumption of utf-8 or latin-1.  Worse, the check was
for c > 0xa0 and not c == 0xa0 so it never worked as intended.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2019-03-07 14:11:46 +01:00
parent 134c3c1652
commit b7de105e0a
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 141 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
common/ttyio.c
View File

@ -410,12 +410,14 @@ do_get( const char *prompt, int hidden )
#endif #endif
int c, n, i; int c, n, i;
if( batchmode ) { if (batchmode)
{
log_error ("Sorry, we are in batchmode - can't get input\n"); log_error ("Sorry, we are in batchmode - can't get input\n");
exit (2); exit (2);
} }
if (no_terminal) { if (no_terminal)
{
log_error ("Sorry, no terminal at all requested - can't get input\n"); log_error ("Sorry, no terminal at all requested - can't get input\n");
exit (2); exit (2);
} }
@ -432,7 +434,8 @@ do_get( const char *prompt, int hidden )
if (hidden) if (hidden)
SetConsoleMode(con.in, HID_INPMODE ); SetConsoleMode(con.in, HID_INPMODE );
for(;;) { for (;;)
{
DWORD nread; DWORD nread;
if (!ReadConsoleA( con.in, cbuf, 1, &nread, NULL)) if (!ReadConsoleA( con.in, cbuf, 1, &nread, NULL))
@ -447,12 +450,10 @@ do_get( const char *prompt, int hidden )
c = *cbuf; c = *cbuf;
if (c == '\t') if (c == '\t')
c = ' '; c = ' ';
else if( c > 0xa0 ) else if ( (c >= 0 && c <= 0x1f) || c == 0x7f)
; /* we don't allow 0xa0, as this is a protected blank which may
* confuse the user */
else if( iscntrl(c) )
continue; continue;
if( !(i < n-1) ) { if (!(i < n-1))
{
n += 50; n += 50;
buf = xrealloc (buf, n); buf = xrealloc (buf, n);
} }
@ -463,7 +464,8 @@ do_get( const char *prompt, int hidden )
SetConsoleMode(con.in, DEF_INPMODE ); SetConsoleMode(con.in, DEF_INPMODE );
#elif defined(__riscos__) || defined(HAVE_W32CE_SYSTEM) #elif defined(__riscos__) || defined(HAVE_W32CE_SYSTEM)
do { do
{
#ifdef HAVE_W32CE_SYSTEM #ifdef HAVE_W32CE_SYSTEM
/* Using getchar is not a correct solution but for now it /* Using getchar is not a correct solution but for now it
doesn't matter because we have no real console at all. We doesn't matter because we have no real console at all. We
@ -473,45 +475,64 @@ do_get( const char *prompt, int hidden )
#else #else
c = riscos_getchar(); c = riscos_getchar();
#endif #endif
if (c == 0xa || c == 0xd) { /* Return || Enter */ if (c == 0xa || c == 0xd) /* Return || Enter */
{
c = (int) '\n'; c = (int) '\n';
} else if (c == 0x8 || c == 0x7f) { /* Backspace || Delete */ }
if (i>0) { else if (c == 0x8 || c == 0x7f) /* Backspace || Delete */
{
if (i>0)
{
i--; i--;
if (!hidden) { if (!hidden)
{
last_prompt_len--; last_prompt_len--;
fputc(8, ttyfp); fputc(8, ttyfp);
fputc(32, ttyfp); fputc(32, ttyfp);
fputc(8, ttyfp); fputc(8, ttyfp);
fflush(ttyfp); fflush(ttyfp);
} }
} else { }
else
{
fputc(7, ttyfp); fputc(7, ttyfp);
fflush(ttyfp); fflush(ttyfp);
} }
continue; continue;
} else if (c == (int) '\t') { /* Tab */ }
else if (c == (int) '\t') /* Tab */
{
c = ' '; c = ' ';
} else if (c > 0xa0) { }
else if (c > 0xa0)
{
; /* we don't allow 0xa0, as this is a protected blank which may ; /* we don't allow 0xa0, as this is a protected blank which may
* confuse the user */ * confuse the user */
} else if (iscntrl(c)) { }
else if (iscntrl(c))
{
continue; continue;
} }
if(!(i < n-1)) { if (!(i < n-1))
{
n += 50; n += 50;
buf = xrealloc (buf, n); buf = xrealloc (buf, n);
} }
buf[i++] = c; buf[i++] = c;
if (!hidden) { if (!hidden)
{
last_prompt_len++; last_prompt_len++;
fputc(c, ttyfp); fputc(c, ttyfp);
fflush(ttyfp); fflush(ttyfp);
} }
} while (c != '\n'); }
while (c != '\n');
i = (i>0) ? i-1 : 0; i = (i>0) ? i-1 : 0;
#else /* Other systems. */ #else /* Other systems. */
if( hidden ) {
if (hidden)
{
#ifdef HAVE_TCGETATTR #ifdef HAVE_TCGETATTR
struct termios term; struct termios term;
@ -527,31 +548,33 @@ do_get( const char *prompt, int hidden )
/* fixme: How can we avoid that the \n is echoed w/o disabling /* fixme: How can we avoid that the \n is echoed w/o disabling
* canonical mode - w/o this kill_prompt can't work */ * canonical mode - w/o this kill_prompt can't work */
while( read(fileno(ttyfp), cbuf, 1) == 1 && *cbuf != '\n' ) { while (read(fileno(ttyfp), cbuf, 1) == 1 && *cbuf != '\n')
{
if (!hidden) if (!hidden)
last_prompt_len++; last_prompt_len++;
c = *cbuf; c = *cbuf;
if (c == CONTROL_D) if (c == CONTROL_D)
log_info("control d found\n"); log_info ("Control-D detected\n");
if( c == '\t' )
if (c == '\t') /* Map tab to a space. */
c = ' '; c = ' ';
else if( c > 0xa0 ) else if ( (c >= 0 && c <= 0x1f) || c == 0x7f)
; /* we don't allow 0xa0, as this is a protected blank which may continue; /* Skip all other ASCII control characters. */
* confuse the user */ if (!(i < n-1))
else if( iscntrl(c) ) {
continue;
if( !(i < n-1) ) {
n += 50; n += 50;
buf = xrealloc (buf, n); buf = xrealloc (buf, n);
} }
buf[i++] = c; buf[i++] = c;
} }
if( *cbuf != '\n' ) { if (*cbuf != '\n')
{
buf[0] = CONTROL_D; buf[0] = CONTROL_D;
i = 1; i = 1;
} }
if( hidden ) { if (hidden)
{
#ifdef HAVE_TCGETATTR #ifdef HAVE_TCGETATTR
if (tcsetattr(fileno(ttyfp), TCSAFLUSH, &termsave)) if (tcsetattr(fileno(ttyfp), TCSAFLUSH, &termsave))
log_error ("tcsetattr() failed: %s\n", strerror(errno)); log_error ("tcsetattr() failed: %s\n", strerror(errno));
@ -559,6 +582,7 @@ do_get( const char *prompt, int hidden )
#endif #endif
} }
#endif /* end unix version */ #endif /* end unix version */
buf[i] = 0; buf[i] = 0;
return buf; return buf;
} }