X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fui%2Fui_openssl.c;h=bd4ac05745864d10a6951cd5fd7ecfc41fd669ab;hp=3555ae6275c8f906b20072570962e0c774abddc7;hb=b589977b9ea9a0d102c64add1d0d44d6015ce591;hpb=29fb08c2de059d22b599f43ce5deaadfed28bc3a diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c index 3555ae6275..bd4ac05745 100644 --- a/crypto/ui/ui_openssl.c +++ b/crypto/ui/ui_openssl.c @@ -1,6 +1,6 @@ /* crypto/ui/ui_openssl.c -*- mode:C; c-file-style: "eay" -*- */ -/* Written by Richard Levitte (levitte@stacken.kth.se) for the OpenSSL - * project 2000. +/* Written by Richard Levitte (levitte@stacken.kth.se) and others + * for the OpenSSL project 2000/2001. */ /* ==================================================================== * Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved. @@ -261,7 +261,7 @@ static jmp_buf save; #ifdef OPENSSL_SYS_VMS static struct IOSB iosb; static $DESCRIPTOR(terminal,"TT"); -static long tty_orig[3], tty_new[3]; +static long tty_orig[3], tty_new[3]; /* XXX Is there any guarantee that this will always suffice for the actual structures? */ static long status; static unsigned short channel = 0; #else @@ -269,7 +269,7 @@ static unsigned short channel = 0; static TTY_STRUCT tty_orig,tty_new; #endif #endif -static FILE *tty; +static FILE *tty_in, *tty_out; static int is_a_tty; /* Declare static functions */ @@ -280,9 +280,10 @@ static void popsig(void); #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); @@ -293,9 +294,11 @@ static UI_METHOD ui_openssl = { "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 */ @@ -304,49 +307,56 @@ UI_METHOD *UI_OpenSSL(void) 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,"Verifying - %s", - UI_get0_output_string(uis)); - fflush(tty); - 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,"Verify failure\n"); - fflush(tty); - return 0; - } + case UIT_ERROR: + case UIT_INFO: + fputs(UI_get0_output_string(uis), tty_out); + fflush(tty_out); + break; + default: break; - case UI_VERIFY_ECHO: - fprintf(tty,"Verifying - %s", + } + 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); - if (read_string_inner(ui, uis, 1) == 0) - return 0; + fflush(tty_out); + 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) { - fprintf(tty,"Verify failure\n"); - fflush(tty); + fprintf(tty_out,"Verify failure\n"); + fflush(tty_out); return 0; } break; - case UI_STRING_NOECHO: - fputs(UI_get0_output_string(uis), tty); - fflush(tty); - return read_string_inner(ui, uis, 0); - case UI_STRING_ECHO: - fputs(UI_get0_output_string(uis), tty); - fflush(tty); - return read_string_inner(ui, uis, 1); default: - fputs(UI_get0_output_string(uis), tty); - fflush(tty); break; } return 1; @@ -364,17 +374,18 @@ static void read_till_nl(FILE *in) } while (strchr(buf,'\n') == NULL); } -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 ps; int ok; - char *result = OPENSSL_malloc(BUFSIZ); + char result[BUFSIZ]; int maxsize = BUFSIZ-1; + char *p; #ifndef OPENSSL_SYS_WIN16 - if (setjmp(save)) + if ((ok = setjmp(save))) { - ok=0; + if (ok == 1) ok=0; goto error; } ok=0; @@ -386,39 +397,39 @@ static int read_string_inner(UI *ui, UI_STRING *uis, int echo) if (!echo) noecho_console(ui); ps=2; - while (!ok) - { - char *p; - - result[0]='\0'; + result[0]='\0'; #ifdef OPENSSL_SYS_MSDOS - if (!echo) - noecho_fgets(result,maxsize,tty); - else + if (!echo) + noecho_fgets(result,maxsize,tty_in); + else + fgets(result,maxsize,tty_in); +#else + fgets(result,maxsize,tty_in); #endif - fgets(result,maxsize,tty); - if (feof(tty)) goto error; - if (ferror(tty)) goto error; - if ((p=(char *)strchr(result,'\n')) != NULL) + 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); - 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 (!echo) fprintf(tty,"\n"); + if (!echo) fprintf(tty_out,"\n"); if (ps >= 2 && !echo) echo_console(ui); if (ps >= 1) popsig(); #else - memset(result,0,BUFSIZ); ok=1; #endif - OPENSSL_free(result); + memset(result,0,BUFSIZ); return ok; } @@ -429,18 +440,23 @@ static int open_console(UI *ui) CRYPTO_w_lock(CRYPTO_LOCK_UI); is_a_tty = 1; -#ifdef OPENSSL_SYS_MSDOS - if ((tty=fopen("con","w+")) == NULL) - tty=stdin; -#elif defined(OPENSSL_SYS_MACINTOSH_CLASSIC) - tty=stdin; +#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) + tty_in=stdin; + tty_out=stderr; #else - if ((tty=fopen("/dev/tty","w+")) == NULL) - tty=stdin; +# 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) + tty_out=stderr; #endif #if defined(TTY_get) && !defined(VMS) - if (TTY_get(fileno(tty),&tty_orig) == -1) + if (TTY_get(fileno(tty_in),&tty_orig) == -1) { #ifdef ENOTTY if (errno == ENOTTY) @@ -476,7 +492,7 @@ static int noecho_console(UI *ui) #endif #if defined(TTY_set) && !defined(OPENSSL_SYS_VMS) - if (is_a_tty && (TTY_set(fileno(tty),&tty_new) == -1)) + if (is_a_tty && (TTY_set(fileno(tty_in),&tty_new) == -1)) return 0; #endif #ifdef OPENSSL_SYS_VMS @@ -498,7 +514,7 @@ static int echo_console(UI *ui) #endif #if defined(TTY_set) && !defined(OPENSSL_SYS_VMS) - if (is_a_tty && (TTY_set(fileno(tty),&tty_new) == -1)) + if (is_a_tty && (TTY_set(fileno(tty_in),&tty_new) == -1)) return 0; #endif #ifdef OPENSSL_SYS_VMS @@ -514,7 +530,8 @@ static int echo_console(UI *ui) static int close_console(UI *ui) { - if (stdin != tty) fclose(tty); + if (tty_in != stderr) fclose(tty_in); + if (tty_out != stderr) fclose(tty_out); #ifdef OPENSSL_SYS_VMS status = sys$dassgn(channel); #endif @@ -585,10 +602,15 @@ static void popsig(void) static void recsig(int i) { + switch(i) + { + case SIGINT: + longjmp(save,-1); + break; + default: + break; + } longjmp(save,1); -#ifdef LINT - i=i; -#endif }