wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
unsigned/signed cmp error in asn1parse. Change various pem_all.c args to
use pem_password_cb.
This commit is contained in:
Dr. Stephen Henson 1999-05-15 20:33:15 +00:00
parent ac7d07851c
commit a74c55cd8f
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/asn1pars.c
View file

@ -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;

4
crypto/pem/pem_lib.c
View file

@ -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;

6
ms/do_ms.bat
View file

@ -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

2
ssl/ssl_lib.c
View file

@ -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;