Make sure that the signal storage is regarded as volatile.

[openssl.git] / crypto / ui / ui_openssl.c

diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index bd4ac05745864d10a6951cd5fd7ecfc41fd669ab..f47ed31cb02476344f1bd000b6a4b12356fffc0a 100644 (file)
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c
@@ -1,9 +1,9 @@
 /* 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
@@ -148,7 +148,6 @@
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
-#include <setjmp.h>
 #include <errno.h>
 
 #ifdef OPENSSL_SYS_VMS         /* prototypes for sys$whatever */
@@ -192,6 +191,12 @@
 # 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
@@ -256,7 +261,6 @@ static struct sigaction savsig[NX509_SIG];
 #else
 static void (*savsig[NX509_SIG])(int );
 #endif
-static jmp_buf save;
 
 #ifdef OPENSSL_SYS_VMS
 static struct IOSB iosb;
@@ -265,7 +269,7 @@ static long tty_orig[3], tty_new[3]; /* XXX   Is there any guarantee that this w
 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
@@ -374,6 +378,8 @@ static void read_till_nl(FILE *in)
                } while (strchr(buf,'\n') == NULL);
        }
 
+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;
@@ -383,29 +389,31 @@ static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
        char *p;
 
 #ifndef OPENSSL_SYS_WIN16
-       if ((ok = setjmp(save)))
-               {
-               if (ok == 1) 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;
 
        result[0]='\0';
 #ifdef OPENSSL_SYS_MSDOS
        if (!echo)
+               {
                noecho_fgets(result,maxsize,tty_in);
+               p=result; /* FIXME: noecho_fgets doesn't return errors */
+               }
        else
-               fgets(result,maxsize,tty_in);
+               p=fgets(result,maxsize,tty_in);
 #else
-       fgets(result,maxsize,tty_in);
+       p=fgets(result,maxsize,tty_in);
 #endif
+       if(!p)
+               goto error;
        if (feof(tty_in)) goto error;
        if (ferror(tty_in)) goto error;
        if ((p=(char *)strchr(result,'\n')) != NULL)
@@ -419,9 +427,11 @@ static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
                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();
@@ -440,7 +450,7 @@ static int open_console(UI *ui)
        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
@@ -455,7 +465,7 @@ static int open_console(UI *ui)
                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
@@ -602,18 +612,9 @@ static void popsig(void)
 
 static void recsig(int i)
        {
-       switch(i)
-               {
-       case SIGINT:
-               longjmp(save,-1);
-               break;
-       default:
-               break;
-               }
-       longjmp(save,1);
+       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)