Do not loop i the OpenSSL UI method any more. Instead, letthe
[openssl.git] / crypto / ui / ui_openssl.c
index bb66291..bd4ac05 100644 (file)
@@ -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,30 +307,47 @@ 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_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)
                        {
@@ -336,17 +356,7 @@ static int read_string(UI *ui, UI_STRING *uis)
                        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;
@@ -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,28 +397,26 @@ 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_in);
-               else
-                       fgets(result,maxsize,tty_in);
-#else
+       if (!echo)
+               noecho_fgets(result,maxsize,tty_in);
+       else
                fgets(result,maxsize,tty_in);
+#else
+       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 (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 (!echo) fprintf(tty_out,"\n");
@@ -417,11 +426,10 @@ error:
        if (ps >= 1)
                popsig();
 #else
-       memset(result,0,BUFSIZ);
        ok=1;
 #endif
 
-       OPENSSL_free(result);
+       memset(result,0,BUFSIZ);
        return ok;
        }
 
@@ -594,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
        }