diff options
| -rw-r--r-- | apps/asn1pars.c | 2 | ||||
| -rw-r--r-- | crypto/pem/pem_lib.c | 4 | ||||
| -rwxr-xr-x | ms/do_ms.bat | 6 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/apps/asn1pars.c b/apps/asn1pars.c index c7e9cf43d8..1b272b2977 100644 --- 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 916e9a8132..24464308cd 100644 --- 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 ebd983db8d..5cbc6f7d5f 100755 --- a/ms/do_ms.bat +++ b/ms/do_ms.bat @@ -2,9 +2,9 @@ perl util\mkfiles.pl >MINFO
rem perl util\mk1mf.pl VC-MSDOS no-sock >ms\msdos.mak
rem perl util\mk1mf.pl VC-W31-32 >ms\w31.mak
-perl util\mk1mf.pl VC-W31-32 dll >ms\w31dll.mak
-perl util\mk1mf.pl VC-WIN32 no-asm >ms\nt.mak
-perl util\mk1mf.pl VC-WIN32 dll no-asm >ms\ntdll.mak
+perl util\mk1mf.pl dll VC-W31-32 >ms\w31dll.mak
+perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
+perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
perl util\mkdef.pl 16 libeay > ms\libeay16.def
perl util\mkdef.pl 32 libeay > ms\libeay32.def
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 554c846747..bf1c900129 100644 --- 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; |