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 177e566f7a5960725fb64527b9cf78c8c6026e1e..f91ae4c8c6c7e67c98534e55a5a88f85b4561e7d 100644 (file)
--- 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 2c430c85bdff898408fc8d0ca20587f1c4c457c9..f14f8d88ed7faafe33c0a683faa3ca2ed0313d2c 100644 (file)
--- 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;