Various Win32 fixes. Change args in do_ms.bat to put platform last. Fix

unsigned/signed cmp error in asn1parse. Change various pem_all.c args to
use pem_password_cb.

diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index c7e9cf43d8695c630ca75d20b02bde1e5f539b52..1b272b29770a1c5dcaa8d72c10bdd8393133764d 100644 (file)
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -281,7 +281,7 @@ bad:
 
        if (length == 0) length=(unsigned int)num;
        if(derout) {
-               if(BIO_write(derout, str + offset, length) != length) {
+               if(BIO_write(derout, str + offset, length) != (int)length) {
                        BIO_printf(bio_err, "Error writing output\n");
                        ERR_print_errors(bio_err);
                        goto end;

diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index 916e9a8132fd58d1786e2966686d833a09a17f20..24464308cd22cfe444023f810cb073c30b96b317 100644 (file)
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -217,7 +217,7 @@ err:
 #ifndef NO_FP_API
 int PEM_ASN1_write(int (*i2d)(), const char *name, FILE *fp, char *x,
             const EVP_CIPHER *enc, unsigned char *kstr, int klen,
-            int (*callback)())
+            pem_password_cb *callback)
         {
         BIO *b;
         int ret;
@@ -325,7 +325,7 @@ err:
        }
 
 int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
-            int (*callback)())
+            pem_password_cb *callback)
        {
        int i,j,o,klen;
        long len;

diff --git a/ms/do_ms.bat b/ms/do_ms.bat
index ebd983db8d7050f3b7a3023b5e083393f3dc938a..5cbc6f7d5f85ba7557de331e06fb2595e973f9c1 100755 (executable)
--- a/ms/do_ms.bat
+++ b/ms/do_ms.bat
@@ -2,9 +2,9 @@
 perl util\mkfiles.pl >MINFO\r
 rem perl util\mk1mf.pl VC-MSDOS no-sock >ms\msdos.mak\r
 rem perl util\mk1mf.pl VC-W31-32 >ms\w31.mak\r
-perl util\mk1mf.pl VC-W31-32 dll >ms\w31dll.mak\r
-perl util\mk1mf.pl VC-WIN32 no-asm >ms\nt.mak\r
-perl util\mk1mf.pl VC-WIN32 dll no-asm >ms\ntdll.mak\r
+perl util\mk1mf.pl dll VC-W31-32 >ms\w31dll.mak\r
+perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak\r
+perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak\r
 \r
 perl util\mkdef.pl 16 libeay > ms\libeay16.def\r
 perl util\mkdef.pl 32 libeay > ms\libeay32.def\r

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 554c846747f312ee04e925a90fa1cc7f464cfaf6..bf1c900129247b5b7114d04ce7c353449817148a 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1126,7 +1126,7 @@ void SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb)
        ctx->default_passwd_callback=cb;
        }
 
-void SSL_CTX_set_cert_verify_cb(SSL_CTX *ctx,int (*cb)(),char *arg)
+void SSL_CTX_set_cert_verify_callback(SSL_CTX *ctx,int (*cb)(),char *arg)
        {
        ctx->app_verify_callback=cb;
        ctx->app_verify_arg=arg;