Various changes to make this stuff compile under Win32 and VC++ with and

without -debug option to mk1mf.pl. Change _export to is_export (_export is
a reserved word under VC++). Add yucky function prototype function pointer
casts. Sanitise the included files in crypto/x509v3.

Also changed ssleay.exe target to openssl.exe

19 files changed, 74 insertions, 95 deletions

diff --git a/crypto/rsa/rsa_oaep_test.c b/crypto/rsa/rsa_oaep_test.c
index 2e4384584d..681b5a7380 100644
--- a/crypto/rsa/rsa_oaep_test.c
+++ b/crypto/rsa/rsa_oaep_test.c
@@ -1,7 +1,8 @@
 /* test vectors from p1ovect1.txt */
 
 #include <stdio.h>
-#include <rsa.h>
+#include "e_os.h"
+#include "rsa.h"
 
 #define SetKey \
   key->n = BN_bin2bn(n, sizeof(n)-1, key->n); \
diff --git a/crypto/x509v3/v3_akey.c b/crypto/x509v3/v3_akey.c
index bef9b77943..ab488f936d 100644
--- a/crypto/x509v3/v3_akey.c
+++ b/crypto/x509v3/v3_akey.c
@@ -57,12 +57,10 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <pem.h>
-#include <asn1_mac.h>
-#include <err.h>
-#include <objects.h>
-#include <conf.h>
+#include "cryptlib.h"
+#include "conf.h"
+#include "asn1.h"
+#include "asn1_mac.h"
 #include "x509v3.h"
 
 #ifndef NOPROTO
diff --git a/crypto/x509v3/v3_alt.c b/crypto/x509v3/v3_alt.c
index 76f1b633c5..7f02dfc6b4 100644
--- a/crypto/x509v3/v3_alt.c
+++ b/crypto/x509v3/v3_alt.c
@@ -57,22 +57,18 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <pem.h>
-#include <asn1_mac.h>
-#include <err.h>
-#include <objects.h>
-#include <conf.h>
+#include "cryptlib.h"
+#include "conf.h"
 #include "x509v3.h"
 
 #ifndef NOPROTO
-STACK *v2i_subject_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval);
-STACK *v2i_issuer_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval);
+static STACK *v2i_subject_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval);
+static STACK *v2i_issuer_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval);
 static int copy_email(X509V3_CTX *ctx, STACK *gens);
 static int copy_issuer(X509V3_CTX *ctx, STACK *gens);
 #else
-STACK *v2i_issuer_alt();
-STACK *v2i_subject_alt();
+static STACK *v2i_issuer_alt();
+static STACK *v2i_subject_alt();
 static int copy_email();
 static int copy_issuer();
 #endif
@@ -170,7 +166,7 @@ STACK *ret;
 	return ret;
 }
 
-STACK *v2i_issuer_alt(method, ctx, nval)
+static STACK *v2i_issuer_alt(method, ctx, nval)
 X509V3_EXT_METHOD *method;
 X509V3_CTX *ctx;
 STACK *nval;
@@ -239,7 +235,7 @@ STACK *gens;
 	
 }
 
-STACK *v2i_subject_alt(method, ctx, nval)
+static STACK *v2i_subject_alt(method, ctx, nval)
 X509V3_EXT_METHOD *method;
 X509V3_CTX *ctx;
 STACK *nval;
diff --git a/crypto/x509v3/v3_bcons.c b/crypto/x509v3/v3_bcons.c
index 87e5d008c8..1a33778e01 100644
--- a/crypto/x509v3/v3_bcons.c
+++ b/crypto/x509v3/v3_bcons.c
@@ -56,13 +56,12 @@
  *
  */
 
+
 #include <stdio.h>
-#include <stdlib.h>
-#include <pem.h>
-#include <asn1_mac.h>
-#include <err.h>
-#include <objects.h>
-#include <conf.h>
+#include "cryptlib.h"
+#include "asn1.h"
+#include "asn1_mac.h"
+#include "conf.h"
 #include "x509v3.h"
 
 #ifndef NOPROTO
diff --git a/crypto/x509v3/v3_bitst.c b/crypto/x509v3/v3_bitst.c
index 2b2cc592b4..67d865f180 100644
--- a/crypto/x509v3/v3_bitst.c
+++ b/crypto/x509v3/v3_bitst.c
@@ -57,12 +57,8 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <pem.h>
-#include <asn1_mac.h>
-#include <err.h>
-#include <objects.h>
-#include <conf.h>
+#include "cryptlib.h"
+#include "conf.h"
 #include "x509v3.h"
 
 #ifndef NOPROTO
diff --git a/crypto/x509v3/v3_conf.c b/crypto/x509v3/v3_conf.c
index 22ad348dee..78dd9954ae 100644
--- a/crypto/x509v3/v3_conf.c
+++ b/crypto/x509v3/v3_conf.c
@@ -57,12 +57,13 @@
  */
 /* extension creation utilities */
 
-#include <stdlib.h>
+
+
+#include <stdio.h>
 #include <ctype.h>
-#include <string.h>
-#include <pem.h>
-#include <conf.h>
-#include <err.h>
+#include "cryptlib.h"
+#include "conf.h"
+#include "x509.h"
 #include "x509v3.h"
 
 #ifndef NOPROTO
diff --git a/crypto/x509v3/v3_enum.c b/crypto/x509v3/v3_enum.c
index 017f6f3607..3ce97cd560 100644
--- a/crypto/x509v3/v3_enum.c
+++ b/crypto/x509v3/v3_enum.c
@@ -57,9 +57,7 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <pem.h>
-#include <err.h>
+#include "cryptlib.h"
 #include "x509v3.h"
 
 static ASN1_ENUMERATED *asn1_enumerated_new();
diff --git a/crypto/x509v3/v3_extku.c b/crypto/x509v3/v3_extku.c
index 1c2d93f1c8..7a6bbf69c2 100644
--- a/crypto/x509v3/v3_extku.c
+++ b/crypto/x509v3/v3_extku.c
@@ -56,13 +56,11 @@
  *
  */
 
+
 #include <stdio.h>
-#include <stdlib.h>
-#include <pem.h>
-#include <asn1_mac.h>
-#include <err.h>
-#include <objects.h>
-#include <conf.h>
+#include "cryptlib.h"
+#include "asn1.h"
+#include "conf.h"
 #include "x509v3.h"
 
 #ifndef NOPROTO
diff --git a/crypto/x509v3/v3_genn.c b/crypto/x509v3/v3_genn.c
index bd35eacc1d..e7918d6b3c 100644
--- a/crypto/x509v3/v3_genn.c
+++ b/crypto/x509v3/v3_genn.c
@@ -56,13 +56,12 @@
  *
  */
 
+
 #include <stdio.h>
-#include <stdlib.h>
-#include <pem.h>
-#include <asn1_mac.h>
-#include <err.h>
-#include <objects.h>
-#include <conf.h>
+#include "cryptlib.h"
+#include "asn1.h"
+#include "asn1_mac.h"
+#include "conf.h"
 #include "x509v3.h"
 
 /*
diff --git a/crypto/x509v3/v3_ia5.c b/crypto/x509v3/v3_ia5.c
index 13a1137288..1030d8ea69 100644
--- a/crypto/x509v3/v3_ia5.c
+++ b/crypto/x509v3/v3_ia5.c
@@ -56,13 +56,11 @@
  *
  */
 
+
 #include <stdio.h>
-#include <stdlib.h>
-#include <pem.h>
-#include <asn1_mac.h>
-#include <err.h>
-#include <objects.h>
-#include <conf.h>
+#include "cryptlib.h"
+#include "asn1.h"
+#include "conf.h"
 #include "x509v3.h"
 
 #ifndef NOPROTO
diff --git a/crypto/x509v3/v3_int.c b/crypto/x509v3/v3_int.c
index 6c966b3265..199ba104c8 100644
--- a/crypto/x509v3/v3_int.c
+++ b/crypto/x509v3/v3_int.c
@@ -57,9 +57,7 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <pem.h>
-#include <err.h>
+#include "cryptlib.h"
 #include "x509v3.h"
 
 static ASN1_INTEGER *asn1_integer_new();
diff --git a/crypto/x509v3/v3_lib.c b/crypto/x509v3/v3_lib.c
index b40df76850..0500ef5a35 100644
--- a/crypto/x509v3/v3_lib.c
+++ b/crypto/x509v3/v3_lib.c
@@ -57,10 +57,9 @@
  */
 /* X509 v3 extension utilities */
 
-#include <stdlib.h>
-#include <pem.h>
-#include <conf.h>
-#include <err.h>
+#include <stdio.h>
+#include "cryptlib.h"
+#include "conf.h"
 #include "x509v3.h"
 
 static STACK *ext_list = NULL;
diff --git a/crypto/x509v3/v3_pku.c b/crypto/x509v3/v3_pku.c
index e0921eca54..c3808cce7a 100644
--- a/crypto/x509v3/v3_pku.c
+++ b/crypto/x509v3/v3_pku.c
@@ -57,12 +57,9 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <pem.h>
-#include <asn1_mac.h>
-#include <err.h>
-#include <objects.h>
-#include <conf.h>
+#include "cryptlib.h"
+#include "asn1.h"
+#include "asn1_mac.h"
 #include "x509v3.h"
 
 #ifndef NOPROTO
diff --git a/crypto/x509v3/v3_prn.c b/crypto/x509v3/v3_prn.c
index 7da7056293..f3cca7a8d6 100644
--- a/crypto/x509v3/v3_prn.c
+++ b/crypto/x509v3/v3_prn.c
@@ -57,10 +57,9 @@
  */
 /* X509 v3 extension utilities */
 
-#include <stdlib.h>
-#include <pem.h>
-#include <conf.h>
-#include <err.h>
+#include <stdio.h>
+#include "cryptlib.h"
+#include "conf.h"
 #include "x509v3.h"
 
 /* Extension printing routines */
diff --git a/crypto/x509v3/v3_skey.c b/crypto/x509v3/v3_skey.c
index 3994c79d67..c9402e6cca 100644
--- a/crypto/x509v3/v3_skey.c
+++ b/crypto/x509v3/v3_skey.c
@@ -56,14 +56,9 @@
  *
  */
 
+
 #include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <pem.h>
-#include <asn1_mac.h>
-#include <err.h>
-#include <objects.h>
-#include <conf.h>
+#include "cryptlib.h"
 #include "x509v3.h"
 
 #ifndef NOPROTO
diff --git a/crypto/x509v3/v3_utl.c b/crypto/x509v3/v3_utl.c
index dc43fcb7bd..0d2ae9dac3 100644
--- a/crypto/x509v3/v3_utl.c
+++ b/crypto/x509v3/v3_utl.c
@@ -57,12 +57,11 @@
  */
 /* X509 v3 extension utilities */
 
-#include <stdlib.h>
-#include <string.h>
+
+#include <stdio.h>
 #include <ctype.h>
-#include <pem.h>
-#include <conf.h>
-#include <err.h>
+#include "cryptlib.h"
+#include "conf.h"
 #include "x509v3.h"
 
 static char *strip_spaces(char *name);
diff --git a/crypto/x509v3/v3conf.c b/crypto/x509v3/v3conf.c
index e0b097b335..64a5561b53 100644
--- a/crypto/x509v3/v3conf.c
+++ b/crypto/x509v3/v3conf.c
@@ -55,11 +55,14 @@
  * Hudson (tjh@cryptsoft.com).
  *
  */
+
+
 #include <stdio.h>
-#include <pem.h>
-#include <objects.h>
-#include <conf.h>
-#include <err.h>
+#include "cryptlib.h"
+#include "asn1.h"
+#include "asn1_mac.h"
+#include "conf.h"
+#include "x509.h"
 #include "x509v3.h"
 
 /* Test application to add extensions from a config file */
diff --git a/crypto/x509v3/v3prin.c b/crypto/x509v3/v3prin.c
index 75e0cfb5a4..3a8ce93141 100644
--- a/crypto/x509v3/v3prin.c
+++ b/crypto/x509v3/v3prin.c
@@ -55,10 +55,15 @@
  * Hudson (tjh@cryptsoft.com).
  *
  */
-#include <pem.h>
-#include <objects.h>
-#include <conf.h>
-#include <err.h>
+
+
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include "asn1.h"
+#include "asn1_mac.h"
+#include "conf.h"
+#include "x509.h"
 #include "x509v3.h"
 
 int main(argc, argv)
diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h
index b4aeaf68cf..f40bb027f3 100644
--- a/crypto/x509v3/x509v3.h
+++ b/crypto/x509v3/x509v3.h
@@ -334,7 +334,7 @@ X509V3_EXT_METHOD *X509V3_EXT_get();
 X509V3_EXT_METHOD *X509V3_EXT_get_nid();
 int X509V3_add_standard_extensions();
 STACK *X509V3_parse_list();
-char *X509V3_EXT_get_d2i();
+char *X509V3_EXT_d2i();
 
 char *hex_to_string();
 unsigned char *string_to_hex();