wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DJGPP update.

Browse source 
PR: 989
Submitted by: Doug Kaufman
This commit is contained in:
Andy Polyakov 2005-01-04 10:21:55 +00:00
parent 76d088046c
commit b58560b915
6 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Configure
View file

@ -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", "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
"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 from Bernhard Simon <simon@zid.tuwien.ac.at>
"ultrix-cc","cc:-std1 -O -Olimit 2500 -DL_ENDIAN::(unknown):::::::", "ultrix-cc","cc:-std1 -O -Olimit 2500 -DL_ENDIAN::(unknown):::::::",
@ -1535,7 +1535,6 @@ EOF
} else { } else {
# No path for Perl known ... # No path for Perl known ...
&dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";'); &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'); &dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s');
} }
if ($depflags ne "" && !$make_depend) { if ($depflags ne "" && !$make_depend) {

2
TABLE
View file

@ -127,7 +127,7 @@ $arflags =
*** DJGPP *** DJGPP
$cc = gcc $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 = $unistd =
$thread_cflag = $thread_cflag =
$sys_id = MSDOS $sys_id = MSDOS

7
apps/s_client.c
View file

@ -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," -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," -showcerts - show all certificates in the chain\n");
BIO_printf(bio_err," -debug - extra output\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," -msg - Show protocol messages\n");
BIO_printf(bio_err," -nbio_test - more ssl protocol testing\n"); BIO_printf(bio_err," -nbio_test - more ssl protocol testing\n");
BIO_printf(bio_err," -state - print the 'ssl' states\n"); BIO_printf(bio_err," -state - print the 'ssl' states\n");
@ -348,6 +351,10 @@ int MAIN(int argc, char **argv)
c_Pause=1; c_Pause=1;
else if (strcmp(*argv,"-debug") == 0) else if (strcmp(*argv,"-debug") == 0)
c_debug=1; c_debug=1;
#ifdef WATT32
else if (strcmp(*argv,"-wdebug") == 0)
dbug_init();
#endif
else if (strcmp(*argv,"-msg") == 0) else if (strcmp(*argv,"-msg") == 0)
c_msg=1; c_msg=1;
else if (strcmp(*argv,"-showcerts") == 0) else if (strcmp(*argv,"-showcerts") == 0)

1
apps/s_socket.c
View file

@ -153,7 +153,6 @@ static int ssl_sock_init(void)
#ifdef WATT32 #ifdef WATT32
extern int _watt_do_exit; extern int _watt_do_exit;
_watt_do_exit = 0; _watt_do_exit = 0;
dbug_init();
if (sock_init()) if (sock_init())
return (0); return (0);
#elif defined(OPENSSL_SYS_WINDOWS) #elif defined(OPENSSL_SYS_WINDOWS)

8
crypto/rand/rand_unix.c
View file

@ -167,7 +167,13 @@ int RAND_poll(void)
for (randomfile = randomfiles; *randomfile && n < ENTROPY_NEEDED; randomfile++) 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 #ifdef O_NOCTTY /* If it happens to be a TTY (god forbid), do not make it
our controlling tty */ our controlling tty */
|O_NOCTTY |O_NOCTTY

4
fips/openssl_fips_fingerprint
View file

@ -11,7 +11,11 @@ exe=$2
# case shared libraries are built. # case shared libraries are built.
if [ "X$TOP" != "X" ] if [ "X$TOP" != "X" ]
then then
if test "$OSTYPE" = msdosdjgpp; then
PATH="$TOP/apps;$TOP;$PATH"
else
PATH="$TOP/apps:$TOP:$PATH" PATH="$TOP/apps:$TOP:$PATH"
fi
LD_LIBRARY_PATH=$TOP; export LD_LIBRARY_PATH LD_LIBRARY_PATH=$TOP; export LD_LIBRARY_PATH
else else
LD_LIBRARY_PATH=.; export LD_LIBRARY_PATH LD_LIBRARY_PATH=.; export LD_LIBRARY_PATH