Fix (most) WIN32 warnings and errors.

crypto/asn1/Makefile

@@ -47,7 +47,7 @@ LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \
 SRC= $(LIBSRC)
 
 EXHEADER=  asn1.h asn1_mac.h asn1t.h
-HEADER=	$(EXHEADER)
+HEADER=	$(EXHEADER) asn1_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 

crypto/asn1/ameth_lib.c

@@ -167,7 +167,7 @@ const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(const char *str, int len)
 		ameth = EVP_PKEY_asn1_get0(i);
 		if (ameth->pkey_flags & ASN1_PKEY_ALIAS)
 			continue;
-		if ((strlen(ameth->pem_str) == len) && 
+		if (((int)strlen(ameth->pem_str) == len) && 
 			!strncasecmp(ameth->pem_str, str, len))
 			return ameth;
 		}

crypto/dh/dh_ameth.c

@@ -287,7 +287,7 @@ err:
 
 static void update_buflen(const BIGNUM *b, size_t *pbuflen)
 	{
-	int i;
+	size_t i;
 	if (!b)
 		return;
 	if (*pbuflen < (i = (size_t)BN_num_bytes(b)))

crypto/dsa/dsa_ameth.c

@@ -400,7 +400,7 @@ static void int_dsa_free(EVP_PKEY *pkey)
 
 static void update_buflen(const BIGNUM *b, size_t *pbuflen)
 	{
-	int i;
+	size_t i;
 	if (!b)
 		return;
 	if (*pbuflen < (i = (size_t)BN_num_bytes(b)))

crypto/evp/Makefile

@@ -45,7 +45,7 @@ LIBOBJ=	encode.o digest.o evp_enc.o evp_key.o evp_acnf.o \
 SRC= $(LIBSRC)
 
 EXHEADER= evp.h
-HEADER=	$(EXHEADER)
+HEADER=	evp_locl.h $(EXHEADER)
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 

crypto/evp/pmeth_fn.c

@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <openssl/objects.h>
 #include "cryptlib.h"
+#include <openssl/objects.h>
 #include <openssl/evp.h>
 #include "evp_locl.h"
 

crypto/evp/pmeth_gn.c

@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <openssl/objects.h>
 #include "cryptlib.h"
+#include <openssl/objects.h>
 #include <openssl/evp.h>
 #include "evp_locl.h"
 

crypto/evp/pmeth_lib.c

@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <openssl/objects.h>
 #include "cryptlib.h"
+#include <openssl/objects.h>
 #include <openssl/evp.h>
 #include "asn1_locl.h"
 #include "evp_locl.h"

crypto/rsa/rsa_ameth.c

@@ -169,7 +169,7 @@ static void int_rsa_free(EVP_PKEY *pkey)
 
 static void update_buflen(const BIGNUM *b, size_t *pbuflen)
 	{
-	int i;
+	size_t i;
 	if (!b)
 		return;
 	if (*pbuflen < (i = (size_t)BN_num_bytes(b)))