DJGPP update.

PR: 989
Submitted by: Doug Kaufman

diff --git a/Configure b/Configure
index e284418d0228123e2f768579a23791bfbd25b484..e89e4327913e30b707780d7fe9fff34839303888 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -528,7 +528,7 @@ my %table=(
 "Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:win32:cygwin-shared:::.dll",
 
 # DJGPP
-"DJGPP", "gcc:-I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall:::MSDOS:-L/dev/env/WATT_ROOT/lib -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::",
+"DJGPP", "gcc:-I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall -DDEVRANDOM=\"/dev/urandom\\x24\":::MSDOS:-L/dev/env/WATT_ROOT/lib -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::",
 
 # Ultrix from Bernhard Simon <simon@zid.tuwien.ac.at>
 "ultrix-cc","cc:-std1 -O -Olimit 2500 -DL_ENDIAN::(unknown):::::::",
@@ -1535,7 +1535,6 @@ EOF
        } else {
            # No path for Perl known ...
            &dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";');
-           &dofile("apps/der_chop",'/usr/local/bin/perl','^#!/', '#!%s');
            &dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s');
        }
        if ($depflags ne "" && !$make_depend) {

diff --git a/TABLE b/TABLE
index 282b6369c27076092e357537fd0a655c9767c99d..29c47c5c3bf4e369df3b4c774363f1512829f9cd 100644 (file)
--- a/TABLE
+++ b/TABLE
@@ -127,7 +127,7 @@ $arflags      =
 
 *** DJGPP
 $cc           = gcc
-$cflags       = -I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall
+$cflags       = -I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall -DDEVRANDOM="/dev/urandom\x24"
 $unistd       = 
 $thread_cflag = 
 $sys_id       = MSDOS

diff --git a/apps/s_client.c b/apps/s_client.c
index eb6fd7c1c34268c6f3a36b13e0f56e95ea6e11cd..af8cb1a3f0dd13946b43fa8dbfc0a02cfe53171f 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -197,6 +197,9 @@ static void sc_usage(void)
        BIO_printf(bio_err," -pause        - sleep(1) after each read(2) and write(2) system call\n");
        BIO_printf(bio_err," -showcerts    - show all certificates in the chain\n");
        BIO_printf(bio_err," -debug        - extra output\n");
+#ifdef WATT32
+       BIO_printf(bio_err," -wdebug       - WATT-32 tcp debugging\n");
+#endif
        BIO_printf(bio_err," -msg          - Show protocol messages\n");
        BIO_printf(bio_err," -nbio_test    - more ssl protocol testing\n");
        BIO_printf(bio_err," -state        - print the 'ssl' states\n");
@@ -348,6 +351,10 @@ int MAIN(int argc, char **argv)
                        c_Pause=1;
                else if (strcmp(*argv,"-debug") == 0)
                        c_debug=1;
+#ifdef WATT32
+               else if (strcmp(*argv,"-wdebug") == 0)
+                       dbug_init();
+#endif
                else if (strcmp(*argv,"-msg") == 0)
                        c_msg=1;
                else if (strcmp(*argv,"-showcerts") == 0)

diff --git a/apps/s_socket.c b/apps/s_socket.c
index 1867890966f62f3e887221548ff65ed4396fcbd3..9c441b02001a96e2aae4167d07319a2387b1fb1d 100644 (file)
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -153,7 +153,6 @@ static int ssl_sock_init(void)
 #ifdef WATT32
        extern int _watt_do_exit;
        _watt_do_exit = 0;
-       dbug_init();
        if (sock_init())
                return (0);
 #elif defined(OPENSSL_SYS_WINDOWS)

diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
index 0599719dd1d064ada8e46d2b913926e36d166d27..f5165f1326af9a67980b79e9256ba97f97645a50 100644 (file)
--- a/crypto/rand/rand_unix.c
+++ b/crypto/rand/rand_unix.c
@@ -167,7 +167,13 @@ int RAND_poll(void)
 
        for (randomfile = randomfiles; *randomfile && n < ENTROPY_NEEDED; randomfile++)
                {
-               if ((fd = open(*randomfile, O_RDONLY|O_NONBLOCK
+               if ((fd = open(*randomfile, O_RDONLY
+#ifdef O_NONBLOCK
+                       |O_NONBLOCK
+#endif
+#ifdef O_BINARY
+                       |O_BINARY
+#endif
 #ifdef O_NOCTTY /* If it happens to be a TTY (god forbid), do not make it
                   our controlling tty */
                        |O_NOCTTY

diff --git a/fips/openssl_fips_fingerprint b/fips/openssl_fips_fingerprint
index 285ddc07ac59de5977ba56034d2e8aaa8f67f7b8..d3dfb7eb61efb57da45736f072b002ef45bb2769 100755 (executable)
--- a/fips/openssl_fips_fingerprint
+++ b/fips/openssl_fips_fingerprint
@@ -11,7 +11,11 @@ exe=$2
 # case shared libraries are built.
 if [ "X$TOP" != "X" ]
 then
-    PATH="$TOP/apps:$TOP:$PATH"
+    if test "$OSTYPE" = msdosdjgpp; then
+       PATH="$TOP/apps;$TOP;$PATH"
+    else
+       PATH="$TOP/apps:$TOP:$PATH"
+    fi
     LD_LIBRARY_PATH=$TOP; export LD_LIBRARY_PATH
 else
     LD_LIBRARY_PATH=.; export LD_LIBRARY_PATH