Fix warning.

4 files changed, 16 insertions, 16 deletions

diff --git a/lib/gnutls_compress.c b/lib/gnutls_compress.c
index f1aef4ff56..569259cddd 100644
--- a/lib/gnutls_compress.c
+++ b/lib/gnutls_compress.c
@@ -34,8 +34,8 @@
 /* These functions allocate the return value internally
  */
 int _gnutls_m_plaintext2compressed(gnutls_session_t session,
-				   gnutls_datum_t *
-				   compress, gnutls_datum_t plaintext)
+				   gnutls_datum_t * compressed,
+				   gnutls_datum_t plaintext)
 {
     int size;
     opaque *data;
@@ -48,8 +48,8 @@ int _gnutls_m_plaintext2compressed(gnutls_session_t session,
 	gnutls_assert();
 	return GNUTLS_E_COMPRESSION_FAILED;
     }
-    compress->data = data;
-    compress->size = size;
+    compressed->data = data;
+    compressed->size = size;
 
     return 0;
 }
diff --git a/lib/gnutls_compress.h b/lib/gnutls_compress.h
index 9694f374ab..d6859bf196 100644
--- a/lib/gnutls_compress.h
+++ b/lib/gnutls_compress.h
@@ -23,7 +23,7 @@
  */
 
 int _gnutls_m_plaintext2compressed(gnutls_session_t session,
-				   gnutls_datum_t * compress,
+				   gnutls_datum_t * compressed,
 				   gnutls_datum_t plaintext);
 int _gnutls_m_compressed2plaintext(gnutls_session_t session,
 				   gnutls_datum_t * plain,
diff --git a/lib/gnutls_hash_int.c b/lib/gnutls_hash_int.c
index dfbb7aba16..b28d16a30e 100644
--- a/lib/gnutls_hash_int.c
+++ b/lib/gnutls_hash_int.c
@@ -306,7 +306,7 @@ void _gnutls_mac_deinit_ssl3_handshake(mac_hd_t handle,
 }
 
 static int ssl3_sha(int i, opaque * secret, int secret_len,
-		    opaque * random, int random_len, void *digest)
+		    opaque * rnd, int rnd_len, void *digest)
 {
     int j;
     opaque text1[26];
@@ -325,14 +325,14 @@ static int ssl3_sha(int i, opaque * secret, int secret_len,
 
     _gnutls_hash(td, text1, i + 1);
     _gnutls_hash(td, secret, secret_len);
-    _gnutls_hash(td, random, random_len);
+    _gnutls_hash(td, rnd, rnd_len);
 
     _gnutls_hash_deinit(td, digest);
     return 0;
 }
 
 static int ssl3_md5(int i, opaque * secret, int secret_len,
-		    opaque * random, int random_len, void *digest)
+		    opaque * rnd, int rnd_len, void *digest)
 {
     opaque tmp[MAX_HASH_SIZE];
     mac_hd_t td;
@@ -346,7 +346,7 @@ static int ssl3_md5(int i, opaque * secret, int secret_len,
 
     _gnutls_hash(td, secret, secret_len);
 
-    ret = ssl3_sha(i, secret, secret_len, random, random_len, tmp);
+    ret = ssl3_sha(i, secret, secret_len, rnd, rnd_len, tmp);
     if (ret < 0) {
 	gnutls_assert();
 	_gnutls_hash_deinit(td, digest);
@@ -390,7 +390,7 @@ int _gnutls_ssl3_hash_md5(void *first, int first_len,
 }
 
 int _gnutls_ssl3_generate_random(void *secret, int secret_len,
-				 void *random, int random_len,
+				 void *rnd, int rnd_len,
 				 int ret_bytes, opaque * ret)
 {
     int i = 0, copy, output_bytes;
@@ -408,7 +408,7 @@ int _gnutls_ssl3_generate_random(void *secret, int secret_len,
     for (i = 0; i < times; i++) {
 
 	result =
-	    ssl3_md5(i, secret, secret_len, random, random_len, digest);
+	    ssl3_md5(i, secret, secret_len, rnd, rnd_len, digest);
 	if (result < 0) {
 	    gnutls_assert();
 	    return result;
diff --git a/lib/gnutls_kx.c b/lib/gnutls_kx.c
index 57d58e4580..4f7a49159b 100644
--- a/lib/gnutls_kx.c
+++ b/lib/gnutls_kx.c
@@ -58,12 +58,12 @@ static int generate_normal_master(gnutls_session_t session,
 				  int keep_premaster)
 {
     int ret = 0;
-    opaque random[2 * TLS_RANDOM_SIZE + 1];
+    opaque rnd[2 * TLS_RANDOM_SIZE + 1];
     char buf[64];
 
-    memcpy(random, session->security_parameters.client_random,
+    memcpy(rnd, session->security_parameters.client_random,
 	   TLS_RANDOM_SIZE);
-    memcpy(&random[TLS_RANDOM_SIZE],
+    memcpy(&rnd[TLS_RANDOM_SIZE],
 	   session->security_parameters.server_random, TLS_RANDOM_SIZE);
 
     _gnutls_hard_log("INT: PREMASTER SECRET[%d]: %s\n", PREMASTER.size,
@@ -79,7 +79,7 @@ static int generate_normal_master(gnutls_session_t session,
     if (gnutls_protocol_get_version(session) == GNUTLS_SSL3) {
 	ret =
 	    _gnutls_ssl3_generate_random(PREMASTER.data, PREMASTER.size,
-					 random, 2 * TLS_RANDOM_SIZE,
+					 rnd, 2 * TLS_RANDOM_SIZE,
 					 TLS_MASTER_SIZE,
 					 session->security_parameters.
 					 master_secret);
@@ -88,7 +88,7 @@ static int generate_normal_master(gnutls_session_t session,
 	ret =
 	    _gnutls_PRF(PREMASTER.data, PREMASTER.size,
 			MASTER_SECRET, strlen(MASTER_SECRET),
-			random, 2 * TLS_RANDOM_SIZE, TLS_MASTER_SIZE,
+			rnd, 2 * TLS_RANDOM_SIZE, TLS_MASTER_SIZE,
 			session->security_parameters.master_secret);
     }