Avoid warnings: add missing prototype, don't shadow.

diff --git a/apps/speed.c b/apps/speed.c
index 1c2b9cded042d695f9762a33e3c10aa103d0d3b2..558760732f4cd23be14278b2255db1f7d343f9d7 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -2083,7 +2083,7 @@ int MAIN(int argc, char **argv)
                                         * otherwise, use result (see section 4.8 of draft-ietf-tls-ecc-03.txt).
                                         */
                                        int field_size, outlen;
-                                       void *(*kdf)(void *in, size_t inlen, void *out, size_t outlen);
+                                       void *(*kdf)(void *in, size_t inlen, void *out, size_t xoutlen);
                                        field_size = EC_GROUP_get_degree(ecdh_a[j]->group);
                                        if (field_size <= 24 * 8)
                                                {

diff --git a/ssl/ssl.h b/ssl/ssl.h
index e6879d9073255693ae4b8cf6334b2a88905bda54..0866fb6b2b86918c286e1ac16a54cbcb8578c89d 100644 (file)
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1201,6 +1201,7 @@ const char *      SSL_CIPHER_get_name(SSL_CIPHER *c);
 const COMP_METHOD *SSL_get_current_compression(SSL *s);
 const COMP_METHOD *SSL_get_current_expansion(SSL *s);
 const char *SSL_COMP_get_name(const COMP_METHOD *comp);
+STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void);
 
 int    SSL_get_fd(SSL *s);
 int    SSL_get_rfd(SSL *s);

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 6391cf207b0472bef2a1e76eecdbbc85c1fbb6e2..82c3b8d89c6b7060e96fe749af7559df6e0b36e5 100644 (file)
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -616,13 +616,13 @@ bad:
        ssl_comp_methods = SSL_COMP_get_compression_methods();
        fprintf(stderr, "Available compression methods:\n");
        {
-       int i, n = sk_SSL_COMP_num(ssl_comp_methods);
+       int j, n = sk_SSL_COMP_num(ssl_comp_methods);
        if (n == 0)
                fprintf(stderr, "  NONE\n");
        else
-               for (i = 0; i < n; i++)
+               for (j = 0; j < n; j++)
                        {
-                       SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, i);
+                       SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
                        fprintf(stderr, "  %d: %s\n", c->id, c->name);
                        }
        }