Win32 fixes.

diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index 4ec6ec2741736e1c8bfe0135b276833c615d7c44..61fede1ab9121a04d624dfec7f81c9bae62cbf65 100644 (file)
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -309,7 +309,7 @@ bad:
 
        num -= offset;
 
-       if ((length == 0) || (length > num)) length=(unsigned int)num;
+       if ((length == 0) || ((long)length > num)) length=(unsigned int)num;
        if(derout) {
                if(BIO_write(derout, str + offset, length) != (int)length) {
                        BIO_printf(bio_err, "Error writing output\n");

diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
index 1f547863f5fb6e1c40ecce75d1cf9952383899be..4a794bfb66a9cebc277fb8c51195a63c9b55acaa 100644 (file)
--- a/crypto/bio/bss_bio.c
+++ b/crypto/bio/bss_bio.c
@@ -84,7 +84,7 @@
 #include <openssl/err.h>
 #include <openssl/crypto.h>
 
-#include "e_os.h"
+#include "openssl/e_os.h"
 
 /* VxWorks defines SSiZE_MAX with an empty value causing compile errors */
 #if defined(VXWORKS)

diff --git a/crypto/des/cfb_enc.c b/crypto/des/cfb_enc.c
index 74f6b9d04f33cf1152a410cd12f04f508af7fe52..73ad33022ebe2862c41278367f5fdf63028b8ae2 100644 (file)
--- a/crypto/des/cfb_enc.c
+++ b/crypto/des/cfb_enc.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#include "e_os.h"
+#include "openssl/e_os.h"
 #include "des_locl.h"
 
 /* The input and output are loaded in multiples of 8 bits.