Commit bc36ee62 authored by Richard Levitte's avatar Richard Levitte
Browse files

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.
parent f2bc6684

Configure

+0 −1
Original line number Diff line number Diff line
@@ -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

	{

apps/app_rand.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

apps/apps.c

+5 −5
Original line number Diff line number Diff line
@@ -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 */

apps/asn1pars.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

apps/ca.c

+11 −10
Original line number Diff line number Diff line
@@ -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");