From f68854b4c344ed6ebf1893055bd63654849996e1 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Tue, 19 Apr 2005 00:12:36 +0000
Subject: [PATCH] Various Win32 and other fixes for warnings and compilation
 errors.

Fix Win32 build system to use 'Makefile' instead of 'Makefile.ssl'.
---
 apps/apps.c              | 2 +-
 apps/apps.h              | 2 +-
 crypto/pem/pem_info.c    | 2 +-
 crypto/rand/rand_win.c   | 3 ++-
 crypto/stack/safestack.h | 4 ++--
 crypto/x509/x509_vfy.c   | 3 ++-
 util/mk1mf.pl            | 2 +-
 util/mkfiles.pl          | 2 +-
 8 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/apps/apps.c b/apps/apps.c
index 988bb6e941..fb9f72fbea 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -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
diff --git a/apps/apps.h b/apps/apps.h
index b9bb91c186..26dcbc5771 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -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
diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c
index 14e0643129..870e102651 100644
--- a/crypto/pem/pem_info.c
+++ b/crypto/pem/pem_info.c
@@ -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;
diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c
index 29472c6ddd..39523d3005 100644
--- a/crypto/rand/rand_win.c
+++ b/crypto/rand/rand_win.c
@@ -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
diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h
index b50149dd96..3167e3ec6e 100644
--- a/crypto/stack/safestack.h
+++ b/crypto/stack/safestack.h
@@ -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))
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index 6fdc35a617..4a30827c83 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -390,7 +390,8 @@ static int check_chain_extensions(X509_STORE_CTX *ctx)
 	X509 *x;
 	int (*cb)(int ok,X509_STORE_CTX *ctx);
 	int proxy_path_length = 0;
-	int allow_proxy_certs = !!(ctx->flags & X509_V_FLAG_ALLOW_PROXY_CERTS);
+	int allow_proxy_certs =
+		!!(ctx->param->flags & X509_V_FLAG_ALLOW_PROXY_CERTS);
 	cb=ctx->verify_cb;
 
 	/* must_be_ca can have 1 of 3 values:
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 15813461f0..202371c9da 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -10,7 +10,7 @@ $OPTIONS="";
 $ssl_version="";
 $banner="\t\@echo Building OpenSSL";
 
-open(IN,"<Makefile.ssl") || die "unable to open Makefile.ssl!\n";
+open(IN,"<Makefile") || die "unable to open Makefile!\n";
 while(<IN>) {
     $ssl_version=$1 if (/^VERSION=(.*)$/);
     $OPTIONS=$1 if (/^OPTIONS=(.*)$/);
diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index d8cac3a3b4..f0daaecde7 100755
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -62,7 +62,7 @@ my @dirs = (
 );
 
 foreach (@dirs) {
-	&files_dir ($_, "Makefile.ssl");
+	&files_dir ($_, "Makefile");
 }
 
 exit(0);
-- 
2.40.0