@@ -412,6 +412,7 @@

@@ -420,6 +421,7 @@

@@ -453,6 +455,12 @@

@@ -475,7 +483,7 @@

 }

 void CRYPTO_set_locking_callback(void (*func) (int mode, int type,

@@ -1021,6 +1029,12 @@

         MessageBox(NULL, buf, _T("OpenSSL: FATAL"), MB_OK | MB_ICONSTOP);

+/*

+ * Solaris libsa.a used for WAN boot doesn't provide for vfprintf(). Since

+ * OPENSSL_showfatal() is not used anywhere else then here we can safely use

+ * the code from 0.9.7d version.

+ */

 void OPENSSL_showfatal(const char *fmta, ...)

 {

     va_list ap;

@@ -1029,6 +1043,7 @@

     vfprintf(stderr, fmta, ap);

     va_end(ap);

 int OPENSSL_isservice(void)

 {

@@ -1038,9 +1053,15 @@

 void OpenSSLDie(const char *file, int line, const char *assertion)

 {

     OPENSSL_showfatal

         ("%s(%d): OpenSSL internal error, assertion failed: %s\n", file, line,

          assertion);

     abort();

     ERR_load_X509V3_strings();

     ERR_load_PKCS12_strings();

     ERR_load_RAND_strings();

     ERR_load_DSO_strings();

     ERR_load_TS_strings();

 # ifndef OPENSSL_NO_ENGINE

     ERR_load_ENGINE_strings();

@@ -83,7 +83,7 @@

     else

         return (prompt_string);

 }

 /*

  * For historical reasons, the standard function for reading passwords is in

  * the DES library -- if someone ever wants to disable DES, this function

@@ -115,6 +115,7 @@

     OPENSSL_cleanse(buff, BUFSIZ);

     return ret;

 }

 int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,

                    const unsigned char *salt, const unsigned char *data,

 # include <sys/time.h>

 # include <sys/times.h>

 # include <sys/stat.h>

+# include <sys/fcntl.h>

 # include <fcntl.h>

 # include <unistd.h>

 # include <time.h>

 # if defined(OPENSSL_SYS_LINUX) /* should actually be available virtually

@@ -259,6 +263,11 @@

     const char **egdsocket = NULL;

 #  endif

 #  ifdef DEVRANDOM

     memset(randomstats, 0, sizeof(randomstats));

     /*

@@ -307,11 +316,15 @@

             do {

                 int try_read = 0;

-#   if defined(OPENSSL_SYS_BEOS_R5)

+#   if defined(OPENSSL_SYS_BEOS_R5) || defined(_BOOT)

                 /*

                  * select() is broken in BeOS R5, so we simply try to read

                  * something and snooze if we couldn't

                  */

+               /*

+                * select() is not available when linking stand-alone

+                * library for wanboot

+                */

                 try_read = 1;

 #   elif defined(OPENSSL_SYS_LINUX)

@@ -365,6 +378,7 @@

                 } else

                     r = -1;

+#ifndef        _BOOT

                 /*

                  * Some Unixen will update t in select(), some won't.  For

                  * those who won't, or if we didn't use select() in the first

@@ -377,13 +391,17 @@

             while ((r > 0 ||

                     (errno == EINTR || errno == EAGAIN)) && usec != 0

                    && n < ENTROPY_NEEDED);

+#else  /* _BOOT */

+            }

+            while (r > 0 && n < ENTROPY_NEEDED);

+#endif /* _BOOT */

             close(fd);

         }

     }

 #  endif                        /* defined(DEVRANDOM) */

-#  ifdef DEVRANDOM_EGD

+#  if defined(DEVRANDOM_EGD) && !defined(_BOOT)

     /*

      * Use an EGD socket to read entropy from an EGD or PRNGD entropy

      * collecting daemon.

@@ -407,6 +424,7 @@

     }

 #  endif

     /* put in some default random data, we need more than just this */

     l = curr_pid;

     RAND_add(&l, sizeof(l), 0.0);

@@ -415,6 +433,7 @@

     l = time(NULL);

     RAND_add(&l, sizeof(l), 0.0);

 #  if defined(OPENSSL_SYS_BEOS)

     {

 # define _XOPEN_SOURCE 500

@@ -191,6 +193,7 @@

     return (ret);

 }

 {

     unsigned char buf[BUFSIZE];

@@ -335,3 +338,5 @@

     return (buf);

 }

@@ -715,9 +715,50 @@

     }

 }

+{

+    unsigned int tmp[4];

+    int num = 0, c, ok = 0;

+    tmp[0]=tmp[1]=tmp[2]=tmp[3]=0;

+    for (;;) {

+        c = *(str++);

+        if ((c >= '0') && (c <= '9')) {

+            ok = 1;

+            tmp[num] = tmp[num]*10+c-'0';

+            if (tmp[num] > 255)

+                return(0);

+        } else if (c == '.') {

+            if (!ok)

+                return (-1);

+            if (num == 3)

+                return (0);

+            num++;

+            ok = 0;

+        } else if (c == '\0' && (num == 3) && ok)

+            break;

+        else

+            return(0);

+        }

+    ip[0]=tmp[0];

+    ip[1]=tmp[1];

+    ip[2]=tmp[2];

+    ip[3]=tmp[3];

+    return(1);

+}

 {

     int a0, a1, a2, a3;

     if (sscanf(in, "%d.%d.%d.%d", &a0, &a1, &a2, &a3) != 4)

         return 0;

     if ((a0 < 0) || (a0 > 255) || (a1 < 0) || (a1 > 255)

@@ -727,6 +768,7 @@

     v4[1] = a1;

     v4[2] = a2;

     v4[3] = a3;

     return 1;

 }

@@ -213,10 +213,19 @@

 #  define get_last_socket_error() errno

 #  define clear_socket_error()    errno=0

 #  define ioctlsocket(a,b,c)      ioctl(a,b,c)

+#  define closesocket(s)          socket_close(s)

+#  define readsocket(s,b,n)       socket_read((s),(b),(n), 200)

+#  define writesocket(s,b,n)      send((s),(b),(n), 0)

 #  define closesocket(s)          close(s)

 #  define readsocket(s,b,n)       read((s),(b),(n))

 #  define writesocket(s,b,n)      write((s),(b),(n))

 # endif

 # ifdef WIN16                   /* never the case */

 #  define MS_CALLBACK   _far _loadds

 #define SPARCV9_VIS2            (1<<3) /* reserved */

 #define SPARCV9_FMADD           (1<<4) /* reserved for SPARC64 V */

+#ifndef        _BOOT

 static int OPENSSL_sparcv9cap_P = SPARCV9_TICK_PRIVILEGED;

 int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,

                 const BN_ULONG *np, const BN_ULONG *n0, int num)

@@ -36,6 +40,7 @@

 void _sparcv9_vis2_probe(void);

 void _sparcv9_fmadd_probe(void);

 {

     if (OPENSSL_sparcv9cap_P & SPARCV9_TICK_PRIVILEGED)

@@ -47,8 +52,19 @@

     else

         return _sparcv9_rdtick();

 }

+       {

+       OPENSSL_sparcv9cap_P = SPARCV9_VIS1;

+       }

 /*

  * This code path is disabled, because of incompatibility of libdevinfo.so.1

  * and libmalloc.so.1 (see below for details)

@@ -36,9 +36,9 @@

@@ -668,7 +668,11 @@

         p = s->s3->client_random;

         if (ssl_fill_hello_random(s, 0, p, SSL3_RANDOM_SIZE) <= 0)

+        if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE) <= 0)

             goto err;

         /* Do the message type and length last */

@@ -3343,7 +3343,11 @@

          * Apparently we're using a version-flexible SSL_METHOD (not at its

          * highest protocol version).

          */

         if (s->ctx->method->version == SSLv23_method()->version) {

+        if (s->ctx->method->version == TLS1_2_VERSION) {

 # error Code needs update for SSLv23_method() support beyond TLS1_2_VERSION.

 #endif