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

Fix various stuff: that VC++ 5.0 chokes on: 

1. Add *lots* of missing prototypes for static ssl functions.
2. VC++ doesn't understand the 'LL' suffix for 64 bits constants: change bn.org
3. Add a few missing prototypes in pem.org
Fix mk1mf.pl so it outputs a Makefile that doesn't choke Win95.
Fix mkdef.pl so it doesn't truncate longer names.
parent d433f901

crypto/bn/bn.org

+5 −0
Original line number Diff line number Diff line
@@ -169,7 +169,12 @@ extern "C" { 
#define BN_BYTES	4

#define BN_BITS2	32

#define BN_BITS4	16

#ifdef WIN32

/* VC++ doesn't like the LL suffix */

#define BN_MASK		(0xffffffffffffffffL)

#else

#define BN_MASK		(0xffffffffffffffffLL)

#endif

#define BN_MASK2	(0xffffffffL)

#define BN_MASK2l	(0xffff)

#define BN_MASK2h1	(0xffff8000L)

crypto/pem/pem.org

+4 −0
Original line number Diff line number Diff line
@@ -501,6 +501,7 @@ EVP_PKEY *PEM_read_PrivateKey(); 
PKCS7 *PEM_read_PKCS7();

DH *PEM_read_DHparams();

DSA *PEM_read_DSAparams();

NETSCAPE_CERT_SEQUENCE *PEM_read_NETSCAPE_CERT_SEQUENCE();

int PEM_write_X509();

int PEM_write_X509_REQ();

int PEM_write_X509_CRL();
@@ -511,6 +512,7 @@ int PEM_write_PrivateKey(); 
int PEM_write_PKCS7();

int PEM_write_DHparams();

int PEM_write_DSAparams();

int PEM_write_NETSCAPE_CERT_SEQUENCE();

#endif



X509 *PEM_read_bio_X509();
@@ -523,6 +525,7 @@ EVP_PKEY *PEM_read_bio_PrivateKey(); 
PKCS7 *PEM_read_bio_PKCS7();

DH *PEM_read_bio_DHparams();

DSA *PEM_read_bio_DSAparams();

NETSCAPE_CERT_SEQUENCE *PEM_read_bio_NETSCAPE_CERT_SEQUENCE();

int PEM_write_bio_X509();

int PEM_write_bio_X509_REQ();

int PEM_write_bio_X509_CRL();
@@ -533,6 +536,7 @@ int PEM_write_bio_PrivateKey(); 
int PEM_write_bio_PKCS7();

int PEM_write_bio_DHparams();

int PEM_write_bio_DSAparams();

int PEM_write_bio_NETSCAPE_CERT_SEQUENCE();



#endif /* SSLEAY_MACROS */

ssl/s23_clnt.c

+2 −0
Original line number Diff line number Diff line
@@ -66,9 +66,11 @@ 
#define BREAK break



#ifndef NOPROTO

static SSL_METHOD *ssl23_get_client_method(int ver);

static int ssl23_client_hello(SSL *s);

static int ssl23_get_server_hello(SSL *s);

#else

static SSL_METHOD *ssl23_get_client_method();

static int ssl23_client_hello();

static int ssl23_get_server_hello();

#endif

ssl/s23_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static SSL_METHOD SSLv23_data= { 
	ssl_undefined_function,

	ssl_undefined_function,

	ssl23_read,

	(int (*)())ssl_undefined_function,

        (int (*)(struct ssl_st *, char *, int))ssl_undefined_function,

	ssl23_write,

	ssl_undefined_function,

	ssl_undefined_function,

ssl/s23_meth.c

+6 −0
Original line number Diff line number Diff line
@@ -60,6 +60,12 @@ 
#include "objects.h"

#include "ssl_locl.h"



#ifndef NOPROTO

static SSL_METHOD *ssl23_get_method(int ver);

#else

static SSL_METHOD *ssl23_get_method();

#endif



static SSL_METHOD *ssl23_get_method(ver)

int ver;

	{