summaryrefslogtreecommitdiff
path: root/lib/libssl/src/crypto/ui/ui_openssl.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libssl/src/crypto/ui/ui_openssl.c')
-rw-r--r--lib/libssl/src/crypto/ui/ui_openssl.c315
1 files changed, 163 insertions, 152 deletions
diff --git a/lib/libssl/src/crypto/ui/ui_openssl.c b/lib/libssl/src/crypto/ui/ui_openssl.c
index 6000c24b1cf..94a999baa8d 100644
--- a/lib/libssl/src/crypto/ui/ui_openssl.c
+++ b/lib/libssl/src/crypto/ui/ui_openssl.c
@@ -10,7 +10,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
@@ -63,21 +63,21 @@
* This package is an SSL implementation written
* by Eric Young (eay@cryptsoft.com).
* The implementation was written so as to conform with Netscapes SSL.
- *
+ *
* This library is free for commercial and non-commercial use as long as
* the following conditions are aheared to. The following conditions
* apply to all code found in this distribution, be it the RC4, RSA,
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
* included with this distribution is covered by the same copyright terms
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
+ *
* Copyright remains Eric Young's, and as such any Copyright notices in
* the code are not to be removed.
* If this package is used in a product, Eric Young should be given attribution
* as the author of the parts of the library used.
* This can be in the form of a textual message at program startup or
* in documentation (online or textual) provided with the package.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -92,10 +92,10 @@
* Eric Young (eay@cryptsoft.com)"
* The word 'cryptographic' can be left out if the rouines from the library
* being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
+ * 4. If you include any Windows specific code (or a derivative thereof) from
* the apps directory (application code) you must include an acknowledgement:
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
+ *
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -107,7 +107,7 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
+ *
* The licence and distribution terms for any publically available version or
* derivative of this code cannot be changed. i.e. this code cannot simply be
* copied and put under another distribution licence
@@ -125,14 +125,14 @@
#include <unistd.h>
/* If unistd.h defines _POSIX_VERSION, we conclude that we
* are on a POSIX system and have sigaction and termios. */
-# if defined(_POSIX_VERSION)
+#if defined(_POSIX_VERSION)
-# define SIGACTION
-# if !defined(TERMIOS) && !defined(TERMIO) && !defined(SGTTY)
-# define TERMIOS
-# endif
+#define SIGACTION
+#if !defined(TERMIOS) && !defined(TERMIO) && !defined(SGTTY)
+#define TERMIOS
+#endif
-# endif
+#endif
#include "ui_locl.h"
#include "cryptlib.h"
@@ -143,31 +143,31 @@
*/
#ifdef _LIBC
-# undef TERMIOS
-# define TERMIO
-# undef SGTTY
+#undef TERMIOS
+#define TERMIO
+#undef SGTTY
#endif
#ifdef TERMIOS
-# include <termios.h>
-# define TTY_STRUCT struct termios
-# define TTY_FLAGS c_lflag
-# define TTY_get(tty,data) tcgetattr(tty,data)
-# define TTY_set(tty,data) tcsetattr(tty,TCSANOW,data)
+#include <termios.h>
+#define TTY_STRUCT struct termios
+#define TTY_FLAGS c_lflag
+#define TTY_get(tty,data) tcgetattr(tty,data)
+#define TTY_set(tty,data) tcsetattr(tty,TCSANOW,data)
#endif
#ifdef TERMIO
-# include <termio.h>
-# define TTY_STRUCT struct termio
-# define TTY_FLAGS c_lflag
-# define TTY_get(tty,data) ioctl(tty,TCGETA,data)
-# define TTY_set(tty,data) ioctl(tty,TCSETA,data)
+#include <termio.h>
+#define TTY_STRUCT struct termio
+#define TTY_FLAGS c_lflag
+#define TTY_get(tty,data) ioctl(tty,TCGETA,data)
+#define TTY_set(tty,data) ioctl(tty,TCSETA,data)
#endif
-# include <sys/ioctl.h>
+#include <sys/ioctl.h>
#ifndef NX509_SIG
-# define NX509_SIG 32
+#define NX509_SIG 32
#endif
@@ -175,10 +175,10 @@
#ifdef SIGACTION
static struct sigaction savsig[NX509_SIG];
#else
-static void (*savsig[NX509_SIG])(int );
+static void (*savsig[NX509_SIG]) (int);
#endif
-static TTY_STRUCT tty_orig,tty_new;
+static TTY_STRUCT tty_orig, tty_new;
static FILE *tty_in, *tty_out;
static int is_a_tty;
@@ -187,18 +187,18 @@ static int read_till_nl(FILE *);
static void recsig(int);
static void pushsig(void);
static void popsig(void);
-static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl);
+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 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);
-static int noecho_console(UI *ui);
-static int close_console(UI *ui);
+static int open_console(UI * ui);
+static int echo_console(UI * ui);
+static int noecho_console(UI * ui);
+static int close_console(UI * ui);
static UI_METHOD ui_openssl =
- {
+{
"OpenSSL default user interface",
open_console,
write_string,
@@ -206,216 +206,226 @@ static UI_METHOD ui_openssl =
read_string,
close_console,
NULL
- };
+};
/* The method with all the built-in thingies */
-UI_METHOD *UI_OpenSSL(void)
- {
+UI_METHOD *
+UI_OpenSSL(void)
+{
return &ui_openssl;
- }
+}
/* 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 UIT_ERROR:
- case UIT_INFO:
+static int
+write_string(UI * ui, UI_STRING * uis)
+{
+ switch (UI_get_string_type(uis)) {
+ case UIT_ERROR:
+ case UIT_INFO:
fputs(UI_get0_output_string(uis), tty_out);
fflush(tty_out);
break;
default:
break;
- }
- return 1;
}
+ return 1;
+}
-static int read_string(UI *ui, UI_STRING *uis)
- {
+static int
+read_string(UI * ui, UI_STRING * uis)
+{
int ok = 0;
- switch (UI_get_string_type(uis))
- {
+ 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);
+ 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);
+ UI_get_input_flags(uis) & UI_INPUT_FLAG_ECHO, 1);
case UIT_VERIFY:
- fprintf(tty_out,"Verifying - %s",
- UI_get0_output_string(uis));
+ fprintf(tty_out, "Verifying - %s",
+ UI_get0_output_string(uis));
fflush(tty_out);
if ((ok = read_string_inner(ui, uis,
- UI_get_input_flags(uis) & UI_INPUT_FLAG_ECHO, 1)) <= 0)
+ 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_out,"Verify failure\n");
+ UI_get0_test_string(uis)) != 0) {
+ fprintf(tty_out, "Verify failure\n");
fflush(tty_out);
return 0;
- }
+ }
break;
default:
break;
- }
- return 1;
}
+ return 1;
+}
/* Internal functions to read a string without echoing */
-static int read_till_nl(FILE *in)
- {
+static int
+read_till_nl(FILE * in)
+{
#define SIZE 4
- char buf[SIZE+1];
+ char buf[SIZE + 1];
- do {
- if (!fgets(buf,SIZE,in))
+ do {
+ if (!fgets(buf, SIZE, in))
return 0;
- } while (strchr(buf,'\n') == NULL);
+ } while (strchr(buf, '\n') == NULL);
return 1;
- }
+}
static volatile sig_atomic_t intr_signal;
-static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
- {
+static int
+read_string_inner(UI * ui, UI_STRING * uis, int echo, int strip_nl)
+{
static int ps;
int ok;
char result[BUFSIZ];
- int maxsize = BUFSIZ-1;
+ int maxsize = BUFSIZ - 1;
char *p;
- intr_signal=0;
- ok=0;
- ps=0;
+ intr_signal = 0;
+ ok = 0;
+ ps = 0;
pushsig();
- ps=1;
+ ps = 1;
if (!echo && !noecho_console(ui))
goto error;
- ps=2;
+ ps = 2;
- result[0]='\0';
- p=fgets(result,maxsize,tty_in);
- if(!p)
+ result[0] = '\0';
+ p = fgets(result, maxsize, tty_in);
+ if (!p)
goto error;
- 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
- if (!read_till_nl(tty_in))
- goto error;
+ *p = '\0';
+ } else if (!read_till_nl(tty_in))
+ goto error;
if (UI_set_result(ui, uis, result) >= 0)
- ok=1;
+ ok = 1;
error:
if (intr_signal == SIGINT)
- ok=-1;
- if (!echo) fprintf(tty_out,"\n");
+ ok = -1;
+ if (!echo)
+ fprintf(tty_out, "\n");
if (ps >= 2 && !echo && !echo_console(ui))
- ok=0;
+ ok = 0;
if (ps >= 1)
popsig();
- OPENSSL_cleanse(result,BUFSIZ);
+ OPENSSL_cleanse(result, BUFSIZ);
return ok;
- }
+}
/* Internal functions to open, handle and close a channel to the console. */
-static int open_console(UI *ui)
- {
+static int
+open_console(UI * ui)
+{
CRYPTO_w_lock(CRYPTO_LOCK_UI);
is_a_tty = 1;
-# define DEV_TTY "/dev/tty"
- if ((tty_in=fopen(DEV_TTY,"r")) == NULL)
- tty_in=stdin;
- if ((tty_out=fopen(DEV_TTY,"w")) == NULL)
- tty_out=stderr;
+#define DEV_TTY "/dev/tty"
+ if ((tty_in = fopen(DEV_TTY, "r")) == NULL)
+ tty_in = stdin;
+ if ((tty_out = fopen(DEV_TTY, "w")) == NULL)
+ tty_out = stderr;
#if defined(TTY_get)
- if (TTY_get(fileno(tty_in),&tty_orig) == -1)
- {
+ if (TTY_get(fileno(tty_in), &tty_orig) == -1) {
if (errno == ENOTTY)
- is_a_tty=0;
+ is_a_tty = 0;
else
- /* Ariel Glenn ariel@columbia.edu reports that solaris
- * can return EINVAL instead. This should be ok */
+ /*
+ * Ariel Glenn ariel@columbia.edu reports that
+ * solaris can return EINVAL instead. This should be
+ * ok
+ */
if (errno == EINVAL)
- is_a_tty=0;
+ is_a_tty = 0;
else
return 0;
- }
+ }
#endif
return 1;
- }
+}
-static int noecho_console(UI *ui)
- {
+static int
+noecho_console(UI * ui)
+{
#ifdef TTY_FLAGS
- memcpy(&(tty_new),&(tty_orig),sizeof(tty_orig));
+ memcpy(&(tty_new), &(tty_orig), sizeof(tty_orig));
tty_new.TTY_FLAGS &= ~ECHO;
#endif
#if defined(TTY_set)
- if (is_a_tty && (TTY_set(fileno(tty_in),&tty_new) == -1))
+ if (is_a_tty && (TTY_set(fileno(tty_in), &tty_new) == -1))
return 0;
#endif
return 1;
- }
+}
-static int echo_console(UI *ui)
- {
+static int
+echo_console(UI * ui)
+{
#if defined(TTY_set)
- memcpy(&(tty_new),&(tty_orig),sizeof(tty_orig));
+ memcpy(&(tty_new), &(tty_orig), sizeof(tty_orig));
tty_new.TTY_FLAGS |= ECHO;
#endif
#if defined(TTY_set)
- if (is_a_tty && (TTY_set(fileno(tty_in),&tty_new) == -1))
+ if (is_a_tty && (TTY_set(fileno(tty_in), &tty_new) == -1))
return 0;
#endif
return 1;
- }
-
-static int close_console(UI *ui)
- {
- if (tty_in != stdin) fclose(tty_in);
- if (tty_out != stderr) fclose(tty_out);
+}
+
+static int
+close_console(UI * ui)
+{
+ if (tty_in != stdin)
+ fclose(tty_in);
+ if (tty_out != stderr)
+ fclose(tty_out);
CRYPTO_w_unlock(CRYPTO_LOCK_UI);
return 1;
- }
+}
/* Internal functions to handle signals and act on them */
-static void pushsig(void)
- {
+static void
+pushsig(void)
+{
int i;
#ifdef SIGACTION
struct sigaction sa;
- memset(&sa,0,sizeof sa);
- sa.sa_handler=recsig;
+ memset(&sa, 0, sizeof sa);
+ sa.sa_handler = recsig;
#endif
- for (i=1; i<NX509_SIG; i++)
- {
+ for (i = 1; i < NX509_SIG; i++) {
#ifdef SIGUSR1
if (i == SIGUSR1)
continue;
@@ -425,39 +435,40 @@ static void pushsig(void)
continue;
#endif
#ifdef SIGKILL
- if (i == SIGKILL) /* We can't make any action on that. */
+ if (i == SIGKILL) /* We can't make any action on that. */
continue;
#endif
#ifdef SIGACTION
- sigaction(i,&sa,&savsig[i]);
+ sigaction(i, &sa, &savsig[i]);
#else
- savsig[i]=signal(i,recsig);
+ savsig[i] = signal(i, recsig);
#endif
- }
+ }
#ifdef SIGWINCH
- signal(SIGWINCH,SIG_DFL);
+ signal(SIGWINCH, SIG_DFL);
#endif
- }
+}
-static void popsig(void)
- {
+static void
+popsig(void)
+{
int i;
- for (i=1; i<NX509_SIG; i++)
- {
+ for (i = 1; i < NX509_SIG; i++) {
if (i == SIGUSR1)
continue;
if (i == SIGUSR2)
continue;
#ifdef SIGACTION
- sigaction(i,&savsig[i],NULL);
+ sigaction(i, &savsig[i], NULL);
#else
- signal(i,savsig[i]);
+ signal(i, savsig[i]);
#endif
- }
}
+}
-static void recsig(int i)
- {
- intr_signal=i;
- }
+static void
+recsig(int i)
+{
+ intr_signal = i;
+}