Avoid warnings: add missing prototype, don't shadow.
authorDr. Stephen Henson <steve@openssl.org>
Fri, 10 Oct 2003 23:07:24 +0000 (23:07 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Fri, 10 Oct 2003 23:07:24 +0000 (23:07 +0000)
apps/speed.c
ssl/ssl.h
ssl/ssltest.c

index 1c2b9cd..5587607 100644 (file)
@@ -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)
                                                {
index e6879d9..0866fb6 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);
index 6391cf2..82c3b8d 100644 (file)
@@ -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);
                        }
        }