Recent changes from 0.9.6-stable.

diff --git a/Configure b/Configure
index cbb955439997d1c1a92983c977d69e6db0ec2467..246ab0acca32ec1b63e0d2ec119064d60d0c4f7a 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -641,7 +641,7 @@ PROCESS_ARGS:
                        { $threads=1; }
                elsif (/^no-shared$/)
                        { $no_shared=1; }
-               elsif (/^shared$/)
+               elsif (/^shared$/ || /^-shared$/ || /^--shared$/)
                        { $no_shared=0; }
                elsif (/^no-symlinks$/)
                        { $symlink=0; }

diff --git a/crypto/bn/bn.h b/crypto/bn/bn.h
index 03bae9b95004438b96bff2952b747a7ec87c377b..c0d6b1612d517c6840e39813a3b913fa787dac60 100644 (file)
--- a/crypto/bn/bn.h
+++ b/crypto/bn/bn.h
@@ -155,7 +155,7 @@ extern "C" {
 #define BN_BYTES       4
 #define BN_BITS2       32
 #define BN_BITS4       16
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__BORLANDC__)
 /* VC++ doesn't like the LL suffix */
 #define BN_MASK                (0xffffffffffffffffL)
 #else

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index f2f3d23381225070714db039384583fc41c80b85..808196891b2d7de6459582a7bab6047b3ec76604 100644 (file)
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -460,7 +460,7 @@ const char *CRYPTO_get_lock_name(int type)
                return("dynamic");
        else if (type < CRYPTO_NUM_LOCKS)
                return(lock_names[type]);
-       else if (type-CRYPTO_NUM_LOCKS >= sk_num(app_locks))
+       else if (type-CRYPTO_NUM_LOCKS > sk_num(app_locks))
                return("ERROR");
        else
                return(sk_value(app_locks,type-CRYPTO_NUM_LOCKS));

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 24b3f63e2b96e99112245d07093919479907318c..c779751b8c7c4b1dacd96eef81f70ed039897292 100644 (file)
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -630,6 +630,8 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
                        int i, r;
                        clock_t c_clock = clock();
 
+                       memset(cbuf, 0, sizeof(cbuf));
+
                        if (debug)
                                if (SSL_in_init(c_ssl))
                                        printf("client waiting in SSL_connect - %s\n",
@@ -714,6 +716,8 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
                        int i, r;
                        clock_t s_clock = clock();
 
+                       memset(sbuf, 0, sizeof(sbuf));
+
                        if (debug)
                                if (SSL_in_init(s_ssl))
                                        printf("server waiting in SSL_accept - %s\n",
@@ -957,6 +961,9 @@ int doit(SSL *s_ssl, SSL *c_ssl, long count)
        int c_write,s_write;
        int do_server=0,do_client=0;
 
+       memset(cbuf,0,sizeof(cbuf));
+       memset(sbuf,0,sizeof(sbuf));
+
        c_to_s=BIO_new(BIO_s_mem());
        s_to_c=BIO_new(BIO_s_mem());
        if ((s_to_c == NULL) || (c_to_s == NULL))

diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl
index c268c495507c76538b472aa67abd07bf9012b956..655606cc1666469688f8b18829242d241981d1a8 100644 (file)
--- a/util/pl/BC-32.pl
+++ b/util/pl/BC-32.pl
@@ -52,9 +52,9 @@ $lfile='';
 $shlib_ex_obj="";
 $app_ex_obj="c0x32.obj"; 
 
-$asm='n_o_T_a_s_m';
+$asm='nasmw -f obj';
 $asm.=" /Zi" if $debug;
-$afile='/Fo';
+$afile='-o';
 
 $bn_mulw_obj='';
 $bn_mulw_src='';