Home Original page

deps: upgrade openssl sources to 1.0.2m · nodejs/node@8386ce7

@@ -180,13 +180,6 @@ typedef unsigned int u_int;

180180

# include <fcntl.h>

181181

#endif

182182183-

/* Use Windows API with STD_INPUT_HANDLE when checking for input?

184-

Don't look at OPENSSL_SYS_MSDOS for this, since it is always defined if

185-

OPENSSL_SYS_WINDOWS is defined */

186-

#if defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_WINCE) && defined(STD_INPUT_HANDLE)

187-

#define OPENSSL_USE_STD_INPUT_HANDLE

188-

#endif

189-190183

#undef PROG

191184

#define PROG s_client_main

192185

@@ -236,7 +229,6 @@ static BIO *bio_c_msg = NULL;

236229

static int c_quiet = 0;

237230

static int c_ign_eof = 0;

238231

static int c_brief = 0;

239-

static int c_no_rand_screen = 0;

240232241233

#ifndef OPENSSL_NO_PSK

242234

/* Default PSK identity and key */

@@ -452,10 +444,6 @@ static void sc_usage(void)

452444

" -keymatexport label - Export keying material using label\n");

453445

BIO_printf(bio_err,

454446

" -keymatexportlen len - Export len bytes of keying material (default 20)\n");

455-

#ifdef OPENSSL_SYS_WINDOWS

456-

BIO_printf(bio_err,

457-

" -no_rand_screen - Do not use RAND_screen() to initialize random state\n");

458-

#endif

459447

}

460448461449

#ifndef OPENSSL_NO_TLSEXT

@@ -1148,10 +1136,6 @@ int MAIN(int argc, char **argv)

11481136

keymatexportlen = atoi(*(++argv));

11491137

if (keymatexportlen == 0)

11501138

goto bad;

1151-

#ifdef OPENSSL_SYS_WINDOWS

1152-

} else if (strcmp(*argv, "-no_rand_screen") == 0) {

1153-

c_no_rand_screen = 1;

1154-

#endif

11551139

} else {

11561140

BIO_printf(bio_err, "unknown option %s\n", *argv);

11571141

badop = 1;

@@ -1268,7 +1252,7 @@ int MAIN(int argc, char **argv)

12681252

if (!load_excert(&exc, bio_err))

12691253

goto end;

127012541271-

if (!app_RAND_load_file(NULL, bio_err, ++c_no_rand_screen) && inrand == NULL

1255+

if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL

12721256

&& !RAND_status()) {

12731257

BIO_printf(bio_err,

12741258

"warning, not much extra random data, consider using the -rand option\n");

@@ -1683,6 +1667,8 @@ int MAIN(int argc, char **argv)

16831667

if (strstr(mbuf, "/stream:features>"))

16841668

goto shut;

16851669

seen = BIO_read(sbio, mbuf, BUFSIZZ);

1670+

if (seen <= 0)

1671+

goto shut;

16861672

mbuf[seen] = 0;

16871673

}

16881674

BIO_printf(sbio,

@@ -1806,16 +1792,17 @@ int MAIN(int argc, char **argv)

18061792

tv.tv_usec = 0;

18071793

i = select(width, (void *)&readfds, (void *)&writefds,

18081794

NULL, &tv);

1809-

#if defined(OPENSSL_USE_STD_INPUT_HANDLE)

1795+

# if defined(OPENSSL_SYS_WINCE) || defined(OPENSSL_SYS_MSDOS)

1796+

if (!i && (!_kbhit() || !read_tty))

1797+

continue;

1798+

# else

18101799

if (!i && (!((_kbhit())

18111800

|| (WAIT_OBJECT_0 ==

18121801

WaitForSingleObject(GetStdHandle

18131802

(STD_INPUT_HANDLE),

18141803

0)))

18151804

|| !read_tty))

18161805

continue;

1817-

#else

1818-

if(!i && (!_kbhit() || !read_tty) ) continue;

18191806

# endif

18201807

} else

18211808

i = select(width, (void *)&readfds, (void *)&writefds,

@@ -2017,12 +2004,12 @@ int MAIN(int argc, char **argv)

20172004

}

20182005

}

20192006

#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)

2020-

#if defined(OPENSSL_USE_STD_INPUT_HANDLE)

2007+

# if defined(OPENSSL_SYS_WINCE) || defined(OPENSSL_SYS_MSDOS)

2008+

else if (_kbhit())

2009+

# else

20212010

else if ((_kbhit())

20222011

|| (WAIT_OBJECT_0 ==

20232012

WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0)))

2024-

#else

2025-

else if (_kbhit())

20262013

# endif

20272014

#elif defined (OPENSSL_SYS_NETWARE)

20282015

else if (_kbhit())