From: Richard Levitte Date: Tue, 26 Feb 2002 13:41:19 +0000 (+0000) Subject: Merge from 0.9.6-stable. X-Git-Tag: OpenSSL-engine-0_9_6d-beta1~25 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b435c38af23e278d5ca9df54f50fdc6e98e86a90;p=openssl Merge from 0.9.6-stable. --- diff --git a/Configure b/Configure index 7b9a8241c2..b14356c0af 100755 --- a/Configure +++ b/Configure @@ -182,7 +182,7 @@ my %table=( "linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o::::", # it's a real mess with -mcpu=ultrasparc option under Linux, but # -Wa,-Av8plus should do the trick no matter what. -"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o:", +"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # !!!Folowing can't be even tested yet!!! # We have to wait till 64-bit glibc for SPARC is operational!!! #"linux64-sparcv9","sparc64-linux-gcc:-m64 -mcpu=v9 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::asm/md5-sparcv9.o:", @@ -500,6 +500,9 @@ my %table=( ##### Sony NEWS-OS 4.x "newsos4-gcc","gcc:-O -DB_ENDIAN -DNEWS4::(unknown):-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::", +##### VxWorks for various targets +"vxworks-ppc405","ccppc:-g -msoft-float -mlongcall -DVXWORKS -DCPU=PPC405 -I\$(WIND_BASE)/target/h:::-r:::::", + ); my @WinTargets=qw(VC-NT VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS BC-32 diff --git a/INSTALL.W32 b/INSTALL.W32 index c01ef579bd..fa5fcafba1 100644 --- a/INSTALL.W32 +++ b/INSTALL.W32 @@ -6,15 +6,15 @@ of this is tested on Win32 but it may also work in Win 3.1 with some modification. - You need Perl for Win32. Unless you will build on CygWin32, you will need + You need Perl for Win32. Unless you will build on Cygwin, you will need ActiveState Perl, available from http://www.activestate.com/ActivePerl. - For CygWin32 users, there's more info in the CygWin32 section. + For Cygwin users, there's more info in the Cygwin section. and one of the following C compilers: * Visual C++ * Borland C - * GNU C (Mingw32 or Cygwin32) + * GNU C (Mingw32 or Cygwin) If you want to compile in the assembly language routines with Visual C++ then you will need an assembler. This is worth doing because it will result in @@ -137,30 +137,30 @@ > cd out > ..\ms\test - GNU C (CygWin32) - --------------- + GNU C (Cygwin) + -------------- - CygWin32 provides a bash shell and GNU tools environment running on + Cygwin provides a bash shell and GNU tools environment running on NT 4.0, Windows 9x and Windows 2000. Consequently, a make of OpenSSL - with CygWin is closer to a GNU bash environment such as Linux rather + with Cygwin is closer to a GNU bash environment such as Linux rather than other W32 makes that are based on a single makefile approach. - CygWin32 implements Posix/Unix calls through cygwin1.dll, and is + Cygwin implements Posix/Unix calls through cygwin1.dll, and is contrasted to Mingw32 which links dynamically to msvcrt.dll or crtdll.dll. - To build OpenSSL using CygWin32: + To build OpenSSL using Cygwin: - * Install CygWin32 (see http://sourceware.cygnus.com/cygwin) + * Install Cygwin (see http://sourceware.cygnus.com/cygwin) * Install Perl and ensure it is in the path (recent Cygwin perl (version 5.6.1-2 of the latter has been reported to work) or ActivePerl) - * Run the CygWin bash shell + * Run the Cygwin bash shell * $ tar zxvf openssl-x.x.x.tar.gz $ cd openssl-x.x.x - $ ./Configure no-threads CygWin32 + $ ./config [...] $ make [...] @@ -169,26 +169,26 @@ This will create a default install in /usr/local/ssl. - CygWin32 Notes: + Cygwin Notes: "make test" and normal file operations may fail in directories - mounted as text (i.e. mount -t c:\somewhere /home) due to CygWin + mounted as text (i.e. mount -t c:\somewhere /home) due to Cygwin stripping of carriage returns. To avoid this ensure that a binary mount is used, e.g. mount -b c:\somewhere /home. - As of version 1.1.1 CygWin32 is relatively unstable in its handling + As of version 1.1.1 Cygwin is relatively unstable in its handling of cr/lf issues. These make procedures succeeded with versions 1.1 and the snapshot 20000524 (Slow!). - "bc" is not provided in the CygWin32 distribution. This causes a + "bc" is not provided in the Cygwin distribution. This causes a non-fatal error in "make test" but is otherwise harmless. If - desired, GNU bc can be built with CygWin32 without change. + desired, GNU bc can be built with Cygwin without change. Installation ------------ - If you used the CygWin procedure above, you have already installed and + If you used the Cygwin procedure above, you have already installed and can skip this section. For all other procedures, there's currently no real installation procedure for Win32. There are, however, some suggestions: diff --git a/STATUS b/STATUS index b24a7f8f65..2c7f5c9d67 100644 --- a/STATUS +++ b/STATUS @@ -1,6 +1,6 @@ OpenSSL STATUS Last modified at - ______________ $Date: 2001/12/21 03:23:29 $ + ______________ $Date: 2002/02/26 13:41:15 $ DEVELOPMENT STATE @@ -48,10 +48,6 @@ o apps/ca.c: "Sign the certificate?" - "n" creates empty certificate file - o OpenSSL_0_9_6-stable: - #include in exported header files is illegal since - e_os.h is suitable only for library-internal use. - o Whenever strncpy is used, make sure the resulting string is NULL-terminated or an error is reported diff --git a/apps/ca.c b/apps/ca.c index f3fb45b7b4..7924f6e0cf 100644 --- a/apps/ca.c +++ b/apps/ca.c @@ -83,7 +83,7 @@ # else # include # endif -# else +# elif !defined(VXWORKS) # include # endif #endif diff --git a/apps/s_time.c b/apps/s_time.c index d84fe11a3a..2d8e2b24d2 100644 --- a/apps/s_time.c +++ b/apps/s_time.c @@ -82,7 +82,7 @@ #include "wintext.h" #endif -#if !defined(MSDOS) && (!defined(VMS) || defined(__DECC)) || defined (_DARWIN) +#if !defined(MSDOS) && !defined(VXWORKS) && (!defined(VMS) || defined(__DECC)) || defined (_DARWIN) #define TIMES #endif @@ -102,7 +102,7 @@ #undef TIMES #endif -#ifndef TIMES +#if !defined(TIMES) && !defined(VXWORKS) #include #endif @@ -139,6 +139,8 @@ #undef BUFSIZZ #define BUFSIZZ 1024*10 +#undef min +#undef max #define min(a,b) (((a) < (b)) ? (a) : (b)) #define max(a,b) (((a) > (b)) ? (a) : (b)) @@ -368,6 +370,22 @@ static double tm_Time_F(int s) ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ; return((ret == 0.0)?1e-6:ret); } +#elif defined(VXWORKS) + { + static unsigned long tick_start, tick_end; + + if( s == START ) + { + tick_start = tickGet(); + return 0; + } + else + { + tick_end = tickGet(); + ret = (double)(tick_end - tick_start) / (double)sysClkRateGet(); + return((ret == 0.0)?1e-6:ret); + } + } #else /* !times() */ static struct timeb tstart,tend; long i; diff --git a/apps/speed.c b/apps/speed.c index b38b5c4332..be7bebab7a 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -85,10 +85,10 @@ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(_DARWIN) # define USE_TOD -#elif !defined(MSDOS) && (!defined(VMS) || defined(__DECC)) +#elif !defined(MSDOS) && !defined(VXWORKS) && (!defined(VMS) || defined(__DECC)) # define TIMES #endif -#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(MPE) && !defined(__NetBSD__) && !defined(_DARWIN) +#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(MPE) && !defined(__NetBSD__) && !defined(_DARWIN) && !defined(VXWORKS) # define TIMEB #endif @@ -116,7 +116,7 @@ #include #endif -#if !defined(TIMES) && !defined(TIMEB) && !defined(USE_TOD) +#if !defined(TIMES) && !defined(TIMEB) && !defined(USE_TOD) && !defined(VXWORKS) #error "It seems neither struct tms nor struct timeb is supported in this platform!" #endif @@ -225,7 +225,7 @@ static double Time_F(int s, int usertime) #ifdef USE_TOD if(usertime) - { + { static struct rusage tstart,tend; if (s == START) @@ -285,7 +285,23 @@ static double Time_F(int s, int usertime) # if defined(TIMES) && defined(TIMEB) else # endif -# ifdef TIMEB +# ifdef VXWORKS + { + static unsigned long tick_start, tick_end; + + if( s == START ) + { + tick_start = tickGet(); + return 0; + } + else + { + tick_end = tickGet(); + ret = (double)(tick_end - tick_start) / (double)sysClkRateGet(); + return((ret < 0.001)?0.001:ret); + } + } +# elif defined(TIMEB) { static struct timeb tstart,tend; long i; @@ -304,6 +320,7 @@ static double Time_F(int s, int usertime) } } # endif + #endif } diff --git a/crypto/bio/bf_lbuf.c b/crypto/bio/bf_lbuf.c index 7bcf8ed941..ec0f7eb0b7 100644 --- a/crypto/bio/bf_lbuf.c +++ b/crypto/bio/bf_lbuf.c @@ -200,7 +200,7 @@ static int linebuffer_write(BIO *b, const char *in, int inl) } } -#ifdef DEBUG +#if 0 BIO_write(b->next_bio, "<*<", 3); #endif i=BIO_write(b->next_bio, @@ -210,13 +210,13 @@ BIO_write(b->next_bio, "<*<", 3); ctx->obuf_len = orig_olen; BIO_copy_next_retry(b); -#ifdef DEBUG +#if 0 BIO_write(b->next_bio, ">*>", 3); #endif if (i < 0) return((num > 0)?num:i); if (i == 0) return(num); } -#ifdef DEBUG +#if 0 BIO_write(b->next_bio, ">*>", 3); #endif if (i < ctx->obuf_len) @@ -229,20 +229,20 @@ BIO_write(b->next_bio, ">*>", 3); buffer if a NL was found and there is anything to write. */ if ((foundnl || p - in > ctx->obuf_size) && p - in > 0) { -#ifdef DEBUG +#if 0 BIO_write(b->next_bio, "<*<", 3); #endif i=BIO_write(b->next_bio,in,p - in); if (i <= 0) { BIO_copy_next_retry(b); -#ifdef DEBUG +#if 0 BIO_write(b->next_bio, ">*>", 3); #endif if (i < 0) return((num > 0)?num:i); if (i == 0) return(num); } -#ifdef DEBUG +#if 0 BIO_write(b->next_bio, ">*>", 3); #endif num+=i; diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c index 4614ad44dd..32afea95a6 100644 --- a/crypto/bio/bss_bio.c +++ b/crypto/bio/bss_bio.c @@ -23,8 +23,13 @@ #include #include "openssl/e_os.h" -#ifndef SSIZE_MAX + +/* VxWorks defines SSiZE_MAX with an empty value causing compile errors */ +#if defined(VXWORKS) +# undef SSIZE_MAX # define SSIZE_MAX INT_MAX +#elif !defined(SSIZE_MAX) +# define SSIZE_MAX _INT_MAX #endif static int bio_new(BIO *bio); diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c index 1edf16a76f..7ba2acad43 100644 --- a/crypto/bio/bss_log.c +++ b/crypto/bio/bss_log.c @@ -75,7 +75,7 @@ # include #elif defined(__ultrix) # include -#elif !defined(MSDOS) /* Unix */ +#elif !defined(MSDOS) && !defined(VXWORKS) /* Unix */ # include #endif diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h index 31e4005f3d..3ae9803c17 100644 --- a/crypto/conf/conf.h +++ b/crypto/conf/conf.h @@ -56,14 +56,13 @@ * [including the GNU Public Licence.] */ -#ifndef HEADER_CONF_H +#ifndef HEADER_CONF_H #define HEADER_CONF_H #include #include #include #include -#include #ifdef __cplusplus extern "C" { @@ -86,14 +85,14 @@ typedef struct conf_method_st CONF_METHOD; struct conf_method_st { const char *name; - CONF *(MS_FAR *create)(CONF_METHOD *meth); - int (MS_FAR *init)(CONF *conf); - int (MS_FAR *destroy)(CONF *conf); - int (MS_FAR *destroy_data)(CONF *conf); - int (MS_FAR *load)(CONF *conf, BIO *bp, long *eline); - int (MS_FAR *dump)(CONF *conf, BIO *bp); - int (MS_FAR *is_number)(CONF *conf, char c); - int (MS_FAR *to_int)(CONF *conf, char c); + CONF *(*create)(CONF_METHOD *meth); + int (*init)(CONF *conf); + int (*destroy)(CONF *conf); + int (*destroy_data)(CONF *conf); + int (*load)(CONF *conf, BIO *bp, long *eline); + int (*dump)(CONF *conf, BIO *bp); + int (*is_number)(CONF *conf, char c); + int (*to_int)(CONF *conf, char c); }; int CONF_set_default_method(CONF_METHOD *meth); diff --git a/crypto/des/read_pwd.c b/crypto/des/read_pwd.c index c27ec336e7..cba52cad78 100644 --- a/crypto/des/read_pwd.c +++ b/crypto/des/read_pwd.c @@ -56,7 +56,7 @@ * [including the GNU Public Licence.] */ -#if !defined(MSDOS) && !defined(VMS) && !defined(WIN32) +#if !defined(MSDOS) && !defined(VMS) && !defined(WIN32) && !defined(VXWORKS) #include #ifdef OPENSSL_UNISTD # include OPENSSL_UNISTD @@ -133,6 +133,12 @@ #define SGTTY #endif +#if defined(VXWORKS) +#undef TERMIOS +#undef TERMIO +#undef SGTTY +#endif + #ifdef TERMIOS #include #define TTY_STRUCT struct termios @@ -240,7 +246,7 @@ int des_read_pw(char *buf, char *buff, int size, const char *prompt, long status; unsigned short channel = 0; #else -#ifndef MSDOS +#if !defined(MSDOS) && !defined(VXWORKS) TTY_STRUCT tty_orig,tty_new; #endif #endif @@ -268,7 +274,7 @@ int des_read_pw(char *buf, char *buff, int size, const char *prompt, #ifdef MSDOS if ((tty=fopen("con","r")) == NULL) tty=stdin; -#elif defined(MAC_OS_pre_X) +#elif defined(MAC_OS_pre_X) || defined(VXWORKS) tty=stdin; #else #ifndef MPE @@ -366,7 +372,7 @@ int des_read_pw(char *buf, char *buff, int size, const char *prompt, error: fprintf(stderr,"\n"); -#ifdef DEBUG +#if 0 perror("fgets(tty)"); #endif /* What can we do if there is an error? */ diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c index f1694f1125..98a8510e15 100644 --- a/crypto/pem/pem_info.c +++ b/crypto/pem/pem_info.c @@ -326,7 +326,7 @@ int PEM_X509_INFO_write_bio(BIO *bp, X509_INFO *xi, EVP_CIPHER *enc, /* create the right magic header stuff */ buf[0]='\0'; PEM_proc_type(buf,PEM_TYPE_ENCRYPTED); - PEM_dek_info(buf,objstr,8,(char *)iv); + PEM_dek_info(buf,objstr,enc->iv_len,(char *)iv); /* use the normal code to write things out */ i=PEM_write_bio(bp,PEM_STRING_RSA,buf,data,i); diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c index a17c3ed57f..e00af7c018 100644 --- a/crypto/pem/pem_lib.c +++ b/crypto/pem/pem_lib.c @@ -373,7 +373,7 @@ int PEM_ASN1_write_bio(int (*i2d)(), const char *name, BIO *bp, char *x, kstr=(unsigned char *)buf; } RAND_add(data,i,0);/* put in the RSA key. */ - if (RAND_pseudo_bytes(iv,8) < 0) /* Generate a salt */ + if (RAND_pseudo_bytes(iv,enc->iv_len) < 0) /* Generate a salt */ goto err; /* The 'iv' is used as the iv and as a salt. It is * NOT taken from the BytesToKey function */ @@ -383,7 +383,7 @@ int PEM_ASN1_write_bio(int (*i2d)(), const char *name, BIO *bp, char *x, buf[0]='\0'; PEM_proc_type(buf,PEM_TYPE_ENCRYPTED); - PEM_dek_info(buf,objstr,8,(char *)iv); + PEM_dek_info(buf,objstr,enc->iv_len,(char *)iv); /* k=strlen(buf); */ EVP_EncryptInit(&ctx,enc,key,iv); @@ -506,7 +506,7 @@ int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher) PEMerr(PEM_F_PEM_GET_EVP_CIPHER_INFO,PEM_R_UNSUPPORTED_ENCRYPTION); return(0); } - if (!load_iv((unsigned char **)&header,&(cipher->iv[0]),8)) return(0); + if (!load_iv((unsigned char **)&header,&(cipher->iv[0]),enc->iv_len)) return(0); return(1); } diff --git a/crypto/rand/rand_egd.c b/crypto/rand/rand_egd.c index 79b5e6fa57..a6601696ad 100644 --- a/crypto/rand/rand_egd.c +++ b/crypto/rand/rand_egd.c @@ -75,7 +75,11 @@ int RAND_egd_bytes(const char *path,int bytes) #include #include #ifndef NO_SYS_UN_H -#include +# ifdef VXWORKS +# include +# else +# include +# endif #else struct sockaddr_un { short sun_family; /* AF_UNIX */ diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c index 3d137badd0..2b4b1446ed 100644 --- a/crypto/rand/rand_win.c +++ b/crypto/rand/rand_win.c @@ -311,7 +311,7 @@ int RAND_poll(void) if (gen(hProvider, sizeof(buf), buf) != 0) { RAND_add(buf, sizeof(buf), sizeof(buf)); -#ifdef DEBUG +#if 0 printf("randomness from PROV_RSA_FULL\n"); #endif } @@ -324,7 +324,7 @@ int RAND_poll(void) if (gen(hProvider, sizeof(buf), buf) != 0) { RAND_add(buf, sizeof(buf), sizeof(buf)); -#ifdef DEBUG +#if 0 printf("randomness from PROV_INTEL_SEC\n"); #endif } @@ -510,7 +510,7 @@ int RAND_poll(void) FreeLibrary(kernel); } -#ifdef DEBUG +#if 0 printf("Exiting RAND_poll\n"); #endif diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h index 3b2f468e69..a144c4f7df 100644 --- a/crypto/rsa/rsa.h +++ b/crypto/rsa/rsa.h @@ -101,9 +101,14 @@ typedef struct rsa_meth_st * compatibility this functionality is only enabled if the RSA_FLAG_SIGN_VER * option is set in 'flags'. */ - int (*rsa_sign)(int type, unsigned char *m, unsigned int m_len, + +/* changed m_len to m_length to avoid a conflict with a #define in + vxworks for m_len for the mbuf code. This only shows up in apps + that have USE_SOCKETS defined */ + + int (*rsa_sign)(int type, unsigned char *m, unsigned int m_length, unsigned char *sigret, unsigned int *siglen, RSA *rsa); - int (*rsa_verify)(int dtype, unsigned char *m, unsigned int m_len, + int (*rsa_verify)(int dtype, unsigned char *m, unsigned int m_length, unsigned char *sigbuf, unsigned int siglen, RSA *rsa); } RSA_METHOD; @@ -238,16 +243,16 @@ RSA *d2i_Netscape_RSA_2(RSA **a, unsigned char **pp, long length, int (*cb)()); /* The following 2 functions sign and verify a X509_SIG ASN1 object * inside PKCS#1 padded RSA encryption */ -int RSA_sign(int type, unsigned char *m, unsigned int m_len, +int RSA_sign(int type, unsigned char *m, unsigned int m_length, unsigned char *sigret, unsigned int *siglen, RSA *rsa); -int RSA_verify(int type, unsigned char *m, unsigned int m_len, +int RSA_verify(int type, unsigned char *m, unsigned int m_length, unsigned char *sigbuf, unsigned int siglen, RSA *rsa); /* The following 2 function sign and verify a ASN1_OCTET_STRING * object inside PKCS#1 padded RSA encryption */ -int RSA_sign_ASN1_OCTET_STRING(int type, unsigned char *m, unsigned int m_len, +int RSA_sign_ASN1_OCTET_STRING(int type, unsigned char *m, unsigned int m_length, unsigned char *sigret, unsigned int *siglen, RSA *rsa); -int RSA_verify_ASN1_OCTET_STRING(int type, unsigned char *m, unsigned int m_len, +int RSA_verify_ASN1_OCTET_STRING(int type, unsigned char *m, unsigned int m_length, unsigned char *sigbuf, unsigned int siglen, RSA *rsa); int RSA_blinding_on(RSA *rsa, BN_CTX *ctx); diff --git a/crypto/tmdiff.c b/crypto/tmdiff.c index 7773928666..a10251a2ae 100644 --- a/crypto/tmdiff.c +++ b/crypto/tmdiff.c @@ -67,9 +67,11 @@ #ifndef MSDOS # ifndef WIN32 +# ifndef VXWORKS # if !defined(VMS) || defined(__DECC) # define TIMES # endif +# endif # endif #endif @@ -95,7 +97,7 @@ #include #endif -#ifndef TIMES +#if !defined(TIMES) && !defined(VXWORKS) #include #endif @@ -125,7 +127,11 @@ typedef struct ms_tm HANDLE thread_id; FILETIME ms_win32; # else +# ifdef VXWORKS + unsigned long ticks; +# else struct timeb ms_timeb; +# endif # endif #endif } MS_TM; @@ -163,7 +169,11 @@ void ms_time_get(char *a) # ifdef WIN32 GetThreadTimes(tm->thread_id,&tmpa,&tmpb,&tmpc,&(tm->ms_win32)); # else +# ifdef VXWORKS + tm->ticks = tickGet(); +# else ftime(&tm->ms_timeb); +# endif # endif #endif } @@ -193,10 +203,14 @@ double ms_time_diff(char *ap, char *bp) ret=((double)(lb-la))/1e7; } # else +# ifdef VXWORKS + ret = (double)(b->ticks - a->ticks) / (double)sysClkRateGet(); +# else ret= (double)(b->ms_timeb.time-a->ms_timeb.time)+ (((double)b->ms_timeb.millitm)- ((double)a->ms_timeb.millitm))/1000.0; # endif +# endif #endif return((ret < 0.0000001)?0.0000001:ret); } @@ -214,6 +228,9 @@ int ms_time_cmp(char *ap, char *bp) d =(b->ms_win32.dwHighDateTime&0x000fffff)*10+b->ms_win32.dwLowDateTime/1e7; d-=(a->ms_win32.dwHighDateTime&0x000fffff)*10+a->ms_win32.dwLowDateTime/1e7; # else +# ifdef VXWORKS + d = (b->ticks - a->ticks); +# else d= (double)(b->ms_timeb.time-a->ms_timeb.time)+ (((double)b->ms_timeb.millitm)-(double)a->ms_timeb.millitm)/1000.0; # endif diff --git a/crypto/x509v3/v3_utl.c b/crypto/x509v3/v3_utl.c index 619f161b58..7747da208a 100644 --- a/crypto/x509v3/v3_utl.c +++ b/crypto/x509v3/v3_utl.c @@ -250,7 +250,7 @@ STACK_OF(CONF_VALUE) *X509V3_parse_list(char *line) *p = 0; ntmp = strip_spaces(q); q = p + 1; -#ifdef DEBUG +#if 0 printf("%s\n", ntmp); #endif if(!ntmp) { @@ -266,7 +266,7 @@ STACK_OF(CONF_VALUE) *X509V3_parse_list(char *line) state = HDR_NAME; *p = 0; vtmp = strip_spaces(q); -#ifdef DEBUG +#if 0 printf("%s\n", ntmp); #endif if(!vtmp) { @@ -283,7 +283,7 @@ STACK_OF(CONF_VALUE) *X509V3_parse_list(char *line) if(state == HDR_VALUE) { vtmp = strip_spaces(q); -#ifdef DEBUG +#if 0 printf("%s=%s\n", ntmp, vtmp); #endif if(!vtmp) { @@ -293,7 +293,7 @@ STACK_OF(CONF_VALUE) *X509V3_parse_list(char *line) X509V3_add_value(ntmp, vtmp, &values); } else { ntmp = strip_spaces(q); -#ifdef DEBUG +#if 0 printf("%s\n", ntmp); #endif if(!ntmp) { diff --git a/doc/ssl/SSL_CTX_add_extra_chain_cert.pod b/doc/ssl/SSL_CTX_add_extra_chain_cert.pod index 21a9db0e2a..ee28f5ccc3 100644 --- a/doc/ssl/SSL_CTX_add_extra_chain_cert.pod +++ b/doc/ssl/SSL_CTX_add_extra_chain_cert.pod @@ -33,6 +33,7 @@ error stack to find out the reason for failure otherwise. L, L, +L, L =cut diff --git a/doc/ssl/SSL_CTX_use_certificate.pod b/doc/ssl/SSL_CTX_use_certificate.pod index 3b2fe6fc50..b8868f18bf 100644 --- a/doc/ssl/SSL_CTX_use_certificate.pod +++ b/doc/ssl/SSL_CTX_use_certificate.pod @@ -149,6 +149,7 @@ L, L, L, L, L, L, +L, L =cut diff --git a/doc/ssl/SSL_clear.pod b/doc/ssl/SSL_clear.pod index 8b735d81dc..f0aa5e94eb 100644 --- a/doc/ssl/SSL_clear.pod +++ b/doc/ssl/SSL_clear.pod @@ -44,6 +44,7 @@ The SSL_clear() operation was successful. L, L, L, L, -L, L +L, L, +L =cut diff --git a/doc/ssl/SSL_get_client_CA_list.pod b/doc/ssl/SSL_get_client_CA_list.pod index 40e01cf9c8..5693fdebb2 100644 --- a/doc/ssl/SSL_get_client_CA_list.pod +++ b/doc/ssl/SSL_get_client_CA_list.pod @@ -47,6 +47,7 @@ the server did not send a list of CAs (client mode). =head1 SEE ALSO L, -L +L, +L =cut diff --git a/doc/ssl/ssl.pod b/doc/ssl/ssl.pod index a1ff455b28..79b19d9eb1 100644 --- a/doc/ssl/ssl.pod +++ b/doc/ssl/ssl.pod @@ -667,6 +667,7 @@ L, L, L, L, +L, L, L, L, diff --git a/e_os.h b/e_os.h index ec06afb876..928032f9ed 100644 --- a/e_os.h +++ b/e_os.h @@ -82,6 +82,12 @@ extern "C" { #define DEVRANDOM "/dev/urandom" #endif +#if defined(VXWORKS) +# define NO_SYS_PARAM_H +# define NO_CHMOD +# define NO_SYSLOG +#endif + #if defined(__MWERKS__) && defined(macintosh) # if macintosh==1 # ifndef MAC_OS_GUSI_SOURCE @@ -348,7 +354,9 @@ extern HINSTANCE _hInstance; # ifndef NO_SYS_PARAM_H # include # endif -# ifndef MPE +# ifdef VXWORKS +# include +# elif !defined(MPE) # include /* Needed under linux for FD_XXX */ # endif