Commit 3ba2b94a authored by Richard Levitte's avatar Richard Levitte
Browse files

Recent changes from 0.9.6-stable.

parent 53b80e2e

Configure

+1 −1
Original line number Diff line number Diff line
@@ -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; }

crypto/bn/bn.h

+1 −1
Original line number Diff line number Diff line
@@ -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

crypto/cryptlib.c

+1 −1
Original line number Diff line number Diff line
@@ -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));

ssl/ssltest.c

+7 −0
Original line number Diff line number Diff line
@@ -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))

util/pl/BC-32.pl

+2 −2
Original line number Diff line number Diff line
@@ -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='';