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.

diff --git a/crypto/bn/bn.org b/crypto/bn/bn.org
index d8904d7efacd4d0cc0974cfa1fdd8ae098757e67..2de26c2f9102d2ecbc8f4fc4babe2e0fa7c642f3 100644 (file)
--- a/crypto/bn/bn.org
+++ b/crypto/bn/bn.org
@@ -169,7 +169,12 @@ extern "C" {
 #define BN_BYTES       4
 #define BN_BITS2       32
 #define BN_BITS4       16
 #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)
 #define BN_MASK                (0xffffffffffffffffLL)

+#endif

 #define BN_MASK2       (0xffffffffL)
 #define BN_MASK2l      (0xffff)
 #define BN_MASK2h1     (0xffff8000L)
 #define BN_MASK2       (0xffffffffL)
 #define BN_MASK2l      (0xffff)
 #define BN_MASK2h1     (0xffff8000L)

diff --git a/crypto/pem/pem.org b/crypto/pem/pem.org
index 3d78699ffd522634c2ac0c49620a8d8f6a05d842..f1baa2024d7528d56c6198c61695c01f640b7716 100644 (file)
--- a/crypto/pem/pem.org
+++ b/crypto/pem/pem.org
@@ -501,6 +501,7 @@ EVP_PKEY *PEM_read_PrivateKey();
 PKCS7 *PEM_read_PKCS7();
 DH *PEM_read_DHparams();
 DSA *PEM_read_DSAparams();
 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();
 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_PKCS7();
 int PEM_write_DHparams();
 int PEM_write_DSAparams();

+int PEM_write_NETSCAPE_CERT_SEQUENCE();

 #endif
 
 X509 *PEM_read_bio_X509();
 #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();
 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();
 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_PKCS7();
 int PEM_write_bio_DHparams();
 int PEM_write_bio_DSAparams();

+int PEM_write_bio_NETSCAPE_CERT_SEQUENCE();

 
 #endif /* SSLEAY_MACROS */
 
 
 #endif /* SSLEAY_MACROS */
 

diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c
index 597cc8772e9cf896154cae9b9b64dad2e36ecc92..b607f623e46203df28ffb2200f9171d0ff6b52c6 100644 (file)
--- a/ssl/s23_clnt.c
+++ b/ssl/s23_clnt.c
@@ -66,9 +66,11 @@
 #define BREAK break
 
 #ifndef NOPROTO
 #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 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
 static int ssl23_client_hello();
 static int ssl23_get_server_hello();
 #endif

diff --git a/ssl/s23_lib.c b/ssl/s23_lib.c
index 9222bf86fb041e56ea4795f8f47fd5ce19d3769a..24b884ff4c3ec926031be01906935367217cbff1 100644 (file)
--- a/ssl/s23_lib.c
+++ b/ssl/s23_lib.c
@@ -88,7 +88,7 @@ static SSL_METHOD SSLv23_data= {
        ssl_undefined_function,
        ssl_undefined_function,
        ssl23_read,
        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,
        ssl23_write,
        ssl_undefined_function,
        ssl_undefined_function,

diff --git a/ssl/s23_meth.c b/ssl/s23_meth.c
index 1eed7a54bcfd98a5eb97ca0d1c8f145d308f5771..bbda4ff1820b924e73e201af4b3fb87781de8ddb 100644 (file)
--- a/ssl/s23_meth.c
+++ b/ssl/s23_meth.c
@@ -60,6 +60,12 @@
 #include "objects.h"
 #include "ssl_locl.h"
 
 #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;
        {
 static SSL_METHOD *ssl23_get_method(ver)
 int ver;
        {

diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c
index 888ffaca066dd0bb362881d0953bdd26adab9bf4..5dd9253f9fcc6687155855ff88a42a7117c1dd35 100644 (file)
--- a/ssl/s23_srvr.c
+++ b/ssl/s23_srvr.c
@@ -66,8 +66,10 @@
 #define BREAK break
 
 #ifndef NOPROTO
 #define BREAK break
 
 #ifndef NOPROTO

+static SSL_METHOD *ssl23_get_server_method(int ver);

 int ssl23_get_client_hello(SSL *s);
 #else
 int ssl23_get_client_hello(SSL *s);
 #else

+static SSL_METHOD *ssl23_get_server_method();

 int ssl23_get_client_hello();
 #endif
 
 int ssl23_get_client_hello();
 #endif
 

diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c
index 2170e292899912b9fdeaeed0e8a662e37341cf44..91fea92e6b5f8a344272bb858a988b5005bceaa1 100644 (file)
--- a/ssl/s2_clnt.c
+++ b/ssl/s2_clnt.c
@@ -64,6 +64,7 @@
 #include "evp.h"
 
 #ifndef NOPROTO
 #include "evp.h"
 
 #ifndef NOPROTO

+static SSL_METHOD *ssl2_get_client_method(int ver);

 static int get_server_finished(SSL *s);
 static int get_server_verify(SSL *s);
 static int get_server_hello(SSL *s);
 static int get_server_finished(SSL *s);
 static int get_server_verify(SSL *s);
 static int get_server_hello(SSL *s);


@@ -74,6 +75,7 @@ static int client_certificate(SSL *s);
 static int ssl_rsa_public_encrypt(CERT *c, int len, unsigned char *from,
        unsigned char *to,int padding);
 #else
 static int ssl_rsa_public_encrypt(CERT *c, int len, unsigned char *from,
        unsigned char *to,int padding);
 #else

+static SSL_METHOD *ssl2_get_client_method();

 static int get_server_finished();
 static int get_server_verify();
 static int get_server_hello();
 static int get_server_finished();
 static int get_server_verify();
 static int get_server_hello();

diff --git a/ssl/s2_meth.c b/ssl/s2_meth.c
index cfc8828cc7185e85cee6d71c87cc36558393d5e1..f28c9162cff4357943d63064e2fa226cb455234e 100644 (file)
--- a/ssl/s2_meth.c
+++ b/ssl/s2_meth.c
@@ -60,6 +60,12 @@
 #include "objects.h"
 #include "ssl_locl.h"
 
 #include "objects.h"
 #include "ssl_locl.h"
 

+#ifndef NOPROTO
+static SSL_METHOD *ssl2_get_method(int ver);
+#else
+static SSL_METHOD *ssl2_get_method();
+#endif
+

 static SSL_METHOD *ssl2_get_method(ver)
 int ver;
        {
 static SSL_METHOD *ssl2_get_method(ver)
 int ver;
        {

diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c
index 5ad8b12263c6a17723f4cb2bb7b043b97622c50d..3477d438530319878aa48ffcf016e4bb4b5a557c 100644 (file)
--- a/ssl/s2_srvr.c
+++ b/ssl/s2_srvr.c
@@ -64,6 +64,7 @@
 #include "evp.h"
 
 #ifndef NOPROTO
 #include "evp.h"
 
 #ifndef NOPROTO

+static SSL_METHOD *ssl2_get_server_method(int ver);

 static int get_client_master_key(SSL *s);
 static int get_client_hello(SSL *s);
 static int server_hello(SSL *s); 
 static int get_client_master_key(SSL *s);
 static int get_client_hello(SSL *s);
 static int server_hello(SSL *s); 


@@ -74,6 +75,7 @@ static int request_certificate(SSL *s);
 static int ssl_rsa_private_decrypt(CERT *c, int len, unsigned char *from,
        unsigned char *to,int padding);
 #else
 static int ssl_rsa_private_decrypt(CERT *c, int len, unsigned char *from,
        unsigned char *to,int padding);
 #else

+static SSL_METHOD *ssl2_get_server_method();

 static int get_client_master_key();
 static int get_client_hello();
 static int server_hello(); 
 static int get_client_master_key();
 static int get_client_hello();
 static int server_hello(); 

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index d4ff1d99c8997264fd3d5529fe7ea96a6df49e86..88f33d5162a5b113f22af89c4ab63f4fc4126aad 100644 (file)
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -74,6 +74,7 @@ SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_SSL3_SESSION_ID_TOO_SHORT);
  */
 
 #ifndef NOPROTO
  */
 
 #ifndef NOPROTO

+static SSL_METHOD *ssl3_get_client_method(int ver);

 static int ssl3_client_hello(SSL *s);
 static int ssl3_get_server_hello(SSL *s);
 static int ssl3_get_certificate_request(SSL *s);
 static int ssl3_client_hello(SSL *s);
 static int ssl3_get_server_hello(SSL *s);
 static int ssl3_get_certificate_request(SSL *s);


@@ -86,6 +87,7 @@ static int ssl3_get_key_exchange(SSL *s);
 static int ssl3_get_server_certificate(SSL *s);
 static int ssl3_check_cert_and_algorithm(SSL *s);
 #else
 static int ssl3_get_server_certificate(SSL *s);
 static int ssl3_check_cert_and_algorithm(SSL *s);
 #else

+static SSL_METHOD *ssl3_get_client_method();

 static int ssl3_client_hello();
 static int ssl3_get_server_hello();
 static int ssl3_get_certificate_request();
 static int ssl3_client_hello();
 static int ssl3_get_server_hello();
 static int ssl3_get_certificate_request();

diff --git a/ssl/s3_meth.c b/ssl/s3_meth.c
index 3d66b4643aae60a6ebc5a4b4e9831b4511bb2e6c..387b352370c51faf61b3ce44b321fcc0e24fbe0e 100644 (file)
--- a/ssl/s3_meth.c
+++ b/ssl/s3_meth.c
@@ -60,6 +60,12 @@
 #include "objects.h"
 #include "ssl_locl.h"
 
 #include "objects.h"
 #include "ssl_locl.h"
 

+#ifndef NOPROTO
+static SSL_METHOD *ssl3_get_method(int ver);
+#else
+static SSL_METHOD *ssl3_get_method();
+#endif
+

 static SSL_METHOD *ssl3_get_method(ver)
 int ver;
        {
 static SSL_METHOD *ssl3_get_method(ver)
 int ver;
        {

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 09041b2fd9877b3d812715bcd5397bc326f6a154..9bb4560e322fa468ce3963dedb257eb269165376 100644 (file)
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -75,6 +75,7 @@
  */
 
 #ifndef NOPROTO
  */
 
 #ifndef NOPROTO

+static SSL_METHOD *ssl3_get_server_method(int ver);

 static int ssl3_get_client_hello(SSL *s);
 static int ssl3_send_server_hello(SSL *s);
 static int ssl3_send_server_key_exchange(SSL *s);
 static int ssl3_get_client_hello(SSL *s);
 static int ssl3_send_server_hello(SSL *s);
 static int ssl3_send_server_key_exchange(SSL *s);


@@ -87,6 +88,7 @@ static int ssl3_send_hello_request(SSL *s);
 
 #else
 
 
 #else
 

+static SSL_METHOD *ssl3_get_server_method();

 static int ssl3_get_client_hello();
 static int ssl3_send_server_hello();
 static int ssl3_send_server_key_exchange();
 static int ssl3_get_client_hello();
 static int ssl3_send_server_hello();
 static int ssl3_send_server_key_exchange();

diff --git a/ssl/ssl.h b/ssl/ssl.h
index ed41d33cefb962b3efd174af5826dcf45e05e6f0..92b7695e6189c6bbf2524e2dac7c8e574469e9b1 100644 (file)
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -844,7 +844,7 @@ STACK *     SSL_get_peer_cert_chain(SSL *s);
 
 int SSL_CTX_get_verify_mode(SSL_CTX *ctx);
 int (*SSL_CTX_get_verify_callback(SSL_CTX *ctx))();
 
 int SSL_CTX_get_verify_mode(SSL_CTX *ctx);
 int (*SSL_CTX_get_verify_callback(SSL_CTX *ctx))();

-void SSL_CTX_set_verify(SSL_CTX *ctx,int mode,int (*callback)());
+void SSL_CTX_set_verify(SSL_CTX *ctx,int mode,int (*callback)(int, X509_STORE_CTX *));

 void SSL_CTX_set_cert_verify_cb(SSL_CTX *ctx, int (*cb)(),char *arg);
 int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa);
 int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, unsigned char *d, long len);
 void SSL_CTX_set_cert_verify_cb(SSL_CTX *ctx, int (*cb)(),char *arg);
 int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa);
 int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, unsigned char *d, long len);

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 2bc0e3f2b2498de8c069c122a55566f2fac33573..c9a228519951651109e1d91301a66897467eb879 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1043,7 +1043,11 @@ char *arg;
 void SSL_CTX_set_verify(ctx,mode,cb)
 SSL_CTX *ctx;
 int mode;
 void SSL_CTX_set_verify(ctx,mode,cb)
 SSL_CTX *ctx;
 int mode;

+#ifndef NOPROTO
+int (*cb)(int, X509_STORE_CTX *);
+#else

 int (*cb)();
 int (*cb)();

+#endif

        {
        ctx->default_verify_mode=mode;
        ctx->default_verify_callback=cb;
        {
        ctx->default_verify_mode=mode;
        ctx->default_verify_callback=cb;

diff --git a/ssl/t1_clnt.c b/ssl/t1_clnt.c
index 986d2436e2f02bd38daf2d1ecc1f982c48a6cd60..1a179221e756908f1a5eae99fdf3f9ef5508378b 100644 (file)
--- a/ssl/t1_clnt.c
+++ b/ssl/t1_clnt.c
@@ -63,6 +63,12 @@
 #include "evp.h"
 #include "ssl_locl.h"
 
 #include "evp.h"
 #include "ssl_locl.h"
 

+#ifndef NOPROTO
+static SSL_METHOD *tls1_get_client_method(int ver);
+#else
+static SSL_METHOD *tls1_get_client_method();
+#endif
+

 static SSL_METHOD *tls1_get_client_method(ver)
 int ver;
        {
 static SSL_METHOD *tls1_get_client_method(ver)
 int ver;
        {

diff --git a/ssl/t1_meth.c b/ssl/t1_meth.c
index 512c2078e763740c939fa46ee9ea5f2988e3054c..d64b5f4e679e23da1a4167a9f884a1e94b2eefb0 100644 (file)
--- a/ssl/t1_meth.c
+++ b/ssl/t1_meth.c
@@ -60,6 +60,12 @@
 #include "objects.h"
 #include "ssl_locl.h"
 
 #include "objects.h"
 #include "ssl_locl.h"
 

+#ifndef NOPROTO
+static SSL_METHOD *tls1_get_method(int ver);
+#else
+static SSL_METHOD *tls1_get_method();
+#endif
+

 static SSL_METHOD *tls1_get_method(ver)
 int ver;
        {
 static SSL_METHOD *tls1_get_method(ver)
 int ver;
        {

diff --git a/ssl/t1_srvr.c b/ssl/t1_srvr.c
index 8cf0addcd9e5014276ad3ec45ae1f43bf5efc297..8b18572fb01544057d79f7d0ad715277b204db0b 100644 (file)
--- a/ssl/t1_srvr.c
+++ b/ssl/t1_srvr.c
@@ -64,6 +64,12 @@
 #include "x509.h"
 #include "ssl_locl.h"
 
 #include "x509.h"
 #include "ssl_locl.h"
 

+#ifndef NOPROTO
+static SSL_METHOD *tls1_get_server_method(int ver);
+#else
+static SSL_METHOD *tls1_get_server_method();
+#endif
+

 static SSL_METHOD *tls1_get_server_method(ver)
 int ver;
        {
 static SSL_METHOD *tls1_get_server_method(ver)
 int ver;
        {

diff --git a/util/mkdef.pl b/util/mkdef.pl
index a62e3eef821700319dce1512fb39316c3f45fc1a..5b2f355bb48ccee18d969dc64457f685ac29c614 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -231,12 +231,12 @@ sub print_def_file
 
        print OUT <<"EOF";
 ;
 
        print OUT <<"EOF";
 ;

-; Definition file for the DDL version of the $name library from SSLeay
+; Definition file for the DLL version of the $name library from OpenSSL

 ;
 
 LIBRARY         $name
 
 ;
 
 LIBRARY         $name
 

-DESCRIPTION     'SSLeay $name - eay\@cryptsoft.com'
+DESCRIPTION     'OpenSSL $name - http://www.openssl.org/'

 
 EOF
 
 
 EOF
 


@@ -270,7 +270,7 @@ EOF
                else
                        {
                        $n=$nums{$func};
                else
                        {
                        $n=$nums{$func};

-                       printf OUT "    %s%-35s@%d\n",($NT)?"":"_",$func,$n;
+                       printf OUT "    %s%-40s@%d\n",($NT)?"":"_",$func,$n;

                        }
                }
        printf OUT "\n";
                        }
                }
        printf OUT "\n";

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 9167abfce548fdbe5da4c046cc9b457294ac5b5f..c0d57937a8206d471d01f087b329811503dc4377 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -7,7 +7,7 @@ $crypto="libeay32";
 $RSAref="RSAref32";
 
 $o='\\';
 $RSAref="RSAref32";
 
 $o='\\';

-$cp='"copy /b nul+ "'; # Timestamps get stuffed otherwise
+$cp='copy nul+';       # Timestamps get stuffed otherwise

 $rm='del';
 
 # C compiler stuff
 $rm='del';
 
 # C compiler stuff