diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-01-04 10:28:38 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-01-04 10:28:38 +0000 |
| commit | 02a00bb054d81110fdf5dadfee71d01710efcbfc (patch) | |
| tree | 5ee57138bc30c491778a1562447e24faea55f7bb | |
| parent | 3b4de6e4cc91516f799849307be1204f6b5f2f4a (diff) | |
| download | openssl-new-02a00bb054d81110fdf5dadfee71d01710efcbfc.tar.gz | |
DJGPP update.
PR: 989
Submitted by: Doug Kaufman
| -rwxr-xr-x | Configure | 3 | ||||
| -rw-r--r-- | TABLE | 2 | ||||
| -rw-r--r-- | apps/s_client.c | 7 | ||||
| -rw-r--r-- | apps/s_socket.c | 1 | ||||
| -rw-r--r-- | crypto/rand/rand_unix.c | 8 |
5 files changed, 16 insertions, 5 deletions
@@ -502,7 +502,7 @@ my %table=( "netware-libc-gcc", "i586-netware-gcc:-nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYSNAME_NETWARE -DTERMIO -O2 -Wall::::${x86_gcc_opts}:::", # 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}:${x86_out_asm}:", +"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}:${x86_out_asm}:", # Ultrix from Bernhard Simon <simon@zid.tuwien.ac.at> "ultrix-cc","cc:-std1 -O -Olimit 2500 -DL_ENDIAN::(unknown):::::::", @@ -1540,7 +1540,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) { @@ -137,7 +137,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 c1fcd9d97f..2f233da177 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -200,6 +200,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"); @@ -360,6 +363,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 28c6b1e27a..45014fa14d 100644 --- a/apps/s_socket.c +++ b/apps/s_socket.c @@ -172,7 +172,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 d2fdb35b56..abdab862e2 100644 --- a/crypto/rand/rand_unix.c +++ b/crypto/rand/rand_unix.c @@ -168,7 +168,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 |