From: Ezra Peisach <epeisach@mit.edu>
Date: Sun, 11 Mar 2001 02:53:49 +0000 (+0000)
Subject:         * make_random_key.c, old_api_glue.c: Do not use a variable named
X-Git-Tag: krb5-1.3-alpha1~1627
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1ff7060e2c284ff8f56f05337d7d65d5953e0e7b;p=krb5.git

    * make_random_key.c, old_api_glue.c: Do not use a variable named
        random that might shadow a system header file definition.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13071 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index bb8bedb8d..3986a6122 100644
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-10  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+	* make_random_key.c, old_api_glue.c: Do not use a variable named
+	random that might shadow a system header file definition.
+
 2001-03-09  Ken Raeburn  <raeburn@mit.edu>
 
 	* cksumtypes.c, etypes.c, prng.c: Use krb5int_ prefix for internal
diff --git a/src/lib/crypto/make_random_key.c b/src/lib/crypto/make_random_key.c
index a4c3a6003..6c6ff2639 100644
--- a/src/lib/crypto/make_random_key.c
+++ b/src/lib/crypto/make_random_key.c
@@ -37,7 +37,7 @@ krb5_c_make_random_key(context, enctype, random_key)
     krb5_error_code ret;
     const struct krb5_enc_provider *enc;
     size_t keybytes, keylength;
-    krb5_data random;
+    krb5_data random_data;
     unsigned char *bytes;
 
     for (i=0; i<krb5_enctypes_length; i++) {
@@ -59,17 +59,17 @@ krb5_c_make_random_key(context, enctype, random_key)
 	return(ENOMEM);
     }
 
-    random.data = bytes;
-    random.length = keybytes;
+    random_data.data = bytes;
+    random_data.length = keybytes;
 
-    if ((ret = krb5_c_random_make_octets(context, &random)))
+    if ((ret = krb5_c_random_make_octets(context, &random_data)))
 	goto cleanup;
 
     random_key->magic = KV5M_KEYBLOCK;
     random_key->enctype = enctype;
     random_key->length = keylength;
 
-    ret = ((*(enc->make_key))(&random, random_key));
+    ret = ((*(enc->make_key))(&random_data, random_key));
 
 cleanup:
     memset(bytes, 0, keybytes);
diff --git a/src/lib/crypto/old_api_glue.c b/src/lib/crypto/old_api_glue.c
index 16b6b1e8e..49fba8319 100644
--- a/src/lib/crypto/old_api_glue.c
+++ b/src/lib/crypto/old_api_glue.c
@@ -301,12 +301,12 @@ krb5_random_confounder(size, ptr)
      size_t size;
      krb5_pointer ptr;
 {
-    krb5_data random;
+    krb5_data random_data;
 
-    random.length = size;
-    random.data = ptr;
+    random_data.length = size;
+    random_data.data = ptr;
 
-    return(krb5_c_random_make_octets(/* XXX */ 0, &random));
+    return(krb5_c_random_make_octets(/* XXX */ 0, &random_data));
 }
 
 krb5_error_code krb5_encrypt_data(context, key, ivec, data, enc_data)