From: Richard Levitte <levitte@openssl.org>
Date: Sat, 26 Jan 2002 04:50:41 +0000 (+0000)
Subject: Apply a small patch from Oscar Jacobsson <oscar@jacobsson.org> that
X-Git-Tag: OpenSSL_0_9_7-beta1~281
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b77fcddb6b97c2a0f8a7eeff9e971e6ad48d9104;p=openssl

Apply a small patch from Oscar Jacobsson <oscar@jacobsson.org> that
makes things more compilable with VC++.
---

diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index 177e566f7a..f91ae4c8c6 100644
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c
@@ -614,7 +614,7 @@ static long conn_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)
 		{
 	case BIO_CTRL_SET_CALLBACK:
 		{
-		data->info_callback=(int (*)())fp;
+		data->info_callback=(int (*)(const struct bio_st *, int, int))fp;
 		}
 		break;
 	default:
diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
index 2c430c85bd..f14f8d88ed 100644
--- a/crypto/ec/ec_mult.c
+++ b/crypto/ec/ec_mult.c
@@ -336,7 +336,7 @@ int EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
 		
 		for (i = 0; i < totalnum; i++)
 			{
-			if (wNAF_len[i] > k)
+			if (wNAF_len[i] > (size_t)k)
 				{
 				int digit = wNAF[i][k];
 				int is_neg;