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

Fix the Win32 compile environment and add various changes so it will now compile 

under Win32 (9X and NT) again. Note: some signed/unsigned changes recently
checked in were killing the Win32 compile.
parent 726bae3f

CHANGES

+7 −0
Original line number Diff line number Diff line
@@ -5,6 +5,13 @@ 


 Changes between 0.9.1c and 0.9.2



  *) Get the Win32 compile working again. Modify mkdef.pl so it can handle

     functions that return function pointers and has support for NT specific

     stuff. Fix mk1mf.pl and VC-32.pl to support NT differences also. Various

     #ifdef WIN32 and WINNTs sprinkled about the place and some changes from

     unsigned to signed types: this was killing the Win32 compile.

     [Steve Henson]



  *) Add new certificate file to stack functions, SSL_add_cert_file_to_stack()

     and SSL_add_cert_dir_to_stack(). These largely supplant

     SSL_load_client_CA_file(), and can be used to add multiple certs easily to

INSTALL.W32

+9 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ Heres a few comments about building OpenSSL in Windows environments. Most of 
this is tested on Win32 but it may also work in Win 3.1 with some modification.

See the end of this file for Eric's original comments.



Note: the default Win32 environment is to leave out any Windows NT specific

features: (currently only BIO_s_log()) if you want NT specific features see

the "Tweaks" section later.



You will need perl for Win32 (which can be got from various sources) and Visual

C++.
@@ -73,6 +77,11 @@ There are various changes you can make to the Win32 compile environment. If you 
have the MASM assembler 'ml' then you can try the assembly language code. To

do this remove the 'no-asm' part from do_ms.bat.



If you want to enable the NT specific features of OpenSSL (currently only

the logging BIO) follow the instructions above but call the batch file

do_nt.bat instead of do_ms.bat. If you do this then you will no longer be able

to run the OpenSSL binaries under Windows 95 or 98.



You can also build a static version of the library using the Makefile ms\nt.mak



--------------------------------------------------------------------------------

crypto/bio/bss_log.c

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ 


*/



#if !defined(WIN32) || defined(WINNT)



#include <stdio.h>

#include <errno.h>
@@ -242,3 +244,4 @@ static int xcloselog(BIO* bp) 
	return(1);

}



#endif

crypto/evp/bio_ok.c

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ static void block_in(BIO* b) 
	{

	BIO_OK_CTX *ctx;

	EVP_MD_CTX *md;

	unsigned long tl= 0;

        long tl= 0;

	unsigned char tmp[EVP_MAX_MD_SIZE];



	ctx=(BIO_OK_CTX *)b->ptr;

crypto/pkcs7/pk7_doit.c

+1 −1
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ PKCS7_SIGNER_INFO *si; 
	if ((sk != NULL) && (sk_num(sk) != 0))

		{

		unsigned char md_dat[EVP_MAX_MD_SIZE];

		unsigned int md_len;

                int md_len;

		ASN1_OCTET_STRING *message_digest;



		EVP_DigestFinal(&mdc_tmp,md_dat,&md_len);