From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 10 Oct 2003 23:07:24 +0000 (+0000)
Subject: Avoid warnings: add missing prototype, don't shadow.
X-Git-Tag: BEN_FIPS_TEST_4^2~11^2~77
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a08ced78c84509fe305d57d8257af4df8576585c;p=oweals%2Fopenssl.git

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

diff --git a/apps/speed.c b/apps/speed.c
index 1c2b9cded0..558760732f 100644
--- 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 e6879d9073..0866fb6b2b 100644
--- 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 6391cf207b..82c3b8d89c 100644
--- 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);
 			}
 	}