Commit a74c55cd authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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.
parent ac7d0785

apps/asn1pars.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

crypto/pem/pem_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

ms/do_ms.bat

+3 −3
Original line number Diff line number Diff line
@@ -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

ssl/ssl_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -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;