diff options
| author | Richard Levitte <levitte@openssl.org> | 2002-10-09 13:40:48 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2002-10-09 13:40:48 +0000 |
| commit | 6a89a25c27df0677e78567cd02c77f30e80814af (patch) | |
| tree | 9c29d0eea93980a2a854e639852ed601f712a6e0 /crypto/conf | |
| parent | 001ab3abad45752c13af5396a47551f46a6ebfdb (diff) | |
Add a few more VxWorks targets.
Correct misspelled VXWORKS macros.
Add VXWORKS identifying macros to e_os2.h.
Add required inclusions and mappings for VxWorks in e_os.h.
A few small modifications to make OpenSSL build and work on VxWorks.
PR: 253, except for the change that was handled in an earlier
commit, and a request for easy build of just parts of OpenSSL.
Diffstat (limited to 'crypto/conf')
| -rw-r--r-- | crypto/conf/conf_def.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index 5e194de60e..80ac97526d 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -208,7 +208,8 @@ static int def_load(CONF *conf, const char *name, long *line) static int def_load_bio(CONF *conf, BIO *in, long *line) { -#define BUFSIZE 512 +/* The macro BUFSIZE conflicts with a system macro in VxWorks */ +#define CONFBUFSIZE 512 int bufnum=0,i,ii; BUF_MEM *buff=NULL; char *s,*p,*end; @@ -255,15 +256,15 @@ static int def_load_bio(CONF *conf, BIO *in, long *line) for (;;) { again=0; - if (!BUF_MEM_grow(buff,bufnum+BUFSIZE)) + if (!BUF_MEM_grow(buff,bufnum+CONFBUFSIZE)) { CONFerr(CONF_F_CONF_LOAD_BIO,ERR_R_BUF_LIB); goto err; } p= &(buff->data[bufnum]); *p='\0'; - BIO_gets(in, p, BUFSIZE-1); - p[BUFSIZE-1]='\0'; + BIO_gets(in, p, CONFBUFSIZE-1); + p[CONFBUFSIZE-1]='\0'; ii=i=strlen(p); if (i == 0) break; while (i > 0) |