Commit f68854b4 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Various Win32 and other fixes for warnings and compilation errors. 

Fix Win32 build system to use 'Makefile' instead of 'Makefile.ssl'.
parent 1cfd258e

apps/apps.c

+1 −1
Original line number Diff line number Diff line
@@ -2146,7 +2146,7 @@ error: 


/* This code MUST COME AFTER anything that uses rename() */

#ifdef OPENSSL_SYS_WIN32

int WIN32_rename(char *from, char *to)

int WIN32_rename(const char *from, const char *to)

	{

#ifndef OPENSSL_SYS_WINCE

	/* Windows rename gives an error if 'to' exists, so delete it

apps/apps.h

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ long app_RAND_load_files(char *file); /* `file' is a list of files to read, 


#ifdef OPENSSL_SYS_WIN32

#define rename(from,to) WIN32_rename((from),(to))

int WIN32_rename(char *oldname,char *newname);

int WIN32_rename(const char *oldname,const char *newname);

#endif



#ifndef MONOLITH

crypto/pem/pem_info.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ start: 
#ifndef OPENSSL_NO_DSA

			if (strcmp(name,PEM_STRING_DSA) == 0)

			{

			(D2I_OF(RSA))d2i=d2i_DSAPrivateKey;

			(D2I_OF(DSA))d2i=d2i_DSAPrivateKey;

			if (xi->x_pkey != NULL) 

				{

				if (!sk_X509_INFO_push(ret,xi)) goto err;

crypto/rand/rand_win.c

+2 −1
Original line number Diff line number Diff line
@@ -558,7 +558,8 @@ int RAND_poll(void) 
			if (module_first(handle, &m))

				do

					RAND_add(&m, m.dwSize, 9);

				while (module_next(handle, &m) && GetTickCount < stoptime);

				while (module_next(handle, &m)

					       	&& (GetTickCount() < stoptime));

			if (close_snap)

				close_snap(handle);

			else

crypto/stack/safestack.h

+2 −2
Original line number Diff line number Diff line
@@ -194,14 +194,14 @@ STACK_OF(type) \ 
	sk_is_sorted(st)



#define	SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \

	d2i_ASN1_SET(st,pp,length, (char *(*)())d2i_func, (void (*)(void *))free_func, ex_tag,ex_class)

	d2i_ASN1_SET(st,pp,length, (char *(*)(void ** ,const unsigned char ** ,long))d2i_func, (void (*)(void *))free_func, ex_tag,ex_class)

#define	SKM_ASN1_SET_OF_i2d(type, st, pp, i2d_func, ex_tag, ex_class, is_set) \

	i2d_ASN1_SET(st,pp,i2d_func,ex_tag,ex_class,is_set)



#define	SKM_ASN1_seq_pack(type, st, i2d_func, buf, len) \

	ASN1_seq_pack(st, i2d_func, buf, len)

#define	SKM_ASN1_seq_unpack(type, buf, len, d2i_func, free_func) \

	ASN1_seq_unpack(buf,len,(char *(*)(void *,unsigned char **,long))d2i_func, (void(*)(void *))free_func)

	ASN1_seq_unpack(buf,len,(char *(*)(void *,const unsigned char **,long))d2i_func, (void(*)(void *))free_func)



#define SKM_PKCS12_decrypt_d2i(type, algor, d2i_func, free_func, pass, passlen, oct, seq) \

	((STACK *)PKCS12_decrypt_d2i(algor,(char *(*)())d2i_func, (void(*)(void *))free_func,pass,passlen,oct,seq))