Various fixes to Win32, update ssleay.num, libeay.num, shuffle various #ifdefs

[openssl.git] / crypto / des / read_pwd.c

diff --git a/crypto/des/read_pwd.c b/crypto/des/read_pwd.c
index 75d035cf9c08d8b9b17981818d04952c7640210f..1dffe083ac079ed3aaf3e8ccf2ab1df1dab84da9 100644 (file)
--- a/crypto/des/read_pwd.c
+++ b/crypto/des/read_pwd.c
@@ -1,5 +1,5 @@
 /* crypto/des/read_pwd.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+/* #define SIGACTION */ /* Define this if you have sigaction() */
 #ifdef WIN16TTY
 #undef WIN16
 #undef _WINDOWS
@@ -64,11 +65,18 @@
 
 /* 06-Apr-92 Luke Brennan    Support for VMS */
 #include "des_locl.h"
+#include "cryptlib.h"
 #include <signal.h>
 #include <string.h>
 #include <setjmp.h>
 #include <errno.h>
 
+#ifdef WIN_CONSOLE_BUG
+#include <windows.h>
+#include <wincon.h>
+#endif
+
+
 /* There are 5 types of terminal interface supported,
  * TERMIO, TERMIOS, VMS, MSDOS and SGTTY
  */
@@ -164,17 +172,21 @@ static int noecho_fgets();
 #endif
 #endif
 
-#ifndef NOPROTO
-static void (*savsig[NX509_SIG])(int );
+#ifdef SIGACTION
+ static struct sigaction savsig[NX509_SIG];
 #else
-static void (*savsig[NX509_SIG])();
+# ifndef NOPROTO
+  static void (*savsig[NX509_SIG])(int );
+# else
+  static void (*savsig[NX509_SIG])();
+# endif
 #endif
 static jmp_buf save;
 
 int des_read_pw_string(buf, length, prompt, verify)
 char *buf;
 int length;
-char *prompt;
+const char *prompt;
 int verify;
        {
        char buff[BUFSIZ];
@@ -204,7 +216,7 @@ int des_read_pw(buf, buff, size, prompt, verify)
 char *buf;
 char *buff;
 int size;
-char *prompt;
+const char *prompt;
 int verify;
        {
 #ifdef VMS
@@ -218,14 +230,27 @@ int verify;
        TTY_STRUCT tty_orig,tty_new;
 #endif
 #endif
-       int number=5;
-       int ok=0;
-       int ps=0;
-       int is_a_tty=1;
-
-       FILE *tty=NULL;
+       int number;
+       int ok;
+       /* statics are simply to avoid warnings about longjmp clobbering
+          things */
+       static int ps;
+       int is_a_tty;
+       static FILE *tty;
        char *p;
 
+       if (setjmp(save))
+               {
+               ok=0;
+               goto error;
+               }
+
+       number=5;
+       ok=0;
+       ps=0;
+       is_a_tty=1;
+       tty=NULL;
+
 #ifndef MSDOS
        if ((tty=fopen("/dev/tty","r")) == NULL)
                tty=stdin;
@@ -241,6 +266,13 @@ int verify;
                if (errno == ENOTTY)
                        is_a_tty=0;
                else
+#endif
+#ifdef EINVAL
+               /* Ariel Glenn ariel@columbia.edu reports that solaris
+                * can return EINVAL instead.  This should be ok */
+               if (errno == EINVAL)
+                       is_a_tty=0;
+               else
 #endif
                        return(-1);
                }
@@ -255,11 +287,6 @@ int verify;
                return(-1);
 #endif
 
-       if (setjmp(save))
-               {
-               ok=0;
-               goto error;
-               }
        pushsig();
        ps=1;
 
@@ -359,7 +386,21 @@ static void pushsig()
        int i;
 
        for (i=1; i<NX509_SIG; i++)
+               {
+#ifdef SIGUSR1
+               if (i == SIGUSR1)
+                       continue;
+#endif
+#ifdef SIGUSR2
+               if (i == SIGUSR2)
+                       continue;
+#endif
+#ifdef SIGACTION
+               sigaction(i,NULL,&savsig[i]);
+#else
                savsig[i]=signal(i,recsig);
+#endif
+               }
 
 #ifdef SIGWINCH
        signal(SIGWINCH,SIG_DFL);
@@ -371,7 +412,21 @@ static void popsig()
        int i;
 
        for (i=1; i<NX509_SIG; i++)
+               {
+#ifdef SIGUSR1
+               if (i == SIGUSR1)
+                       continue;
+#endif
+#ifdef SIGUSR2
+               if (i == SIGUSR2)
+                       continue;
+#endif
+#ifdef SIGACTION
+               sigaction(i,&savsig[i],NULL);
+#else
                signal(i,savsig[i]);
+#endif
+               }
        }
 
 static void recsig(i)
@@ -414,6 +469,18 @@ FILE *tty;
                        break;
                        }
                }
+#ifdef WIN_CONSOLE_BUG
+/* Win95 has several evil console bugs: one of these is that the
+ * last character read using getch() is passed to the next read: this is
+ * usually a CR so this can be trouble. No STDIO fix seems to work but
+ * flushing the console appears to do the trick.
+ */
+                {
+                        HANDLE inh;
+                        inh = GetStdHandle(STD_INPUT_HANDLE);
+                        FlushConsoleInputBuffer(inh);
+                }
+#endif
        return(strlen(buf));
        }
 #endif