Browse Source

Use new-style system-id macros everywhere possible. I hope I haven't

missed any.

This compiles and runs on Linux, and external applications have no
problems with it.  The definite test will be to build this on VMS.
master
Richard Levitte 22 years ago
parent
commit
bc36ee6227
118 changed files with 464 additions and 460 deletions
  1. +0
    -1
      Configure
  2. +1
    -1
      apps/app_rand.c
  3. +5
    -5
      apps/apps.c
  4. +1
    -1
      apps/asn1pars.c
  5. +11
    -10
      apps/ca.c
  6. +1
    -1
      apps/ciphers.c
  7. +2
    -2
      apps/crl.c
  8. +1
    -1
      apps/crl2p7.c
  9. +1
    -1
      apps/dgst.c
  10. +1
    -1
      apps/dh.c
  11. +1
    -1
      apps/dhparam.c
  12. +1
    -1
      apps/dsa.c
  13. +1
    -1
      apps/dsaparam.c
  14. +1
    -1
      apps/enc.c
  15. +1
    -1
      apps/engine.c
  16. +1
    -1
      apps/errstr.c
  17. +1
    -1
      apps/gendh.c
  18. +1
    -1
      apps/gendsa.c
  19. +1
    -1
      apps/genrsa.c
  20. +1
    -1
      apps/nseq.c
  21. +3
    -3
      apps/openssl.c
  22. +1
    -1
      apps/passwd.c
  23. +1
    -1
      apps/pkcs12.c
  24. +1
    -1
      apps/pkcs7.c
  25. +1
    -1
      apps/pkcs8.c
  26. +1
    -1
      apps/rand.c
  27. +3
    -3
      apps/req.c
  28. +1
    -1
      apps/rsa.c
  29. +1
    -1
      apps/rsautl.c
  30. +3
    -1
      apps/s_apps.h
  31. +8
    -8
      apps/s_client.c
  32. +7
    -7
      apps/s_server.c
  33. +15
    -15
      apps/s_socket.c
  34. +4
    -4
      apps/s_time.c
  35. +1
    -1
      apps/sess_id.c
  36. +1
    -1
      apps/smime.c
  37. +2
    -2
      apps/speed.c
  38. +2
    -2
      apps/spkac.c
  39. +2
    -2
      apps/x509.c
  40. +2
    -2
      crypto/asn1/a_gentm.c
  41. +1
    -1
      crypto/asn1/a_time.c
  42. +5
    -5
      crypto/asn1/a_utctm.c
  43. +3
    -3
      crypto/bf/bf_opts.c
  44. +3
    -3
      crypto/bf/bfspeed.c
  45. +6
    -6
      crypto/bio/b_sock.c
  46. +1
    -1
      crypto/bio/bio_cb.c
  47. +2
    -2
      crypto/bio/bss_acpt.c
  48. +2
    -2
      crypto/bio/bss_conn.c
  49. +1
    -1
      crypto/bio/bss_fd.c
  50. +2
    -2
      crypto/bio/bss_file.c
  51. +9
    -7
      crypto/bio/bss_log.c
  52. +2
    -2
      crypto/bio/bss_sock.c
  53. +2
    -2
      crypto/bn/bnspeed.c
  54. +1
    -1
      crypto/bn/bntest.c
  55. +2
    -2
      crypto/bn/expspeed.c
  56. +1
    -1
      crypto/bn/exptest.c
  57. +1
    -1
      crypto/bn/vms-helper.c
  58. +3
    -3
      crypto/cast/cast_spd.c
  59. +3
    -3
      crypto/cast/castopts.c
  60. +3
    -3
      crypto/comp/c_zlib.c
  61. +1
    -1
      crypto/conf/conf_def.c
  62. +1
    -1
      crypto/conf/conf_lib.c
  63. +5
    -5
      crypto/cryptlib.c
  64. +1
    -1
      crypto/cryptlib.h
  65. +11
    -11
      crypto/des/des.c
  66. +6
    -6
      crypto/des/des_locl.h
  67. +4
    -4
      crypto/des/des_opts.c
  68. +3
    -3
      crypto/des/destest.c
  69. +21
    -21
      crypto/des/read_pwd.c
  70. +3
    -3
      crypto/des/speed.c
  71. +3
    -3
      crypto/dh/dhtest.c
  72. +2
    -2
      crypto/dsa/dsatest.c
  73. +3
    -3
      crypto/dso/dso_vms.c
  74. +2
    -2
      crypto/dso/dso_win32.c
  75. +1
    -1
      crypto/err/err.c
  76. +3
    -3
      crypto/idea/idea_spd.c
  77. +1
    -1
      crypto/rand/md_rand.c
  78. +1
    -1
      crypto/rand/rand_egd.c
  79. +1
    -1
      crypto/rand/rand_unix.c
  80. +1
    -1
      crypto/rand/rand_vms.c
  81. +1
    -1
      crypto/rand/rand_win.c
  82. +5
    -5
      crypto/rand/randfile.c
  83. +3
    -3
      crypto/rc2/rc2speed.c
  84. +1
    -1
      crypto/rc4/rc4.c
  85. +3
    -3
      crypto/rc4/rc4speed.c
  86. +3
    -3
      crypto/rc5/rc5speed.c
  87. +1
    -1
      crypto/rsa/rsa_sign.c
  88. +1
    -1
      crypto/symhacks.h
  89. +3
    -3
      crypto/threads/mttest.c
  90. +3
    -3
      crypto/threads/th-lock.c
  91. +12
    -12
      crypto/tmdiff.c
  92. +3
    -3
      crypto/txt_db/txt_db.c
  93. +5
    -5
      ssl/kssl.c
  94. +2
    -2
      ssl/s23_clnt.c
  95. +3
    -3
      ssl/s23_lib.c
  96. +3
    -3
      ssl/s23_srvr.c
  97. +2
    -2
      ssl/s2_clnt.c
  98. +2
    -2
      ssl/s2_enc.c
  99. +2
    -2
      ssl/s2_lib.c
  100. +2
    -2
      ssl/s2_meth.c

+ 0
- 1
Configure View File

@ -693,7 +693,6 @@ if ($no_krb5
$cflags="-DOPENSSL_NO_KRB5 $cflags";
$options.=" no-krb5" unless $no_krb5;
$openssl_algorithm_defines .= "#define OPENSSL_NO_KRB5\n";
$openssl_algorithm_defines .= "#define NO_KRB5\n";
}
else
{


+ 1
- 1
apps/app_rand.c View File

@ -124,7 +124,7 @@ int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
int consider_randfile = (file == NULL);
char buffer[200];
#ifdef WINDOWS
#ifdef OPENSSL_SYS_WINDOWS
BIO_printf(bio_e,"Loading 'screen' into random state -");
BIO_flush(bio_e);
RAND_screen();


+ 5
- 5
apps/apps.c View File

@ -70,7 +70,7 @@
#include <openssl/pkcs12.h>
#include <openssl/safestack.h>
#ifdef WINDOWS
#ifdef OPENSSL_SYS_WINDOWS
# include "bss_file.c"
#endif
@ -184,7 +184,7 @@ int str2fmt(char *s)
return(FORMAT_UNDEF);
}
#if defined(MSDOS) || defined(WIN32) || defined(WIN16)
#if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)
void program_name(char *in, char *out, int size)
{
int i,n;
@ -222,7 +222,7 @@ void program_name(char *in, char *out, int size)
out[n]='\0';
}
#else
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
void program_name(char *in, char *out, int size)
{
char *p=in, *q;
@ -258,10 +258,10 @@ void program_name(char *in, char *out, int size)
#endif
#endif
#ifdef WIN32
#ifdef OPENSSL_SYS_WIN32
int WIN32_rename(char *from, char *to)
{
#ifdef WINNT
#ifdef OPENSSL_SYS_WINNT
int ret;
/* Note: MoveFileEx() doesn't work under Win95, Win98 */


+ 1
- 1
apps/asn1pars.c View File

@ -206,7 +206,7 @@ bad:
goto end;
}
BIO_set_fp(out,stdout,BIO_NOCLOSE|BIO_FP_TEXT);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 11
- 10
apps/ca.c View File

@ -79,7 +79,7 @@
#include <openssl/engine.h>
#ifndef W_OK
# ifdef VMS
# ifdef OPENSSL_SYS_VMS
# if defined(__DECC)
# include <unistd.h>
# else
@ -545,7 +545,7 @@ bad:
if (configfile == NULL)
{
/* We will just use 'buf[0]' as a temporary buffer. */
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
strncpy(buf[0],X509_get_default_cert_area(),
sizeof(buf[0])-1-sizeof(CONFIG_FILE));
#else
@ -755,7 +755,8 @@ bad:
BIO_printf(bio_err,"there needs to be defined a directory for new certificate to be placed in\n");
goto err;
}
#ifndef VMS /* outdir is a directory spec, but access() for VMS demands a
#ifndef OPENSSL_SYS_VMS
/* outdir is a directory spec, but access() for VMS demands a
filename. In any case, stat(), below, will catch the problem
if outdir is not a directory spec, and the fopen() or open()
will catch an error if there is no write access.
@ -853,7 +854,7 @@ bad:
if (verbose)
{
BIO_set_fp(out,stdout,BIO_NOCLOSE|BIO_FP_TEXT); /* cannot fail */
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);
@ -996,7 +997,7 @@ bad:
else
{
BIO_set_fp(Sout,stdout,BIO_NOCLOSE|BIO_FP_TEXT);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
Sout = BIO_push(tmpbio, Sout);
@ -1232,7 +1233,7 @@ bad:
strncpy(buf[0],serialfile,BSIZE-4);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
strcat(buf[0],"-new");
#else
strcat(buf[0],".new");
@ -1242,7 +1243,7 @@ bad:
strncpy(buf[1],dbfile,BSIZE-4);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
strcat(buf[1],"-new");
#else
strcat(buf[1],".new");
@ -1272,7 +1273,7 @@ bad:
strncpy(buf[2],outdir,BSIZE-(j*2)-6);
#ifndef VMS
#ifndef OPENSSL_SYS_VMS
strcat(buf[2],"/");
#endif
@ -1309,7 +1310,7 @@ bad:
/* Rename the database and the serial file */
strncpy(buf[2],serialfile,BSIZE-4);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
strcat(buf[2],"-old");
#else
strcat(buf[2],".old");
@ -1337,7 +1338,7 @@ bad:
strncpy(buf[2],dbfile,BSIZE-4);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
strcat(buf[2],"-old");
#else
strcat(buf[2],".old");


+ 1
- 1
apps/ciphers.c View File

@ -108,7 +108,7 @@ int MAIN(int argc, char **argv)
if (bio_err == NULL)
bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
STDout=BIO_new_fp(stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
STDout = BIO_push(tmpbio, STDout);


+ 2
- 2
apps/crl.c View File

@ -124,7 +124,7 @@ int MAIN(int argc, char **argv)
if ((bio_out=BIO_new(BIO_s_file())) != NULL)
{
BIO_set_fp(bio_out,stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
bio_out = BIO_push(tmpbio, bio_out);
@ -324,7 +324,7 @@ bad:
if (outfile == NULL)
{
BIO_set_fp(out,stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 1
- 1
apps/crl2p7.c View File

@ -241,7 +241,7 @@ bad:
if (outfile == NULL)
{
BIO_set_fp(out,stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 1
- 1
apps/dgst.c View File

@ -272,7 +272,7 @@ int MAIN(int argc, char **argv)
else out = BIO_new_file(outfile, "w");
} else {
out = BIO_new_fp(stdout, BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 1
- 1
apps/dh.c View File

@ -213,7 +213,7 @@ bad:
if (outfile == NULL)
{
BIO_set_fp(out,stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 1
- 1
apps/dhparam.c View File

@ -419,7 +419,7 @@ bad:
if (outfile == NULL)
{
BIO_set_fp(out,stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 1
- 1
apps/dsa.c View File

@ -262,7 +262,7 @@ bad:
if (outfile == NULL)
{
BIO_set_fp(out,stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 1
- 1
apps/dsaparam.c View File

@ -216,7 +216,7 @@ bad:
if (outfile == NULL)
{
BIO_set_fp(out,stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 1
- 1
apps/enc.c View File

@ -407,7 +407,7 @@ bad:
if (outf == NULL)
{
BIO_set_fp(out,stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 1
- 1
apps/engine.c View File

@ -133,7 +133,7 @@ int MAIN(int argc, char **argv)
if (bio_err == NULL)
bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
bio_out = BIO_push(tmpbio, bio_out);


+ 1
- 1
apps/errstr.c View File

@ -91,7 +91,7 @@ int MAIN(int argc, char **argv)
out=BIO_new(BIO_s_file());
if ((out != NULL) && BIO_set_fp(out,stdout,BIO_NOCLOSE))
{
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 1
- 1
apps/gendh.c View File

@ -171,7 +171,7 @@ bad:
if (outfile == NULL)
{
BIO_set_fp(out,stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 1
- 1
apps/gendsa.c View File

@ -207,7 +207,7 @@ bad:
if (outfile == NULL)
{
BIO_set_fp(out,stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 1
- 1
apps/genrsa.c View File

@ -197,7 +197,7 @@ bad:
if (outfile == NULL)
{
BIO_set_fp(out,stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 1
- 1
apps/nseq.c View File

@ -121,7 +121,7 @@ int MAIN(int argc, char **argv)
}
} else {
out = BIO_new_fp(stdout, BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 3
- 3
apps/openssl.c View File

@ -254,7 +254,7 @@ int main(int Argc, char *Argv[])
if (p == NULL)
{
strcpy(config_name,X509_get_default_cert_area());
#ifndef VMS
#ifndef OPENSSL_SYS_VMS
strcat(config_name,"/");
#endif
strcat(config_name,OPENSSL_CONF);
@ -372,7 +372,7 @@ static int do_cmd(LHASH *prog, int argc, char *argv[])
else if ((strncmp(argv[0],"no-",3)) == 0)
{
BIO *bio_stdout = BIO_new_fp(stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
bio_stdout = BIO_push(tmpbio, bio_stdout);
@ -409,7 +409,7 @@ static int do_cmd(LHASH *prog, int argc, char *argv[])
else /* strcmp(argv[0],LIST_CIPHER_COMMANDS) == 0 */
list_type = FUNC_TYPE_CIPHER;
bio_stdout = BIO_new_fp(stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
bio_stdout = BIO_push(tmpbio, bio_stdout);


+ 1
- 1
apps/passwd.c View File

@ -83,7 +83,7 @@ int MAIN(int argc, char **argv)
if (out == NULL)
goto err;
BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 1
- 1
apps/pkcs12.c View File

@ -375,7 +375,7 @@ int MAIN(int argc, char **argv)
if (!outfile) {
out = BIO_new_fp(stdout, BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 1
- 1
apps/pkcs7.c View File

@ -225,7 +225,7 @@ bad:
if (outfile == NULL)
{
BIO_set_fp(out,stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 1
- 1
apps/pkcs8.c View File

@ -226,7 +226,7 @@ int MAIN(int argc, char **argv)
}
} else {
out = BIO_new_fp (stdout, BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 1
- 1
apps/rand.c View File

@ -132,7 +132,7 @@ int MAIN(int argc, char **argv)
else
{
r = BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 3
- 3
apps/req.c View File

@ -435,7 +435,7 @@ bad:
if (p == NULL)
{
strcpy(config_name,X509_get_default_cert_area());
#ifndef VMS
#ifndef OPENSSL_SYS_VMS
strcat(config_name,"/");
#endif
strcat(config_name,OPENSSL_CONF);
@ -697,7 +697,7 @@ bad:
{
BIO_printf(bio_err,"writing new private key to stdout\n");
BIO_set_fp(out,stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);
@ -910,7 +910,7 @@ loop:
if (outfile == NULL)
{
BIO_set_fp(out,stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 1
- 1
apps/rsa.c View File

@ -307,7 +307,7 @@ bad:
if (outfile == NULL)
{
BIO_set_fp(out,stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 1
- 1
apps/rsautl.c View File

@ -227,7 +227,7 @@ int MAIN(int argc, char **argv)
}
} else {
out = BIO_new_fp(stdout, BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 3
- 1
apps/s_apps.h View File

@ -57,7 +57,9 @@
*/
#include <sys/types.h>
#if (defined(VMS) || defined(__VMS)) && !defined(FD_SET)
#include <openssl/opensslconf.h>
#if defined(OPENSSL_SYS_VMS) && !defined(FD_SET)
/* VAX C does not defined fd_set and friends, but it's actually quite simple */
/* These definitions are borrowed from SOCKETSHR. /Richard Levitte */
#define MAX_NOFILE 32


+ 8
- 8
apps/s_client.c View File

@ -68,7 +68,7 @@
recursive header file inclusion, resulting in the compiler complaining
that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which
is needed to have fileno() declared correctly... So let's define u_int */
#if defined(VMS) && defined(__DECC) && !defined(__U_INT)
#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__U_INT)
#define __U_INT
typedef unsigned int u_int;
#endif
@ -82,12 +82,12 @@ typedef unsigned int u_int;
#include <openssl/engine.h>
#include "s_apps.h"
#ifdef WINDOWS
#ifdef OPENSSL_SYS_WINDOWS
#include <conio.h>
#endif
#if (defined(VMS) && __VMS_VER < 70000000)
#if (defined(OPENSSL_SYS_VMS) && __VMS_VER < 70000000)
/* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
#undef FIONBIO
#endif
@ -186,7 +186,7 @@ int MAIN(int argc, char **argv)
char *inrand=NULL;
char *engine_id=NULL;
ENGINE *e=NULL;
#ifdef WINDOWS
#ifdef OPENSSL_SYS_WINDOWS
struct timeval tv;
#endif
@ -537,7 +537,7 @@ re_start:
if (!ssl_pending)
{
#ifndef WINDOWS
#ifndef OPENSSL_SYS_WINDOWS
if (tty_on)
{
if (read_tty) FD_SET(fileno(stdin),&readfds);
@ -564,7 +564,7 @@ re_start:
* will choke the compiler: if you do have a cast then
* you can either go for (int *) or (void *).
*/
#ifdef WINDOWS
#ifdef OPENSSL_SYS_WINDOWS
/* Under Windows we make the assumption that we can
* always write to the tty: therefore if we need to
* write to the tty we just fall through. Otherwise
@ -663,7 +663,7 @@ re_start:
goto shut;
}
}
#ifdef WINDOWS
#ifdef OPENSSL_SYS_WINDOWS
/* Assume Windows can always write */
else if (!ssl_pending && write_tty)
#else
@ -744,7 +744,7 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
}
}
#ifdef WINDOWS
#ifdef OPENSSL_SYS_WINDOWS
else if ((_kbhit()) || (WAIT_OBJECT_0 == WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0)))
#else
else if (FD_ISSET(fileno(stdin),&readfds))


+ 7
- 7
apps/s_server.c View File

@ -70,7 +70,7 @@
recursive header file inclusion, resulting in the compiler complaining
that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which
is needed to have fileno() declared correctly... So let's define u_int */
#if defined(VMS) && defined(__DECC) && !defined(__U_INT)
#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__U_INT)
#define __U_INT
typedef unsigned int u_int;
#endif
@ -86,11 +86,11 @@ typedef unsigned int u_int;
#include <openssl/engine.h>
#include "s_apps.h"
#ifdef WINDOWS
#ifdef OPENSSL_SYS_WINDOWS
#include <conio.h>
#endif
#if (defined(VMS) && __VMS_VER < 70000000)
#if (defined(OPENSSL_SYS_VMS) && __VMS_VER < 70000000)
/* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
#undef FIONBIO
#endif
@ -815,7 +815,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
unsigned long l;
SSL *con=NULL;
BIO *sbio;
#ifdef WINDOWS
#ifdef OPENSSL_SYS_WINDOWS
struct timeval tv;
#endif
@ -882,7 +882,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
if (!read_from_sslcon)
{
FD_ZERO(&readfds);
#ifndef WINDOWS
#ifndef OPENSSL_SYS_WINDOWS
FD_SET(fileno(stdin),&readfds);
#endif
FD_SET(s,&readfds);
@ -892,7 +892,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
* the compiler: if you do have a cast then you can either
* go for (int *) or (void *).
*/
#ifdef WINDOWS
#ifdef OPENSSL_SYS_WINDOWS
/* Under Windows we can't select on stdin: only
* on sockets. As a workaround we timeout the select every
* second and check for any keypress. In a proper Windows
@ -1294,7 +1294,7 @@ static int www_body(char *hostname, int s, unsigned char *context)
else
{
BIO_printf(bio_s_out,"read R BLOCK\n");
#ifndef MSDOS
#ifndef OPENSSL_SYS_MSDOS
sleep(1);
#endif
continue;


+ 15
- 15
apps/s_socket.c View File

@ -66,7 +66,7 @@
recursive header file inclusion, resulting in the compiler complaining
that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which
is needed to have fileno() declared correctly... So let's define u_int */
#if defined(VMS) && defined(__DECC) && !defined(__U_INT)
#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__U_INT)
#define __U_INT
typedef unsigned int u_int;
#endif
@ -80,7 +80,7 @@ typedef unsigned int u_int;
#include <openssl/ssl.h>
static struct hostent *GetHostByName(char *name);
#ifdef WINDOWS
#ifdef OPENSSL_SYS_WINDOWS
static void sock_cleanup(void);
#endif
static int sock_init(void);
@ -90,17 +90,17 @@ static int init_server_long(int *sock, int port,char *ip);
static int do_accept(int acc_sock, int *sock, char **host);
static int host_ip(char *str, unsigned char ip[4]);
#ifdef WIN16
#ifdef OPENSSL_SYS_WIN16
#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
#else
#define SOCKET_PROTOCOL IPPROTO_TCP
#endif
#ifdef WINDOWS
#ifdef OPENSSL_SYS_WINDOWS
static struct WSAData wsa_state;
static int wsa_init_done=0;
#ifdef WIN16
#ifdef OPENSSL_SYS_WIN16
static HWND topWnd=0;
static FARPROC lpTopWndProc=NULL;
static FARPROC lpTopHookProc=NULL;
@ -129,10 +129,10 @@ static BOOL CALLBACK enumproc(HWND hwnd,LPARAM lParam)
return(FALSE);
}
#endif /* WIN32 */
#endif /* WINDOWS */
#endif /* OPENSSL_SYS_WIN32 */
#endif /* OPENSSL_SYS_WINDOWS */
#ifdef WINDOWS
#ifdef OPENSSL_SYS_WINDOWS
static void sock_cleanup(void)
{
if (wsa_init_done)
@ -146,7 +146,7 @@ static void sock_cleanup(void)
static int sock_init(void)
{
#ifdef WINDOWS
#ifdef OPENSSL_SYS_WINDOWS
if (!wsa_init_done)
{
int err;
@ -163,15 +163,15 @@ static int sock_init(void)
return(0);
}
#ifdef WIN16
#ifdef OPENSSL_SYS_WIN16
EnumTaskWindows(GetCurrentTask(),enumproc,0L);
lpTopWndProc=(FARPROC)GetWindowLong(topWnd,GWL_WNDPROC);
lpTopHookProc=MakeProcInstance((FARPROC)topHookProc,_hInstance);
SetWindowLong(topWnd,GWL_WNDPROC,(LONG)lpTopHookProc);
#endif /* WIN16 */
#endif /* OPENSSL_SYS_WIN16 */
}
#endif /* WINDOWS */
#endif /* OPENSSL_SYS_WINDOWS */
return(1);
}
@ -285,7 +285,7 @@ static int init_server_long(int *sock, int port, char *ip)
#endif
if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1)
{
#ifndef WINDOWS
#ifndef OPENSSL_SYS_WINDOWS
perror("bind");
#endif
goto err;
@ -318,7 +318,7 @@ static int do_accept(int acc_sock, int *sock, char **host)
if (!sock_init()) return(0);
#ifndef WINDOWS
#ifndef OPENSSL_SYS_WINDOWS
redoit:
#endif
@ -332,7 +332,7 @@ redoit:
ret=accept(acc_sock,(struct sockaddr *)&from,(void *)&len);
if (ret == INVALID_SOCKET)
{
#ifdef WINDOWS
#ifdef OPENSSL_SYS_WINDOWS
i=WSAGetLastError();
BIO_printf(bio_err,"accept error %d\n",i);
#else


+ 4
- 4
apps/s_time.c View File

@ -82,7 +82,7 @@
#include "wintext.h"
#endif
#if !defined(MSDOS) && (!defined(VMS) || defined(__DECC))
#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
#define TIMES
#endif
@ -98,7 +98,7 @@
The __TMS macro will show if it was. If it wasn't defined, we should
undefine TIMES, since that tells the rest of the program how things
should be handled. -- Richard Levitte */
#if defined(VMS) && defined(__DECC) && !defined(__TMS)
#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS)
#undef TIMES
#endif
@ -174,7 +174,7 @@ static int perform=0;
#ifdef FIONBIO
static int t_nbio=0;
#endif
#ifdef WIN32
#ifdef OPENSSL_SYS_WIN32
static int exitNow = 0; /* Set when it's time to exit main */
#endif
@ -198,7 +198,7 @@ static void s_time_init(void)
#ifdef FIONBIO
t_nbio=0;
#endif
#ifdef WIN32
#ifdef OPENSSL_SYS_WIN32
exitNow = 0; /* Set when it's time to exit main */
#endif
}


+ 1
- 1
apps/sess_id.c View File

@ -208,7 +208,7 @@ bad:
if (outfile == NULL)
{
BIO_set_fp(out,stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 1
- 1
apps/smime.c View File

@ -421,7 +421,7 @@ int MAIN(int argc, char **argv)
}
} else {
out = BIO_new_fp(stdout, BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 2
- 2
apps/speed.c View File

@ -87,7 +87,7 @@
#if defined(__FreeBSD__)
# define USE_TOD
#elif !defined(MSDOS) && (!defined(VMS) || defined(__DECC))
#elif !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
# define TIMES
#endif
#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) /* FIXME */
@ -110,7 +110,7 @@
The __TMS macro will show if it was. If it wasn't defined, we should
undefine TIMES, since that tells the rest of the program how things
should be handled. -- Richard Levitte */
#if defined(VMS) && defined(__DECC) && !defined(__TMS)
#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS)
#undef TIMES
#endif


+ 2
- 2
apps/spkac.c View File

@ -221,7 +221,7 @@ bad:
if (outfile) out = BIO_new_file(outfile, "w");
else {
out = BIO_new_fp(stdout, BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);
@ -278,7 +278,7 @@ bad:
if (outfile) out = BIO_new_file(outfile, "w");
else {
out = BIO_new_fp(stdout, BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 2
- 2
apps/x509.c View File

@ -193,7 +193,7 @@ int MAIN(int argc, char **argv)
if (bio_err == NULL)
bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
STDout=BIO_new_fp(stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
STDout = BIO_push(tmpbio, STDout);
@ -642,7 +642,7 @@ bad:
if (outfile == NULL)
{
BIO_set_fp(out,stdout,BIO_NOCLOSE);
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);


+ 2
- 2
crypto/asn1/a_gentm.c View File

@ -193,7 +193,7 @@ ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,
{
char *p;
struct tm *ts;
#if defined(OPENSSL_THREADS) && !defined(WIN32)
#if defined(OPENSSL_THREADS) && !defined(OPENSSL_SYS_WIN32)
struct tm data;
#endif
@ -202,7 +202,7 @@ ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,
if (s == NULL)
return(NULL);
#if defined(OPENSSL_THREADS) && !defined(WIN32)
#if defined(OPENSSL_THREADS) && !defined(OPENSSL_SYS_WIN32)
gmtime_r(&t,&data); /* should return &data, but doesn't on some systems, so we don't even look at the return value */
ts=&data;
#else


+ 1
- 1
crypto/asn1/a_time.c View File

@ -100,7 +100,7 @@ int i2d_ASN1_TIME(ASN1_TIME *a, unsigned char **pp)
ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t)
{
struct tm *ts;
#if defined(OPENSSL_THREADS) && !defined(WIN32) && !defined(__CYGWIN32__)
#if defined(OPENSSL_THREADS) && !defined(OPENSSL_SYS_WIN32) && !defined(__CYGWIN32__)
struct tm data;
gmtime_r(&t,&data);


+ 5
- 5
crypto/asn1/a_utctm.c View File

@ -58,7 +58,7 @@
#include <stdio.h>
#include <time.h>
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
#include <descrip.h>
#include <lnmdef.h>
#include <starlet.h>
@ -191,7 +191,7 @@ ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t)
{
char *p;
struct tm *ts;
#if defined(OPENSSL_THREADS) && !defined(WIN32) && !defined(__CYGWIN32__)
#if defined(OPENSSL_THREADS) && !defined(OPENSSL_SYS_WIN32) && !defined(__CYGWIN32__)
struct tm data;
#endif
@ -201,13 +201,13 @@ ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t)
if (s == NULL)
return(NULL);
#if defined(OPENSSL_THREADS) && !defined(WIN32) && !defined(__CYGWIN32__)
#if defined(OPENSSL_THREADS) && !defined(OPENSSL_SYS_WIN32) && !defined(__CYGWIN32__)
gmtime_r(&t,&data); /* should return &data, but doesn't on some systems, so we don't even look at the return value */
ts=&data;
#else
ts=gmtime(&t);
#endif
#ifdef VMS
#ifdef OPENSSL_SYS_VMS
if (ts == NULL)
{
static $DESCRIPTOR(tabnam,"LNM$DCL_LOGICAL");
@ -284,7 +284,7 @@ int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t)
t -= offset*60; /* FIXME: may overflow in extreme cases */
#if defined(OPENSSL_THREADS) && !defined(WIN32) && !defined(__CYGWIN32__)
#if defined(OPENSSL_THREADS) && !defined(OPENSSL_SYS_WIN32) && !defined(__CYGWIN32__)
{ struct tm data; gmtime_r(&t, &data); tm = &data; }
#else
tm = gmtime(&t);


+ 3
- 3
crypto/bf/bf_opts.c View File

@ -59,7 +59,7 @@
/* define PART1, PART2, PART3 or PART4 to build only with a few of the options.
* This is for machines with 64k code segment size restrictions. */
#if !defined(MSDOS) && (!defined(VMS) || defined(__DECC))
#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
#define TIMES
#endif
@ -82,7 +82,7 @@ OPENSSL_DECLARE_EXIT
The __TMS macro will show if it was. If it wasn't defined, we should
undefine TIMES, since that tells the rest of the program how things
should be handled. -- Richard Levitte */
#if defined(VMS) && defined(__DECC) && !defined(__TMS)
#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS)
#undef TIMES
#endif
@ -322,7 +322,7 @@ int main(int argc, char **argv)
break;
}
exit(0);
#if defined(LINT) || defined(MSDOS)
#if defined(LINT) || defined(OPENSSL_SYS_MSDOS)
return(0);
#endif
}

+ 3
- 3
crypto/bf/bfspeed.c View File

@ -59,7 +59,7 @@
/* 11-Sep-92 Andrew Daviel Support for Silicon Graphics IRIX added */
/* 06-Apr-92 Luke Brennan Support for VMS and add extra signal calls */
#if !defined(MSDOS) && (!defined(VMS) || defined(__DECC))
#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
#define TIMES
#endif
@ -82,7 +82,7 @@ OPENSSL_DECLARE_EXIT
The __TMS macro will show if it was. If it wasn't defined, we should
undefine TIMES, since that tells the rest of the program how things
should be handled. -- Richard Levitte */
#if defined(VMS) && defined(__DECC) && !defined(__TMS)
#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS)
#undef TIMES
#endif
@ -268,7 +268,7 @@ int main(int argc, char **argv)
printf("Blowfish raw ecb bytes per sec = %12.3f (%9.3fuS)\n",b,8.0e6/b);
printf("Blowfish cbc bytes per sec = %12.3f (%9.3fuS)\n",c,8.0e6/c);
exit(0);
#if defined(LINT) || defined(MSDOS)
#if defined(LINT) || defined(OPENSSL_SYS_MSDOS)
return(0);
#endif
}

+ 6
- 6
crypto/bio/b_sock.c View File

@ -65,7 +65,7 @@
#include "cryptlib.h"
#include <openssl/bio.h>
#ifdef WIN16
#ifdef OPENSSL_SYS_WIN16
#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
#else
#define SOCKET_PROTOCOL IPPROTO_TCP
@ -79,7 +79,7 @@
#define MAX_LISTEN 32
#endif
#ifdef WINDOWS
#ifdef OPENSSL_SYS_WINDOWS
static int wsa_init_done=0;
#endif
@ -429,7 +429,7 @@ end:
int BIO_sock_init(void)
{
#ifdef WINDOWS
#ifdef OPENSSL_SYS_WINDOWS
static struct WSAData wsa_state;
if (!wsa_init_done)
@ -449,13 +449,13 @@ int BIO_sock_init(void)
return(-1);
}
}
#endif /* WINDOWS */
#endif /* OPENSSL_SYS_WINDOWS */
return(1);
}
void BIO_sock_cleanup(void)
{
#ifdef WINDOWS
#ifdef OPENSSL_SYS_WINDOWS
if (wsa_init_done)
{
wsa_init_done=0;
@ -465,7 +465,7 @@ void BIO_sock_cleanup(void)
#endif
}
#if !defined(VMS) || __VMS_VER >= 70000000
#if !defined(OPENSSL_SYS_VMS) || __VMS_VER >= 70000000
int BIO_socket_ioctl(int fd, long type, unsigned long *arg)
{


+ 1
- 1
crypto/bio/bio_cb.c View File

@ -125,7 +125,7 @@ long MS_CALLBACK BIO_debug_callback(BIO *bio, int cmd, const char *argp,
b=(BIO *)bio->cb_arg;
if (b != NULL)
BIO_write(b,buf,strlen(buf));
#if !defined(OPENSSL_NO_STDIO) && !defined(WIN16)
#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)
else
fputs(buf,stderr);
#endif


+ 2
- 2
crypto/bio/bss_acpt.c View File

@ -64,13 +64,13 @@
#include "cryptlib.h"
#include <openssl/bio.h>
#ifdef WIN16
#ifdef OPENSSL_SYS_WIN16
#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
#else
#define SOCKET_PROTOCOL IPPROTO_TCP
#endif
#if (defined(VMS) && __VMS_VER < 70000000)
#if (defined(OPENSSL_SYS_VMS) && __VMS_VER < 70000000)
/* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
#undef FIONBIO
#endif


+ 2
- 2
crypto/bio/bss_conn.c View File

@ -64,13 +64,13 @@
#include "cryptlib.h"
#include <openssl/bio.h>
#ifdef WIN16
#ifdef OPENSSL_SYS_WIN16
#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
#else
#define SOCKET_PROTOCOL IPPROTO_TCP
#endif
#if (defined(VMS) && __VMS_VER < 70000000)
#if (defined(OPENSSL_SYS_VMS) && __VMS_VER < 70000000)
/* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
#undef FIONBIO
#endif


+ 1
- 1
crypto/bio/bss_fd.c View File

@ -223,7 +223,7 @@ int BIO_fd_should_retry(int i)
{
err=get_last_sys_error();
#if defined(WINDOWS) && 0 /* more microsoft stupidity? perhaps not? Ben 4/1/99 */
#if defined(OPENSSL_SYS_WINDOWS) && 0 /* more microsoft stupidity? perhaps not? Ben 4/1/99 */
if ((i == -1) && (err == 0))
return(1);
#endif


+ 2
- 2
crypto/bio/bss_file.c View File

@ -204,7 +204,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
b->shutdown=(int)num&BIO_CLOSE;
b->ptr=(char *)ptr;
b->init=1;
#if defined(MSDOS) || defined(WINDOWS)
#if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS)
/* Set correct text/binary mode */
if (num & BIO_FP_TEXT)
_setmode(fileno((FILE *)ptr),_O_TEXT);
@ -233,7 +233,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
ret=0;
break;
}
#if defined(MSDOS) || defined(WINDOWS)
#if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS)
if (!(num & BIO_FP_TEXT))
strcat(p,"b");
else


+ 9
- 7
crypto/bio/bss_log.c View File

@ -66,9 +66,11 @@
#include <stdio.h>
#include <errno.h>
#if defined(WIN32)
#include <openssl/opensslconf.h>
#if defined(OPENSSL_SYS_WIN32)
# include <process.h>
#elif defined(VMS) || defined(__VMS)
#elif defined(OPENSSL_SYS_VMS)
# include <opcdef.h>
# include <descrip.h>
# include <lib$routines.h>
@ -85,7 +87,7 @@
#ifndef NO_SYSLOG
#if defined(WIN32)
#if defined(OPENSSL_SYS_WIN32)
#define LOG_EMERG 0
#define LOG_ALERT 1
#define LOG_CRIT 2
@ -96,7 +98,7 @@
#define LOG_DEBUG 7
#define LOG_DAEMON (3<<3)
#elif defined(VMS)
#elif defined(OPENSSL_SYS_VMS)
/* On VMS, we don't really care about these, but we need them to compile */
#define LOG_EMERG 0
#define LOG_ALERT 1
@ -118,7 +120,7 @@ static int MS_CALLBACK slg_free(BIO *data);
static void xopenlog(BIO* bp, char* name, int level);
static void xsyslog(BIO* bp, int priority, const char* string);
static void xcloselog(BIO* bp);
#ifdef WIN32
#ifdef OPENSSL_SYS_WIN32
LONG (WINAPI *go_for_advapi)() = RegOpenKeyEx;
HANDLE (WINAPI *register_event_source)() = NULL;
BOOL (WINAPI *deregister_event_source)() = NULL;
@ -241,7 +243,7 @@ static int MS_CALLBACK slg_puts(BIO *bp, const char *str)
return(ret);
}
#if defined(WIN32)
#if defined(OPENSSL_SYS_WIN32)
static void xopenlog(BIO* bp, char* name, int level)
{
@ -313,7 +315,7 @@ static void xcloselog(BIO* bp)
bp->ptr= NULL;
}
#elif defined(VMS)
#elif defined(OPENSSL_SYS_VMS)
static int VMS_OPC_target = LOG_DAEMON;


+ 2
- 2
crypto/bio/bss_sock.c View File

@ -228,7 +228,7 @@ int BIO_sock_should_retry(int i)
{
err=get_last_socket_error();
#if defined(WINDOWS) && 0 /* more microsoft stupidity? perhaps not? Ben 4/1/99 */
#if defined(OPENSSL_SYS_WINDOWS) && 0 /* more microsoft stupidity? perhaps not? Ben 4/1/99 */
if ((i == -1) && (err == 0))
return(1);
#endif
@ -242,7 +242,7 @@ int BIO_sock_non_fatal_error(int err)
{
switch (err)
{
#if defined(WINDOWS)
#if defined(OPENSSL_SYS_WINDOWS)
# if defined(WSAEWOULDBLOCK)
case WSAEWOULDBLOCK:
# endif


+ 2
- 2
crypto/bn/bnspeed.c View File

@ -71,7 +71,7 @@
#include <openssl/crypto.h>
#include <openssl/err.h>
#if !defined(MSDOS) && (!defined(VMS) || defined(__DECC))
#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
#define TIMES
#endif
@ -87,7 +87,7 @@
The __TMS macro will show if it was. If it wasn't defined, we should
undefine TIMES, since that tells the rest of the program how things
should be handled. -- Richard Levitte */
#if defined(VMS) && defined(__DECC) && !defined(__TMS)
#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS)
#undef TIMES
#endif


+ 1
- 1
crypto/bn/bntest.c View File

@ -68,7 +68,7 @@
#include <openssl/x509.h>
#include <openssl/err.h>
#ifdef WINDOWS
#ifdef OPENSSL_SYS_WINDOWS
#include "../bio/bss_file.c"
#endif


+ 2
- 2
crypto/bn/expspeed.c View File

@ -97,7 +97,7 @@ static void genprime_cb(int p, int n, void *arg);
#include <openssl/err.h>
#include <openssl/rand.h>
#if !defined(MSDOS) && (!defined(VMS) || defined(__DECC))
#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
#define TIMES
#endif
@ -113,7 +113,7 @@ static void genprime_cb(int p, int n, void *arg);
The __TMS macro will show if it was. If it wasn't defined, we should
undefine TIMES, since that tells the rest of the program how things
should be handled. -- Richard Levitte */
#if defined(VMS) && defined(__DECC) && !defined(__TMS)
#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS)
#undef TIMES
#endif