/* crypto/ui/ui_openssl.c -*- mode:C; c-file-style: "eay" -*- */
-/* Written by Richard Levitte (levitte@stacken.kth.se) and others
- * for the OpenSSL project 2000/2001.
+/* Written by Richard Levitte (richard@levitte.org) and others
+ * for the OpenSSL project 2001.
*/
/* ====================================================================
- * Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved.
+ * Copyright (c) 2001 The OpenSSL Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
#include <signal.h>
#include <stdio.h>
#include <string.h>
-#include <setjmp.h>
#include <errno.h>
#ifdef OPENSSL_SYS_VMS /* prototypes for sys$whatever */
# define SGTTY
#endif
+#if defined(OPENSSL_SYS_VSWORKS)
+#undef TERMIOS
+#undef TERMIO
+#undef SGTTY
+#endif
+
#ifdef TERMIOS
# include <termios.h>
# define TTY_STRUCT struct termios
#else
static void (*savsig[NX509_SIG])(int );
#endif
-static jmp_buf save;
#ifdef OPENSSL_SYS_VMS
static struct IOSB iosb;
static long status;
static unsigned short channel = 0;
#else
-#ifndef OPENSSL_SYS_MSDOS
+#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__)
static TTY_STRUCT tty_orig,tty_new;
#endif
#endif
#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN16)
static int noecho_fgets(char *buf, int size, FILE *tty);
#endif
-static int read_string_inner(UI *ui, UI_STRING *uis, int echo);
+static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl);
static int read_string(UI *ui, UI_STRING *uis);
+static int write_string(UI *ui, UI_STRING *uis);
static int open_console(UI *ui);
static int echo_console(UI *ui);
{
"OpenSSL default user interface",
open_console,
+ write_string,
+ NULL, /* No flusher is needed for command lines */
read_string,
- NULL, /* The reader function writes as well */
close_console,
+ NULL
};
/* The method with all the built-in thingies */
return &ui_openssl;
}
-static int read_string(UI *ui, UI_STRING *uis)
+/* The following function makes sure that info and error strings are printed
+ before any prompt. */
+static int write_string(UI *ui, UI_STRING *uis)
{
switch (UI_get_string_type(uis))
{
- case UI_VERIFY_NOECHO:
- fprintf(tty_out,"Verifying - %s",
- UI_get0_output_string(uis));
+ case UIT_ERROR:
+ case UIT_INFO:
+ fputs(UI_get0_output_string(uis), tty_out);
fflush(tty_out);
- if (read_string_inner(ui, uis, 0) == 0)
- return 0;
- if (strcmp(UI_get0_result_string(uis),
- UI_get0_test_string(uis)) != 0)
- {
- fprintf(tty_out,"Verify failure\n");
- fflush(tty_out);
- return 0;
- }
break;
- case UI_VERIFY_ECHO:
+ default:
+ break;
+ }
+ return 1;
+ }
+
+static int read_string(UI *ui, UI_STRING *uis)
+ {
+ int ok = 0;
+
+ switch (UI_get_string_type(uis))
+ {
+ case UIT_BOOLEAN:
+ fputs(UI_get0_output_string(uis), tty_out);
+ fputs(UI_get0_action_string(uis), tty_out);
+ fflush(tty_out);
+ return read_string_inner(ui, uis,
+ UI_get_input_flags(uis) & UI_INPUT_FLAG_ECHO, 0);
+ case UIT_PROMPT:
+ fputs(UI_get0_output_string(uis), tty_out);
+ fflush(tty_out);
+ return read_string_inner(ui, uis,
+ UI_get_input_flags(uis) & UI_INPUT_FLAG_ECHO, 1);
+ case UIT_VERIFY:
fprintf(tty_out,"Verifying - %s",
UI_get0_output_string(uis));
fflush(tty_out);
- if (read_string_inner(ui, uis, 1) == 0)
- return 0;
+ if ((ok = read_string_inner(ui, uis,
+ UI_get_input_flags(uis) & UI_INPUT_FLAG_ECHO, 1)) <= 0)
+ return ok;
if (strcmp(UI_get0_result_string(uis),
UI_get0_test_string(uis)) != 0)
{
return 0;
}
break;
- case UI_STRING_NOECHO:
- fputs(UI_get0_output_string(uis), tty_out);
- fflush(tty_out);
- return read_string_inner(ui, uis, 0);
- case UI_STRING_ECHO:
- fputs(UI_get0_output_string(uis), tty_out);
- fflush(tty_out);
- return read_string_inner(ui, uis, 1);
default:
- fputs(UI_get0_output_string(uis), tty_out);
- fflush(tty_out);
break;
}
return 1;
} while (strchr(buf,'\n') == NULL);
}
-static int read_string_inner(UI *ui, UI_STRING *uis, int echo)
+static volatile sig_atomic_t intr_signal;
+
+static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
{
static int ps;
int ok;
- char *result = OPENSSL_malloc(BUFSIZ);
+ char result[BUFSIZ];
int maxsize = BUFSIZ-1;
+ char *p;
#ifndef OPENSSL_SYS_WIN16
- if (setjmp(save))
- {
- ok=0;
- goto error;
- }
+ intr_signal=0;
ok=0;
ps=0;
pushsig();
ps=1;
- if (!echo) noecho_console(ui);
+ if (!echo && !noecho_console(ui))
+ goto error;
ps=2;
- while (!ok)
- {
- char *p;
-
- result[0]='\0';
+ result[0]='\0';
#ifdef OPENSSL_SYS_MSDOS
- if (!echo)
- noecho_fgets(result,maxsize,tty_in);
- else
- fgets(result,maxsize,tty_in);
+ if (!echo)
+ {
+ noecho_fgets(result,maxsize,tty_in);
+ p=result; /* FIXME: noecho_fgets doesn't return errors */
+ }
+ else
+ p=fgets(result,maxsize,tty_in);
#else
- fgets(result,maxsize,tty_in);
+ p=fgets(result,maxsize,tty_in);
#endif
- if (feof(tty_in)) goto error;
- if (ferror(tty_in)) goto error;
- if ((p=(char *)strchr(result,'\n')) != NULL)
+ if(!p)
+ goto error;
+ if (feof(tty_in)) goto error;
+ if (ferror(tty_in)) goto error;
+ if ((p=(char *)strchr(result,'\n')) != NULL)
+ {
+ if (strip_nl)
*p='\0';
- else
- read_till_nl(tty_in);
- if (UI_set_result(uis, result) >= 0)
- ok=1;
}
+ else
+ read_till_nl(tty_in);
+ if (UI_set_result(ui, uis, result) >= 0)
+ ok=1;
error:
+ if (intr_signal == SIGINT)
+ ok=-1;
if (!echo) fprintf(tty_out,"\n");
- if (ps >= 2 && !echo)
- echo_console(ui);
+ if (ps >= 2 && !echo && !echo_console(ui))
+ ok=0;
if (ps >= 1)
popsig();
#else
- memset(result,0,BUFSIZ);
ok=1;
#endif
- OPENSSL_free(result);
+ memset(result,0,BUFSIZ);
return ok;
}
CRYPTO_w_lock(CRYPTO_LOCK_UI);
is_a_tty = 1;
-#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC)
+#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(OPENSSL_SYS_VSWORKS)
tty_in=stdin;
tty_out=stderr;
#else
- if ((tty_in=fopen("/dev/tty","r")) == NULL)
+# ifdef OPENSSL_SYS_MSDOS
+# define DEV_TTY "con"
+# else
+# define DEV_TTY "/dev/tty"
+# endif
+ if ((tty_in=fopen(DEV_TTY,"r")) == NULL)
tty_in=stdin;
- if ((tty_out=fopen("/dev/tty","w")) == NULL)
+ if ((tty_out=fopen(DEV_TTY,"w")) == NULL)
tty_out=stderr;
#endif
-#if defined(TTY_get) && !defined(VMS)
+#if defined(TTY_get) && !defined(OPENSSL_SYS_VMS)
if (TTY_get(fileno(tty_in),&tty_orig) == -1)
{
#ifdef ENOTTY
static void recsig(int i)
{
- longjmp(save,1);
-#ifdef LINT
- i=i;
-#endif
+ intr_signal=i;
}
-
/* Internal functions specific for Windows */
#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN16)
static int noecho_fgets(char *buf, int size, FILE *tty)
projects / openssl.git / blobdiff