diff options
| author | Richard Levitte <levitte@openssl.org> | 2002-11-14 11:22:01 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2002-11-14 11:22:01 +0000 |
| commit | 8d6e60486f3682e31830b11b7188038d6a85871f (patch) | |
| tree | 36ef841ad4d56b06c04a6adba6b001a209ac98c9 /crypto | |
| parent | 1f30946481f460d68345460f1280af6e0b1d27cd (diff) | |
Fix to build better with DJGPP.
PR: 338
Here's the description, submitted by Gisle Vanem <giva@bgnett.no>:
1. sock_init() renamed to ssl_sock_init() in ./apps/s_socket.c due
to name-clash with Watt-32.
2. rand() renamed to Rand() in ./crypto/bn/divtest.c due to name-clash
with <stdlib.h>
3. Added calls to dbug_init()/sock_init() in some demo programs.
4. Changed cflags/lflags in configure. Watt-32 install root now taken
from $WATT_ROOT.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/bio/b_sock.c | 6 | ||||
| -rw-r--r-- | crypto/bio/bss_log.c | 8 | ||||
| -rw-r--r-- | crypto/bio/bss_sock.c | 6 | ||||
| -rw-r--r-- | crypto/bn/divtest.c | 6 |
4 files changed, 21 insertions, 5 deletions
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index 3188bcc69c..a7da258101 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -467,6 +467,12 @@ int BIO_sock_init(void) } } #endif /* OPENSSL_SYS_WINDOWS */ +#ifdef WATT32 + extern int _watt_do_exit; + _watt_do_exit = 0; /* don't make sock_init() call exit() */ + if (sock_init()) + return (-1); +#endif return(1); } diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c index 901b64f3ae..5341812672 100644 --- a/crypto/bio/bss_log.c +++ b/crypto/bio/bss_log.c @@ -77,7 +77,7 @@ # include <starlet.h> #elif defined(__ultrix) # include <sys/syslog.h> -#elif !defined(MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && !defined(NO_SYSLOG) /* Unix */ +#elif (!defined(MSDOS) || defined(WATT32)) && !defined(OPENSSL_SYS_VXWORKS) && !defined(NO_SYSLOG) # include <syslog.h> #endif @@ -373,11 +373,15 @@ static void xcloselog(BIO* bp) { } -#else /* Unix */ +#else /* Unix/Watt32 */ static void xopenlog(BIO* bp, char* name, int level) { +#ifdef WATT32 /* djgpp/DOS */ + openlog(name, LOG_PID|LOG_CONS|LOG_NDELAY, level); +#else openlog(name, LOG_PID|LOG_CONS, level); +#endif } static void xsyslog(BIO *bp, int priority, const char *string) diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c index fdabd16d7e..2c1c405ec7 100644 --- a/crypto/bio/bss_sock.c +++ b/crypto/bio/bss_sock.c @@ -64,6 +64,12 @@ #include "cryptlib.h" #include <openssl/bio.h> +#ifdef WATT32 +#define sock_write SockWrite /* Watt-32 uses same names */ +#define sock_read SockRead +#define sock_puts SockPuts +#endif + static int sock_write(BIO *h, const char *buf, int num); static int sock_read(BIO *h, char *buf, int size); static int sock_puts(BIO *h, const char *str); diff --git a/crypto/bn/divtest.c b/crypto/bn/divtest.c index 13ba86e3c4..d3fc688f33 100644 --- a/crypto/bn/divtest.c +++ b/crypto/bn/divtest.c @@ -1,7 +1,7 @@ #include <openssl/bn.h> #include <openssl/rand.h> -static int rand(n) +static int Rand(n) { unsigned char x[2]; RAND_pseudo_bytes(x,2); @@ -26,8 +26,8 @@ main() BN_CTX *ctx=BN_CTX_new(); for(;;) { - BN_pseudo_rand(a,rand(),0,0); - BN_pseudo_rand(b,rand(),0,0); + BN_pseudo_rand(a,Rand(),0,0); + BN_pseudo_rand(b,Rand(),0,0); if (BN_is_zero(b)) continue; BN_RECP_CTX_set(recp,b,ctx); |