From b58560b915963fff647159d037e879cac626c9f2 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Tue, 4 Jan 2005 10:21:55 +0000 Subject: [PATCH] DJGPP update. PR: 989 Submitted by: Doug Kaufman --- Configure | 3 +-- TABLE | 2 +- apps/s_client.c | 7 +++++++ apps/s_socket.c | 1 - crypto/rand/rand_unix.c | 8 +++++++- fips/openssl_fips_fingerprint | 6 +++++- 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Configure b/Configure index e284418d02..e89e432791 100755 --- 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 "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 282b6369c2..29c47c5c3b 100644 --- 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 eb6fd7c1c3..af8cb1a3f0 100644 --- 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 1867890966..9c441b0200 100644 --- 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 0599719dd1..f5165f1326 100644 --- 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 285ddc07ac..d3dfb7eb61 100755 --- 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 -- 2.25.1